inferencesh 0.4.9__py3-none-any.whl → 0.4.11__py3-none-any.whl

inferencesh/models/file.py

@@ -1,5 +1,6 @@
-from typing import Optional, Union, Any
-from pydantic import BaseModel, Field, PrivateAttr, model_validator
+from typing import Optional, Union, Any, Type
+from pydantic import BaseModel, Field, PrivateAttr, model_validator, GetCoreSchemaHandler, GetJsonSchemaHandler
+from pydantic_core import CoreSchema, core_schema
 import mimetypes
 import os
 import urllib.request
@@ -7,9 +8,9 @@ import urllib.parse
 import hashlib
 from pathlib import Path
 from tqdm import tqdm
-from pydantic_core import core_schema
-from pydantic_core.core_schema import GetJsonSchemaHandler, JsonSchemaValue
 
+from pydantic import GetCoreSchemaHandler, GetJsonSchemaHandler
+from pydantic_core import CoreSchema, core_schema
 
 class File(BaseModel):
     """A class representing a file in the inference.sh ecosystem."""
@@ -239,26 +240,35 @@ class File(BaseModel):
             self.filename = self._get_filename()
 
     @classmethod
-    def model_json_schema(cls, **kwargs):
-        schema = super().model_json_schema(**kwargs)
-        schema["$id"] = "/schemas/File"
-        # Create a schema that accepts either a string or the full object
-        return {
-            "oneOf": [
-                {"type": "string"},  # Accept string input
-                schema  # Accept full object input
-            ]
-        } 
+    def __get_pydantic_core_schema__(
+        cls, source: Type[Any], handler: GetCoreSchemaHandler
+    ) -> CoreSchema:
+        """Generates a Pydantic Core schema for validation of this File class"""
+        # Get the default schema for our class
+        schema = handler(source)
         
+        return core_schema.json_or_python_schema(
+            json_schema=core_schema.union_schema([
+                core_schema.str_schema(),  # Accept string input
+                schema,  # Accept full object input
+            ]),
+            python_schema=schema,
+            serialization=schema.get("serialization", {}),
+        )
+
     @classmethod
     def __get_pydantic_json_schema__(
-        cls, core_schema: core_schema.CoreSchema, handler: GetJsonSchemaHandler
-    ) -> JsonSchemaValue:
-        schema = handler(core_schema)  # this is the "normal" schema
-        return {
+        cls, schema: CoreSchema, handler: GetJsonSchemaHandler
+    ) -> dict[str, Any]:
+        """Customizes the JSON schema generation for this File class"""
+        json_schema = handler(schema)
+        json_schema = handler.resolve_ref_schema(json_schema)
+        json_schema.update({
+            "$id": "/schemas/File",
             "oneOf": [
                 {"type": "string"},
-                schema
+                json_schema
             ]
-        }
+        })
+        return json_schema
     

{inferencesh-0.4.9.dist-info → inferencesh-0.4.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: inferencesh
-Version: 0.4.9
+Version: 0.4.11
 Summary: inference.sh Python SDK
 Author-email: "Inference Shell Inc." <hello@inference.sh>
 Project-URL: Homepage, https://github.com/inference-sh/sdk

{inferencesh-0.4.9.dist-info → inferencesh-0.4.11.dist-info}/RECORD

@@ -2,14 +2,14 @@ inferencesh/__init__.py,sha256=dY3l3yCkWoMtGX0gNXgxFnrprFRl6PPWjH8V7Qedx5g,772
 inferencesh/client.py,sha256=6wTCLqLq-QapvjCjMg8ZE3BQyg8iTL8hv8UU7t-oxmE,39360
 inferencesh/models/__init__.py,sha256=FDwcdtT6c4hbRitymjmN-hZMlQa8RbKSftkZZyjtUXA,536
 inferencesh/models/base.py,sha256=eTwRvXAjMGh6b8AUXWKSGpRyeScAkPs6bNYY8AXKSz8,5505
-inferencesh/models/file.py,sha256=-ZUR1Wx2bdoFxJYRdACl0VQGO8QJQUj6fWnS5SibsLo,10855
+inferencesh/models/file.py,sha256=ACqWkw97XLI5m0l3inJBd63fSmNqKhe3K8PXeZyDu5Q,11357
 inferencesh/models/llm.py,sha256=FPkTqVkH4mdKxUEdDVNimaPEr_mkpGofX7qTK4G1IHo,27873
 inferencesh/utils/__init__.py,sha256=-xiD6uo2XzcrPAWFb_fUbaimmnW4KFKc-8IvBzaxNd4,148
 inferencesh/utils/download.py,sha256=DRGBudiPVa5bDS35KfR-DYeGRk7gO03WOelnisecwMo,1815
 inferencesh/utils/storage.py,sha256=E4J8emd4eFKdmdDgAqzz3TpaaDd3n0l8gYlMHuY8yIU,519
-inferencesh-0.4.9.dist-info/licenses/LICENSE,sha256=OsgqEWIh2el_QMj0y8O1A5Q5Dl-dxqqYbFE6fszuR4s,1086
-inferencesh-0.4.9.dist-info/METADATA,sha256=KSz0RlU3jd7-OdVLbH2rQ3BRjFy8tPsvg5oNiEYDoe8,5405
-inferencesh-0.4.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-inferencesh-0.4.9.dist-info/entry_points.txt,sha256=6IC-fyozAqW3ljsMLGCXxJ0_ui2Jb-2fLHtoH1RTnEE,45
-inferencesh-0.4.9.dist-info/top_level.txt,sha256=TSMHg3T1ThMl1HGAWmzBClwOYH1ump5neof9BfHIwaA,12
-inferencesh-0.4.9.dist-info/RECORD,,
+inferencesh-0.4.11.dist-info/licenses/LICENSE,sha256=OsgqEWIh2el_QMj0y8O1A5Q5Dl-dxqqYbFE6fszuR4s,1086
+inferencesh-0.4.11.dist-info/METADATA,sha256=LK2Az16XQWlaMMFjrvpqVYggrJRn-XYlaC6afN4ks9s,5406
+inferencesh-0.4.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+inferencesh-0.4.11.dist-info/entry_points.txt,sha256=6IC-fyozAqW3ljsMLGCXxJ0_ui2Jb-2fLHtoH1RTnEE,45
+inferencesh-0.4.11.dist-info/top_level.txt,sha256=TSMHg3T1ThMl1HGAWmzBClwOYH1ump5neof9BfHIwaA,12
+inferencesh-0.4.11.dist-info/RECORD,,