Removes Changes Not Feature Specific

jambo/parser/__init__.py

@@ -9,7 +9,6 @@ from .float_type_parser import FloatTypeParser
 from .int_type_parser import IntTypeParser
 from .null_type_parser import NullTypeParser
 from .object_type_parser import ObjectTypeParser
-from .oneof_type_parser import OneOfTypeParser
 from .ref_type_parser import RefTypeParser
 from .string_type_parser import StringTypeParser
 
@@ -26,7 +25,6 @@ __all__ = [
     "IntTypeParser",
     "NullTypeParser",
     "ObjectTypeParser",
-    "OneOfTypeParser",
     "StringTypeParser",
     "RefTypeParser",
-]
+]

jambo/parser/_type_parser.py

@@ -124,26 +124,3 @@ class GenericTypeParser(ABC, Generic[T]):
             return False
 
         return True
-
-    @staticmethod
-    def _has_meaningful_constraints(field_props):
-        """
-        Check if field properties contain meaningful constraints that require Field wrapping.
-
-        Returns False if:
-        - field_props is None or empty
-        - field_props only contains {'default': None}
-
-        Returns True if:
-        - field_props contains a non-None default value
-        - field_props contains other constraint properties (min_length, max_length, pattern, etc.)
-        """
-        if not field_props:
-            return False
-
-        # If only default is set and it's None, no meaningful constraints
-        if field_props == {"default": None}:
-            return False
-
-        # If there are multiple properties or non-None default, that's meaningful
-        return True

jambo/parser/oneof_type_parser.py

@@ -1,69 +0,0 @@
-from jambo.parser._type_parser import GenericTypeParser
-from jambo.types.type_parser_options import TypeParserOptions
-
-from pydantic import Field, BeforeValidator, TypeAdapter, ValidationError
-from typing_extensions import Annotated, Union, Unpack, Any
-
-
-class OneOfTypeParser(GenericTypeParser):
-    mapped_type = Union
-
-    json_schema_type = "oneOf"
-
-    def from_properties_impl(
-            self, name, properties, **kwargs: Unpack[TypeParserOptions]
-    ):
-        if "oneOf" not in properties:
-            raise ValueError(f"Invalid JSON Schema: {properties}")
-
-        if not isinstance(properties["oneOf"], list):
-            raise ValueError(f"Invalid JSON Schema: {properties['oneOf']}")
-
-        mapped_properties = self.mappings_properties_builder(properties, **kwargs)
-
-        sub_properties = properties["oneOf"]
-
-        sub_types = [
-            GenericTypeParser.type_from_properties(name, subProperty, **kwargs)
-            for subProperty in sub_properties
-        ]
-
-        if not kwargs.get("required", False):
-            mapped_properties["default"] = mapped_properties.get("default")
-
-        field_types = [
-            Annotated[t, Field(**v)] if self._has_meaningful_constraints(v) else t
-            for t, v in sub_types
-        ]
-
-        union_type = Union[(*field_types,)]
-
-        discriminator = properties.get("discriminator")
-        if discriminator and isinstance(discriminator, dict):
-            property_name = discriminator.get("propertyName")
-            if property_name:
-                validated_type = Annotated[union_type, Field(discriminator=property_name)]
-                return validated_type, mapped_properties
-
-        def validate_one_of(value: Any) -> Any:
-            matched_count = 0
-            validation_errors = []
-
-            for field_type in field_types:
-                try:
-                    adapter = TypeAdapter(field_type)
-                    adapter.validate_python(value)
-                    matched_count += 1
-                except ValidationError as e:
-                    validation_errors.append(str(e))
-                    continue
-
-            if matched_count == 0:
-                raise ValueError(f"Value does not match any of the oneOf schemas")
-            elif matched_count > 1:
-                raise ValueError(f"Value matches multiple oneOf schemas, exactly one expected")
-
-            return value
-
-        validated_type = Annotated[union_type, BeforeValidator(validate_one_of)]
-        return validated_type, mapped_properties

jambo/parser/string_type_parser.py

@@ -16,6 +16,7 @@ class StringTypeParser(GenericTypeParser):
         "maxLength": "max_length",
         "minLength": "min_length",
         "pattern": "pattern",
+        "format": "format",
     }
 
     format_type_mapping = {
@@ -37,9 +38,7 @@ class StringTypeParser(GenericTypeParser):
     def from_properties_impl(
         self, name, properties, **kwargs: Unpack[TypeParserOptions]
     ):
-        mapped_properties = self.mappings_properties_builder(
-            properties, **kwargs
-        )
+        mapped_properties = self.mappings_properties_builder(properties, **kwargs)
 
         format_type = properties.get("format")
         if not format_type:
@@ -52,8 +51,4 @@ class StringTypeParser(GenericTypeParser):
         if format_type in self.format_pattern_mapping:
             mapped_properties["pattern"] = self.format_pattern_mapping[format_type]
 
-        if "json_schema_extra" not in mapped_properties:
-            mapped_properties["json_schema_extra"] = {}
-        mapped_properties["json_schema_extra"]["format"] = format_type
-
         return mapped_type, mapped_properties