openai-sdk-helpers 0.6.4__py3-none-any.whl → 0.6.5__py3-none-any.whl

openai_sdk_helpers/structure/base.py

@@ -174,6 +174,100 @@ def _ensure_schema_has_type(schema: dict[str, Any]) -> None:
     schema.update(_build_any_value_schema())
 
 
+def _strip_ref_types(
+    schema: dict[str, Any],
+    *,
+    nullable_fields: set[str] | None = None,
+) -> None:
+    """Remove type entries from enum $ref nodes when non-nullable.
+
+    Parameters
+    ----------
+    schema : dict[str, Any]
+        Root schema to clean in place.
+    nullable_fields : set[str] | None, optional
+        Field names that should remain nullable. Defaults to None.
+    """
+    field_names = nullable_fields or set()
+
+    def _resolve_ref(ref: str) -> dict[str, Any] | None:
+        if not ref.startswith("#/"):
+            return None
+        pointer = ref.removeprefix("#/")
+        current: Any = schema
+        for part in pointer.split("/"):
+            if not isinstance(current, dict):
+                return None
+            current = current.get(part)
+        if isinstance(current, dict):
+            return current
+        return None
+
+    def _is_enum_ref(ref: str) -> bool:
+        ref_target = _resolve_ref(ref)
+        if not isinstance(ref_target, dict):
+            return False
+        return "enum" in ref_target
+
+    def _is_null_schema(entry: Any) -> bool:
+        if not isinstance(entry, dict):
+            return False
+        entry_type = entry.get("type")
+        if entry_type == "null":
+            return True
+        if isinstance(entry_type, list) and "null" in entry_type:
+            return True
+        return False
+
+    def _walk(
+        node: Any,
+        *,
+        nullable_context: bool = False,
+        nullable_property: bool = False,
+    ) -> None:
+        if isinstance(node, dict):
+            ref = node.get("$ref")
+            if (
+                isinstance(ref, str)
+                and _is_enum_ref(ref)
+                and not nullable_context
+                and not nullable_property
+            ):
+                node.pop("type", None)
+            for key, value in node.items():
+                if key == "anyOf" and isinstance(value, list):
+                    anyof_nullable = any(_is_null_schema(entry) for entry in value)
+                    for entry in value:
+                        _walk(
+                            entry,
+                            nullable_context=anyof_nullable or nullable_context,
+                            nullable_property=nullable_property,
+                        )
+                    continue
+                if key == "properties" and isinstance(value, dict):
+                    for prop_name, prop_schema in value.items():
+                        _walk(
+                            prop_schema,
+                            nullable_context=nullable_context,
+                            nullable_property=prop_name in field_names,
+                        )
+                    continue
+                _walk(
+                    value,
+                    nullable_context=nullable_context,
+                    nullable_property=nullable_property,
+                )
+        elif isinstance(node, list):
+            for item in node:
+                _walk(
+                    item,
+                    nullable_context=nullable_context,
+                    nullable_property=nullable_property,
+                )
+
+    _walk(schema)
+
+
 def _hydrate_ref_types(schema: dict[str, Any]) -> None:
     """Attach explicit types to $ref nodes when available.
 
@@ -556,17 +650,18 @@ class StructureBase(BaseModelJSONSerializable):
 
         cleaned_schema = cast(dict[str, Any], clean_refs(schema))
 
-        cleaned_schema = cast(dict[str, Any], cleaned_schema)
-        _hydrate_ref_types(cleaned_schema)
-        _ensure_items_have_schema(cleaned_schema)
-        _ensure_schema_has_type(cleaned_schema)
-
         nullable_fields = {
             name
             for name, model_field in getattr(cls, "model_fields", {}).items()
             if getattr(model_field, "default", inspect.Signature.empty) is None
         }
 
+        cleaned_schema = cast(dict[str, Any], cleaned_schema)
+        _hydrate_ref_types(cleaned_schema)
+        _ensure_items_have_schema(cleaned_schema)
+        _ensure_schema_has_type(cleaned_schema)
+        _strip_ref_types(cleaned_schema, nullable_fields=nullable_fields)
+
         properties = cleaned_schema.get("properties", {})
         if isinstance(properties, dict) and nullable_fields:
             for field_name in nullable_fields:

{openai_sdk_helpers-0.6.4.dist-info → openai_sdk_helpers-0.6.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openai-sdk-helpers
-Version: 0.6.4
+Version: 0.6.5
 Summary: Composable helpers for OpenAI SDK agents, prompts, and storage
 Author: openai-sdk-helpers maintainers
 License: MIT

{openai_sdk_helpers-0.6.4.dist-info → openai_sdk_helpers-0.6.5.dist-info}/RECORD

@@ -57,7 +57,7 @@ openai_sdk_helpers/streamlit_app/app.py,sha256=kkjtdCKVwrJ9nZWuBArm3dhvcjMESX0TM
 openai_sdk_helpers/streamlit_app/configuration.py,sha256=0KeJ4HqCNFthBHsedV6ptqHluAcTPBb5_TujFOGkIUU,16685
 openai_sdk_helpers/structure/__init__.py,sha256=w27ezTYVLzZdDMFfA8mawE82h8zO53idFBCiCfYfh7s,4321
 openai_sdk_helpers/structure/agent_blueprint.py,sha256=VyJWkgPNzAYKRDMeR1M4kE6qqQURnwqtrrEn0TRJf0g,9698
-openai_sdk_helpers/structure/base.py,sha256=UrnNNU9qQ9mEES8MB9y6QESbDgPXH47XW8LVWSxYUYM,25280
+openai_sdk_helpers/structure/base.py,sha256=OVI305F2suG6c2Qh_ZD_wZ1mS1GpqPBC-4RqInXqiAU,28512
 openai_sdk_helpers/structure/classification.py,sha256=SYrrsv0Y2A2kXhL3jbn7lWnTb5jB_UE-cx-sJSRCxEA,17312
 openai_sdk_helpers/structure/extraction.py,sha256=wODP0iLAhhsdQkMWRYPYTiLUMU8bFMKiBjPl3PKUleg,37335
 openai_sdk_helpers/structure/prompt.py,sha256=ZfsaHdA0hj5zmZDrOdpXjCsC8U-jjzwFG4JBsWYiaH4,1535
@@ -92,8 +92,8 @@ openai_sdk_helpers/vector_storage/__init__.py,sha256=L5LxO09puh9_yBB9IDTvc1CvVkA
 openai_sdk_helpers/vector_storage/cleanup.py,sha256=sZ4ZSTlnjF52o9Cc8A9dTX37ZYXXDxS_fdIpoOBWvrg,3666
 openai_sdk_helpers/vector_storage/storage.py,sha256=t_ukacaXRa9EXE4-3BxsrB4Rjhu6nTu7NA9IjCJBIpQ,24259
 openai_sdk_helpers/vector_storage/types.py,sha256=jTCcOYMeOpZWvcse0z4T3MVs-RBOPC-fqWTBeQrgafU,1639
-openai_sdk_helpers-0.6.4.dist-info/METADATA,sha256=l5XBsVFPOrOSDskGR0ZhgKHjJFLtO_-ZgWrRjXi1_bU,24622
-openai_sdk_helpers-0.6.4.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-openai_sdk_helpers-0.6.4.dist-info/entry_points.txt,sha256=gEOD1ZeXe8d2OP-KzUlG-b_9D9yUZTCt-GFW3EDbIIY,63
-openai_sdk_helpers-0.6.4.dist-info/licenses/LICENSE,sha256=CUhc1NrE50bs45tcXF7OcTQBKEvkUuLqeOHgrWQ5jaA,1067
-openai_sdk_helpers-0.6.4.dist-info/RECORD,,
+openai_sdk_helpers-0.6.5.dist-info/METADATA,sha256=xInZz82S0zSN3YkKs_T949-3h0E_8mJaslN1nBgvES8,24622
+openai_sdk_helpers-0.6.5.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+openai_sdk_helpers-0.6.5.dist-info/entry_points.txt,sha256=gEOD1ZeXe8d2OP-KzUlG-b_9D9yUZTCt-GFW3EDbIIY,63
+openai_sdk_helpers-0.6.5.dist-info/licenses/LICENSE,sha256=CUhc1NrE50bs45tcXF7OcTQBKEvkUuLqeOHgrWQ5jaA,1067
+openai_sdk_helpers-0.6.5.dist-info/RECORD,,