inferencesh 0.1.11__py3-none-any.whl → 0.1.14__py3-none-any.whl

inferencesh/sdk.py

@@ -6,10 +6,81 @@ import urllib.request
 import urllib.parse
 import tempfile
 
-class BaseAppInput(BaseModel):
+from typing import Any, Dict, List
+import inspect
+import ast
+import textwrap
+from collections import OrderedDict
+
+
+# inspired by https://github.com/pydantic/pydantic/issues/7580
+class OrderedSchemaModel(BaseModel):
+    """A base model that ensures the JSON schema properties and required fields are in the order of field definition."""
+
+    @classmethod
+    def model_json_schema(cls, by_alias: bool = True, **kwargs: Any) -> Dict[str, Any]:
+        schema = super().model_json_schema(by_alias=by_alias, **kwargs)
+
+        field_order = cls._get_field_order()
+
+        if field_order:
+            # Order properties
+            ordered_properties = OrderedDict()
+            for field_name in field_order:
+                if field_name in schema['properties']:
+                    ordered_properties[field_name] = schema['properties'][field_name]
+
+            # Add any remaining properties that weren't in field_order
+            for field_name, field_schema in schema['properties'].items():
+                if field_name not in ordered_properties:
+                    ordered_properties[field_name] = field_schema
+
+            schema['properties'] = ordered_properties
+
+            # Order required fields
+            if 'required' in schema:
+                ordered_required = [field for field in field_order if field in schema['required']]
+                # Add any remaining required fields that weren't in field_order
+                ordered_required.extend([field for field in schema['required'] if field not in ordered_required])
+                schema['required'] = ordered_required
+
+        return schema
+
+    @classmethod
+    def _get_field_order(cls) -> List[str]:
+        """Get the order of fields as they were defined in the class."""
+        source = inspect.getsource(cls)
+
+        # Unindent the entire source code
+        source = textwrap.dedent(source)
+
+        try:
+            module = ast.parse(source)
+        except IndentationError:
+            # If we still get an IndentationError, wrap the class in a dummy module
+            source = f"class DummyModule:\n{textwrap.indent(source, '    ')}"
+            module = ast.parse(source)
+            # Adjust to look at the first class def inside DummyModule
+            # noinspection PyUnresolvedReferences
+            class_def = module.body[0].body[0]
+        else:
+            # Find the class definition
+            class_def = next(
+                node for node in module.body if isinstance(node, ast.ClassDef) and node.name == cls.__name__
+            )
+
+        # Extract field names in the order they were defined
+        field_order = []
+        for node in class_def.body:
+            if isinstance(node, ast.AnnAssign) and isinstance(node.target, ast.Name):
+                field_order.append(node.target.id)
+
+        return field_order
+    
+class BaseAppInput(OrderedSchemaModel):
     pass
 
-class BaseAppOutput(BaseModel):
+class BaseAppOutput(OrderedSchemaModel):
     pass
 
 class BaseApp(BaseModel):
@@ -30,27 +101,31 @@ class BaseApp(BaseModel):
 
 class File(BaseModel):
     """A class representing a file in the inference.sh ecosystem."""
-    path: str  # Absolute path to the file or URL
+    uri: str  # Original location (URL or file path)
+    path: Optional[str] = None  # Resolved local file path
     mime_type: Optional[str] = None  # MIME type of the file
     size: Optional[int] = None  # File size in bytes
     filename: Optional[str] = None  # Original filename if available
-    _tmp_path: Optional[str] = None  # Internal storage for temporary file path
+    _tmp_path: Optional[str] = PrivateAttr(default=None)  # Internal storage for temporary file path
     
     def __init__(self, **data):
         super().__init__(**data)
-        if self._is_url(self.path):
+        if self._is_url(self.uri):
             self._download_url()
-        elif not os.path.isabs(self.path):
-            self.path = os.path.abspath(self.path)
+        elif not os.path.isabs(self.uri):
+            self.path = os.path.abspath(self.uri)
+        else:
+            self.path = self.uri
         self._populate_metadata()
     
     def _is_url(self, path: str) -> bool:
         """Check if the path is a URL."""
         parsed = urllib.parse.urlparse(path)
         return parsed.scheme in ('http', 'https')
+
     def _download_url(self) -> None:
         """Download the URL to a temporary file and update the path."""
-        original_url = self.path
+        original_url = self.uri
         tmp_file = None
         try:
             # Create a temporary file with a suffix based on the URL path
@@ -108,7 +183,7 @@ class File(BaseModel):
     @classmethod
     def from_path(cls, path: Union[str, os.PathLike]) -> 'File':
         """Create a File instance from a file path."""
-        return cls(path=str(path))
+        return cls(uri=str(path))
     
     def _guess_mime_type(self) -> Optional[str]:
         """Guess the MIME type of the file."""

{inferencesh-0.1.11.dist-info → inferencesh-0.1.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: inferencesh
-Version: 0.1.11
+Version: 0.1.14
 Summary: inference.sh Python SDK
 Author: Inference Shell Inc.
 Author-email: "Inference Shell Inc." <hello@inference.sh>

inferencesh-0.1.14.dist-info/RECORD

@@ -0,0 +1,8 @@
+inferencesh/__init__.py,sha256=pR0MXSJe41LgJkjGK-jhZR7LjqCFdRZtNTV6qcjYSTI,123
+inferencesh/sdk.py,sha256=hfdaQs-ojHStDOqgBpNEXsqF8VmutbT-0mgQMm3PSVQ,7843
+inferencesh-0.1.14.dist-info/LICENSE,sha256=OsgqEWIh2el_QMj0y8O1A5Q5Dl-dxqqYbFE6fszuR4s,1086
+inferencesh-0.1.14.dist-info/METADATA,sha256=_e4fr2uefeABHk6hwnWnHDddL8QT-mFYrE7dRaIp9gA,2584
+inferencesh-0.1.14.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+inferencesh-0.1.14.dist-info/entry_points.txt,sha256=6IC-fyozAqW3ljsMLGCXxJ0_ui2Jb-2fLHtoH1RTnEE,45
+inferencesh-0.1.14.dist-info/top_level.txt,sha256=TSMHg3T1ThMl1HGAWmzBClwOYH1ump5neof9BfHIwaA,12
+inferencesh-0.1.14.dist-info/RECORD,,

{inferencesh-0.1.11.dist-info → inferencesh-0.1.14.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (76.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

inferencesh-0.1.11.dist-info/RECORD

@@ -1,8 +0,0 @@
-inferencesh/__init__.py,sha256=pR0MXSJe41LgJkjGK-jhZR7LjqCFdRZtNTV6qcjYSTI,123
-inferencesh/sdk.py,sha256=Czs31xNdlm9LB_PdCo5Vnknn46c98votVsRbv9gHezU,4870
-inferencesh-0.1.11.dist-info/LICENSE,sha256=OsgqEWIh2el_QMj0y8O1A5Q5Dl-dxqqYbFE6fszuR4s,1086
-inferencesh-0.1.11.dist-info/METADATA,sha256=RbW4TasZukB7XGe7wZsk6rR8pwuTs_fCiaMLvecmL-k,2584
-inferencesh-0.1.11.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-inferencesh-0.1.11.dist-info/entry_points.txt,sha256=6IC-fyozAqW3ljsMLGCXxJ0_ui2Jb-2fLHtoH1RTnEE,45
-inferencesh-0.1.11.dist-info/top_level.txt,sha256=TSMHg3T1ThMl1HGAWmzBClwOYH1ump5neof9BfHIwaA,12
-inferencesh-0.1.11.dist-info/RECORD,,