fix: script for type generation now handles nexted module importing correctly when type doesn't have an origin (#152)

* fix: script for type generation now handles nexted module importing correctly when type doesn't have an origin

* Apply suggestions from code review

Co-authored-by: Copilot <[email protected]>

* need to skip bedrock tests more generally

* Update anthripic types

* Manually fix?

---------

Co-authored-by: Copilot <[email protected]>

Author: cpsievert

chatlas/types/anthropic/_client.py

@@ -17,5 +17,5 @@ class ChatClientArgs(TypedDict, total=False):
     max_retries: int
     default_headers: Optional[Mapping[str, str]]
     default_query: Optional[Mapping[str, object]]
-    http_client: httpx.AsyncClient
+    http_client: httpx.AsyncClient | None
     _strict_response_validation: bool

chatlas/types/anthropic/_client_bedrock.py

@@ -19,5 +19,5 @@ class ChatBedrockClientArgs(TypedDict, total=False):
     max_retries: int
     default_headers: Optional[Mapping[str, str]]
     default_query: Optional[Mapping[str, object]]
-    http_client: httpx.AsyncClient
+    http_client: httpx.AsyncClient | None
     _strict_response_validation: bool

chatlas/types/openai/_client.py

@@ -20,5 +20,5 @@ class ChatClientArgs(TypedDict, total=False):
     max_retries: int
     default_headers: Optional[Mapping[str, str]]
     default_query: Optional[Mapping[str, object]]
-    http_client: httpx.AsyncClient
+    http_client: httpx.AsyncClient | None
     _strict_response_validation: bool

chatlas/types/openai/_client_azure.py

@@ -23,5 +23,5 @@ class ChatAzureClientArgs(TypedDict, total=False):
     max_retries: int
     default_headers: Optional[Mapping[str, str]]
     default_query: Optional[Mapping[str, object]]
-    http_client: httpx.AsyncClient
+    http_client: httpx.AsyncClient | None
     _strict_response_validation: bool

chatlas/types/openai/_submit.py

@@ -177,6 +177,9 @@ class SubmitInputArgs(TypedDict, total=False):
     top_p: Union[float, None, openai.NotGiven]
     user: str | openai.NotGiven
     verbosity: Union[Literal["low", "medium", "high"], None, openai.NotGiven]
+    web_search_options: (
+        openai.types.chat.completion_create_params.WebSearchOptions | openai.NotGiven
+    )
     extra_headers: Optional[Mapping[str, Union[str, openai.Omit]]]
     extra_query: Optional[Mapping[str, object]]
     extra_body: object | None

scripts/_generate_openai_types.py

@@ -14,8 +14,7 @@
 create_args = generate_typeddict_code(
     Completions.create,
     "SubmitInputArgs",
-    # For some reason web_search_options is not being generated correctly
-    excluded_fields={"self", "web_search_options"},
+    excluded_fields={"self"},
 )
 
 write_code_to_file(

scripts/_utils.py

@@ -142,9 +142,27 @@ def get_type_string(typ: Any) -> tuple[str, set[str]]:
                 imports.add(f"from typing import {type_name}")
             return type_str.replace("typing.", ""), imports
 
+        # Handle namespaced types (including union syntax)
+        if "|" in type_str:
+            parts = [part.strip() for part in type_str.split("|")]
+            processed_parts = []
+            for part in parts:
+                namespace_match = re.match(
+                    r"([a-zA-Z_][a-zA-Z0-9_.]*)\.([a-zA-Z_][a-zA-Z0-9_]*)",
+                    part,
+                )
+                if namespace_match:
+                    namespace, type_name = namespace_match.groups()
+                    imports.add(f"import {namespace}")
+                    processed_parts.append(f"{namespace}.{type_name}")
+                else:
+                    processed_parts.append(part)
+            return " | ".join(processed_parts), imports
+
         # Handle namespaced types
         namespace_match = re.match(
-            r"([a-zA-Z_][a-zA-Z0-9_]*)\.([a-zA-Z_][a-zA-Z0-9_]*)", type_str
+            r"([a-zA-Z_][a-zA-Z0-9_.]*)\.([a-zA-Z_][a-zA-Z0-9_]*)",
+            type_str,
         )
         if namespace_match:
             namespace, type_name = namespace_match.groups()

tests/test_provider_bedrock.py

@@ -1,7 +1,5 @@
 import pytest
-
 from chatlas import ChatBedrockAnthropic
-from botocore.exceptions import TokenRetrievalError
 
 from .conftest import (
     assert_data_extraction,
@@ -18,7 +16,7 @@
 try:
     chat = ChatBedrockAnthropic()
     chat.chat("What is 1 + 1?")
-except TokenRetrievalError:
+except Exception:
     pytest.skip("Bedrock credentials aren't configured", allow_module_level=True)