Fix join_url bug when httpx 2.4.0 or later (#1699)

koxudaxi · Nov 16, 2023 · 0ffcfd1 · 0ffcfd1
1 parent 65edaef
commit 0ffcfd1
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 52 deletions.
diff --git a/datamodel_code_generator/reference.py b/datamodel_code_generator/reference.py
@@ -495,7 +495,11 @@ def resolve_ref(self, path: Union[Sequence[str], str]) -> str:
         if self.base_url:
             from .http import join_url
 
-            return join_url(self.base_url, ref)
+            joined_url = join_url(self.base_url, ref)
+            if '#' in joined_url:
+                return joined_url
+            return f'{joined_url}#'
+
         if is_url(ref):
             file_part, path_part = ref.split('#', 1)
             if file_part == self.root_id:

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -75,7 +75,7 @@ types-PyYAML = "*"
 types-toml = "*"
 types-setuptools = ">=67.6.0.5,<69.0.0.0"
 pydantic = "*"
-httpx = "*"
+httpx = ">=0.24.1"
 PySnooper = "*"
 ruff = ">=0.0.290,<0.1.6"
 ruff-lsp = ">=0.0.39,<0.0.41"