Merge pull request #121 from lumalabs/release-please--branches--main--changes--next

karanganesan · web-flow · commit e51bf5f5d2c3 · 2025-03-17T08:01:17.000-07:00
release: 1.5.2
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -3,7 +3,7 @@ FROM mcr.microsoft.com/vscode/devcontainers/python:0-${VARIANT}
 
 USER vscode
 
-RUN curl -sSf https://rye.astral.sh/get | RYE_VERSION="0.35.0" RYE_INSTALL_OPTION="--yes" bash
+RUN curl -sSf https://rye.astral.sh/get | RYE_VERSION="0.44.0" RYE_INSTALL_OPTION="--yes" bash
 ENV PATH=/home/vscode/.rye/shims:$PATH
 
 RUN echo "[[ -d .venv ]] && source .venv/bin/activate || export PATH=\$PATH" >> /home/vscode/.bashrc
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ jobs:
           curl -sSf https://rye.astral.sh/get | bash
           echo "$HOME/.rye/shims" >> $GITHUB_PATH
         env:
-          RYE_VERSION: '0.35.0'
+          RYE_VERSION: '0.44.0'
           RYE_INSTALL_OPTION: '--yes'
 
       - name: Install dependencies
@@ -42,7 +42,7 @@ jobs:
           curl -sSf https://rye.astral.sh/get | bash
           echo "$HOME/.rye/shims" >> $GITHUB_PATH
         env:
-          RYE_VERSION: '0.35.0'
+          RYE_VERSION: '0.44.0'
           RYE_INSTALL_OPTION: '--yes'
 
       - name: Bootstrap
diff --git a/.github/workflows/publish-pypi.yml b/.github/workflows/publish-pypi.yml
@@ -21,7 +21,7 @@ jobs:
           curl -sSf https://rye.astral.sh/get | bash
           echo "$HOME/.rye/shims" >> $GITHUB_PATH
         env:
-          RYE_VERSION: '0.35.0'
+          RYE_VERSION: '0.44.0'
           RYE_INSTALL_OPTION: '--yes'
 
       - name: Publish to PyPI
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "1.5.1"
+  ".": "1.5.2"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,25 @@
 # Changelog
 
+## 1.5.2 (2025-03-15)
+
+Full Changelog: [v1.5.1...v1.5.2](https://github.com/lumalabs/lumaai-python/compare/v1.5.1...v1.5.2)
+
+### Bug Fixes
+
+* **types:** handle more discriminated union shapes ([#126](https://github.com/lumalabs/lumaai-python/issues/126)) ([71a98c0](https://github.com/lumalabs/lumaai-python/commit/71a98c0718c44688074031d45df765cc5e5dae8b))
+
+
+### Chores
+
+* **internal:** bump rye to 0.44.0 ([#125](https://github.com/lumalabs/lumaai-python/issues/125)) ([20a924b](https://github.com/lumalabs/lumaai-python/commit/20a924bcae62c24e9990c3418c03d62fbefbff3a))
+* **internal:** codegen related update ([#124](https://github.com/lumalabs/lumaai-python/issues/124)) ([658c121](https://github.com/lumalabs/lumaai-python/commit/658c121252e128962caaf382f9748da8f30e46c0))
+* **internal:** remove extra empty newlines ([#123](https://github.com/lumalabs/lumaai-python/issues/123)) ([82d0867](https://github.com/lumalabs/lumaai-python/commit/82d0867956d52dec920f3693ec8bc89a0b7fd6a6))
+
+
+### Documentation
+
+* revise readme docs about nested params ([#120](https://github.com/lumalabs/lumaai-python/issues/120)) ([424187b](https://github.com/lumalabs/lumaai-python/commit/424187bd35b540d56aef9fec0eaae13346d3abd0))
+
 ## 1.5.1 (2025-03-04)
 
 Full Changelog: [v1.5.0...v1.5.1](https://github.com/lumalabs/lumaai-python/compare/v1.5.0...v1.5.1)
diff --git a/README.md b/README.md
@@ -79,6 +79,30 @@ Nested request parameters are [TypedDicts](https://docs.python.org/3/library/typ
 
 Typed requests and responses provide autocomplete and documentation within your editor. If you would like to see type errors in VS Code to help catch bugs earlier, set `python.analysis.typeCheckingMode` to `basic`.
 
+## Nested params
+
+Nested parameters are dictionaries, typed using `TypedDict`, for example:
+
+```python
+from lumaai import LumaAI
+
+client = LumaAI()
+
+generation = client.generations.create(
+    keyframes={
+        "frame0": {
+            "type": "image",
+            "url": "https://example.com/image.jpg",
+        },
+        "frame1": {
+            "id": "123e4567-e89b-12d3-a456-426614174000",
+            "type": "generation",
+        },
+    },
+)
+print(generation.keyframes)
+```
+
 ## Handling errors
 
 When the library is unable to connect to the API (for example, due to network connection problems or a timeout), a subclass of `lumaai.APIConnectionError` is raised.
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "lumaai"
-version = "1.5.1"
+version = "1.5.2"
 description = "The official Python library for the lumaai API"
 dynamic = ["readme"]
 license = "Apache-2.0"
@@ -38,7 +38,6 @@ Homepage = "https://github.com/lumalabs/lumaai-python"
 Repository = "https://github.com/lumalabs/lumaai-python"
 
 
-
 [tool.rye]
 managed = true
 # version pins are in requirements-dev.lock
@@ -152,7 +151,6 @@ reportImplicitOverride = true
 reportImportCycles = false
 reportPrivateUsage = false
 
-
 [tool.ruff]
 line-length = 120
 output-format = "grouped"
diff --git a/requirements-dev.lock b/requirements-dev.lock
@@ -7,6 +7,7 @@
 #   all-features: true
 #   with-sources: false
 #   generate-hashes: false
+#   universal: false
 
 -e file:.
 annotated-types==0.6.0
diff --git a/requirements.lock b/requirements.lock
@@ -7,6 +7,7 @@
 #   all-features: true
 #   with-sources: false
 #   generate-hashes: false
+#   universal: false
 
 -e file:.
 annotated-types==0.6.0
diff --git a/scripts/test b/scripts/test
@@ -52,6 +52,8 @@ else
   echo
 fi
 
+export DEFER_PYDANTIC_BUILD=false
+
 echo "==> Running tests"
 rye run pytest "$@"
 
diff --git a/src/lumaai/_models.py b/src/lumaai/_models.py
@@ -65,7 +65,7 @@
 from ._constants import RAW_RESPONSE_HEADER
 
 if TYPE_CHECKING:
-    from pydantic_core.core_schema import ModelField, LiteralSchema, ModelFieldsSchema
+    from pydantic_core.core_schema import ModelField, ModelSchema, LiteralSchema, ModelFieldsSchema
 
 __all__ = ["BaseModel", "GenericModel"]
 
@@ -646,15 +646,18 @@ def _build_discriminated_union_meta(*, union: type, meta_annotations: tuple[Any,
 
 def _extract_field_schema_pv2(model: type[BaseModel], field_name: str) -> ModelField | None:
     schema = model.__pydantic_core_schema__
+    if schema["type"] == "definitions":
+        schema = schema["schema"]
+
     if schema["type"] != "model":
         return None
 
+    schema = cast("ModelSchema", schema)
     fields_schema = schema["schema"]
     if fields_schema["type"] != "model-fields":
         return None
 
     fields_schema = cast("ModelFieldsSchema", fields_schema)
-
     field = fields_schema["fields"].get(field_name)
     if not field:
         return None
diff --git a/src/lumaai/_version.py b/src/lumaai/_version.py
@@ -1,4 +1,4 @@
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 __title__ = "lumaai"
-__version__ = "1.5.1"  # x-release-please-version
+__version__ = "1.5.2"  # x-release-please-version
diff --git a/tests/test_models.py b/tests/test_models.py
@@ -854,3 +854,35 @@ class Model(BaseModel):
     m = construct_type(value={"cls": "foo"}, type_=Model)
     assert isinstance(m, Model)
     assert isinstance(m.cls, str)
+
+
+def test_discriminated_union_case() -> None:
+    class A(BaseModel):
+        type: Literal["a"]
+
+        data: bool
+
+    class B(BaseModel):
+        type: Literal["b"]
+
+        data: List[Union[A, object]]
+
+    class ModelA(BaseModel):
+        type: Literal["modelA"]
+
+        data: int
+
+    class ModelB(BaseModel):
+        type: Literal["modelB"]
+
+        required: str
+
+        data: Union[A, B]
+
+    # when constructing ModelA | ModelB, value data doesn't match ModelB exactly - missing `required`
+    m = construct_type(
+        value={"type": "modelB", "data": {"type": "a", "data": True}},
+        type_=cast(Any, Annotated[Union[ModelA, ModelB], PropertyInfo(discriminator="type")]),
+    )
+
+    assert isinstance(m, ModelB)

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- ".": "1.5.1"`
	`2`	`+ ".": "1.5.2"`
`3`	`3`	`}`