Fixed issue with date handling

Author: ddebowczyk

examples/C07_Misc/SearchCriteria/run.php

@@ -74,13 +74,11 @@ public function execute() {
 ```php
 <?php
 function segment(string $data) : Search {
-    return (new StructuredOutput)->with(
-        messages: [[
-            "role" => "user",
-            "content" => "Consider the data below: '\n$data' and segment it into multiple search queries",
-        ]],
-        responseModel: Search::class,
-    )->get();
+    return (new StructuredOutput)
+        //->withDebugPreset('on')
+        ->withMessages("Consider the data below: '\n$data' and segment it into multiple search queries")
+        ->withResponseClass(Search::class)
+        ->get();
 }
 
 $search = segment("Find a picture of a cat and a video of a dog");

packages/instructor/src/Deserialization/Deserializers/FlexibleDateDenormalizer.php

@@ -15,7 +15,7 @@ public function denormalize($data, string $type, ?string $format = null, array $
             throw new NotNormalizableValueException('The data is not a string, it cannot be converted to a DateTime.');
         }
 
-        $output = $this->parseDate($data);
+        $output = $this->parseDate($data, $type);
 
         if ($output === false) {
             throw new NotNormalizableValueException('The date string could not be parsed.');
@@ -40,7 +40,7 @@ public function supportsDenormalization($data, string $type, ?string $format = n
         ]);
     }
 
-    private function parseDate(string $dateString) : DateTimeImmutable|DateTime|false {
+    private function parseDate(string $dateString, string $targetType) : DateTimeImmutable|DateTime|false {
         $formats = [
             'Y-m-d\TH:i:s.uP', // ISO8601 with microseconds
             'Y-m-d\TH:i:sP',   // ISO8601
@@ -54,11 +54,24 @@ private function parseDate(string $dateString) : DateTimeImmutable|DateTime|fals
         foreach ($formats as $format) {
             $date = DateTime::createFromFormat($format, $dateString);
             if ($date !== false) {
-                return $date;
+                return $this->convertToTargetType($date, $targetType);
             }
         }
 
         // If none of the formats work, try a more flexible approach
-        return date_create($dateString);
+        $date = date_create($dateString);
+        if ($date !== false) {
+            return $this->convertToTargetType($date, $targetType);
+        }
+
+        return false;
+    }
+
+    private function convertToTargetType(DateTime $date, string $targetType): DateTimeImmutable|DateTime {
+        if ($targetType === DateTimeImmutable::class || $targetType === DateTimeInterface::class) {
+            return DateTimeImmutable::createFromMutable($date);
+        }
+        
+        return $date;
     }
 }

packages/schema/src/Factories/SchemaFactory.php

@@ -80,6 +80,7 @@ public function schema(string|object $anyType) : Schema
                 typeName: $typeString,
                 schema: $this->makeSchema($type));
         }
+
         return $this->schemaMap->get($anyType);
     }
 

packages/schema/src/Factories/Traits/SchemaFactory/HandlesClassInfo.php

@@ -35,7 +35,6 @@ public function fromPropertyInfo(PropertyInfo $propertyInfo) : Schema {
      */
     protected function getPropertySchemas(ClassInfo $classInfo) : array {
         $properties = $classInfo->getProperties();
-
         $propertySchemas = [];
         foreach ($properties as $propertyName => $propertyInfo) {
             if (!$propertyInfo->isDeserializable()) {

packages/schema/src/Utils/Compat/PropertyInfoV6Adapter.php

@@ -63,8 +63,8 @@ public function isPropertyNullable(): bool {
     private function typesToUnionString(array $types): string {
         $result = [];
         foreach ($types as $type) {
-            if (in_array($type->getBuiltinType(), TypeDetails::PHP_SCALAR_TYPES)) { $result[] = $type->getBuiltinType(); }
             if ($type->isCollection()) { $result[] = $this->getCollectionOrArrayType($type); }
+            if (in_array($type->getBuiltinType(), TypeDetails::PHP_SCALAR_TYPES)) { $result[] = $type->getBuiltinType(); }
             if ($type->getBuiltinType() === Type::BUILTIN_TYPE_ARRAY) { $result[] = 'array'; }
             if ($type->getClassName()) { $result[] = $type->getClassName() ?? 'object'; }
             //if ($type->isNullable()) { $result[] = 'null'; }
@@ -74,19 +74,16 @@ private function typesToUnionString(array $types): string {
 
     private function getCollectionOrArrayType(Type $parentType): string {
         $valueTypes = $parentType->getCollectionValueTypes();
-        if (is_null($valueTypes)) {
-            return 'array';
-        }
 
         $result = [];
         foreach ($valueTypes as $valueType) {
             if (in_array($valueType->getBuiltinType(), TypeDetails::PHP_SCALAR_TYPES)) { $result[] = $valueType->getBuiltinType() . '[]'; }
-            if ($valueType->isCollection()) { $result[] = 'array'; } // collection of collections is considered an array
-            if ($valueType->getBuiltinType() === Type::BUILTIN_TYPE_ARRAY) { $result[] = 'array'; }
-            if ($valueType->getClassName()) { $result[] = $parentType->getClassName()
-                ? ($parentType->getClassName() . '[]')
+            if (!empty($valueType->getClassName())) { $result[] = $valueType->getClassName()
+                ? ($valueType->getClassName() . '[]')
                 : 'array';  // collection of unspecified objects is considered an array
             }
+            if ($valueType->isCollection()) { $result[] = 'array'; } // collection of collections is considered an array
+            if ($valueType->getBuiltinType() === Type::BUILTIN_TYPE_ARRAY) { $result[] = 'array'; }
             //if ($valueType->isNullable()) { $result[] = 'null'; }
         }
         return implode('|', $result);