Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(bridge): circular imports #18

Merged
merged 2 commits into from
Oct 30, 2024
Merged

fix(bridge): circular imports #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b867981
fix(bridge): circular imports
tomjeannesson Oct 30, 2024
6b28370
Minor commit @ Mer 30 oct 2024 20:46:23 CET
tomjeannesson Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/django.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:

- name: Create ./backend/.envs/.development files
run: |
python -m pip install cryptography
python -m pip install cryptography ruff
python ./setup/env_file_generator.py development

- name: Start containers
Expand Down
16 changes: 10 additions & 6 deletions backend/nango/bridge/bridge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,19 +191,22 @@ def make_serializer_file(

# Build customizable user's serializer
nango_serializer_name: str = f"{model_name}{'Detail' if detail else ''}NangoSerializer"
regex = r"(?<=')(.*)(?=\.)"
match = re.search(regex, str(model))
import_path = match.group(1)
data = {
"imports": [f"from api._nango_cache.{snake_case_model_name} import {nango_serializer_name}"],
"imports": [
f"from api._nango_cache.{snake_case_model_name}.{snake_case_model_name}{"_detail" if detail else ""}"
f"_nango_serializer import {nango_serializer_name}",
f"from {import_path} import {model_name}",
],
"model_name": model_name,
"serializer_name": f"{model_name}{'Detail' if detail else ''}Serializer",
"nango_serializer": nango_serializer_name,
}
self._make_serializer(folder_path=self.api_folder_path / snake_case_model_name, data=data, detail=detail)

# Build generated Nango's serializer
regex = r"(?<=')(.*)(?=\.)"
match = re.search(regex, str(model))
import_path = match.group(1)

data = {
"imports": [
f"from {import_path} import {model_name}",
Expand Down Expand Up @@ -231,7 +234,8 @@ def make_serializer_file(
],
}
data["imports"] = [
f"from api.{dico.get('model_name')}.{from_camelcase_to_snakecase(dico.get('model_name'))}_serializer import {dico.get('serializer')}"
f"from api.{from_camelcase_to_snakecase(dico.get('model_name'))}.{from_camelcase_to_snakecase(dico.get('model_name'))}"
f"_serializer import {dico.get('serializer')}"
for dico in data["detail"]["specified_fields"]
] + data["imports"]
else:
Expand Down