inferencesh 0.1.10__py3-none-any.whl → 0.1.12__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):
@@ -48,30 +119,44 @@ class File(BaseModel):
         """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
-        # Create a temporary file with a suffix based on the URL path
-        suffix = os.path.splitext(urllib.parse.urlparse(original_url).path)[1]
-        tmp_file = tempfile.NamedTemporaryFile(delete=False, suffix=suffix)
-        self._tmp_path = tmp_file.name
-        
-        # Set up request with user agent
-        headers = {
-            'User-Agent': (
-                'Mozilla/5.0 (Windows NT 10.0; Win64; x64) '
-                'AppleWebKit/537.36 (KHTML, like Gecko) '
-                'Chrome/91.0.4472.124 Safari/537.36'
-            )
-        }
-        req = urllib.request.Request(original_url, headers=headers)
-        
-        # Download the file
-        print(f"Downloading URL: {original_url} to {self._tmp_path}")
-        with urllib.request.urlopen(req) as response, open(self._tmp_path, 'wb') as out_file:
-            out_file.write(response.read())
-        self.path = self._tmp_path
+        tmp_file = None
+        try:
+            # Create a temporary file with a suffix based on the URL path
+            suffix = os.path.splitext(urllib.parse.urlparse(original_url).path)[1]
+            tmp_file = tempfile.NamedTemporaryFile(delete=False, suffix=suffix)
+            self._tmp_path = tmp_file.name
+            
+            # Set up request with user agent
+            headers = {
+                'User-Agent': (
+                    'Mozilla/5.0 (Windows NT 10.0; Win64; x64) '
+                    'AppleWebKit/537.36 (KHTML, like Gecko) '
+                    'Chrome/91.0.4472.124 Safari/537.36'
+                )
+            }
+            req = urllib.request.Request(original_url, headers=headers)
+            
+            # Download the file
+            print(f"Downloading URL: {original_url} to {self._tmp_path}")
+            try:
+                with urllib.request.urlopen(req) as response, open(self._tmp_path, 'wb') as out_file:
+                    out_file.write(response.read())
+                self.path = self._tmp_path
+            except (urllib.error.URLError, urllib.error.HTTPError) as e:
+                raise RuntimeError(f"Failed to download URL {original_url}: {str(e)}")
+            except IOError as e:
+                raise RuntimeError(f"Failed to write downloaded file to {self._tmp_path}: {str(e)}")
+        except Exception as e:
+            # Clean up temp file if something went wrong
+            if tmp_file is not None and hasattr(self, '_tmp_path'):
+                try:
+                    os.unlink(self._tmp_path)
+                except:
+                    pass
+            raise RuntimeError(f"Error downloading URL {original_url}: {str(e)}")
 
     def __del__(self):
         """Cleanup temporary file if it exists."""

{inferencesh-0.1.10.dist-info → inferencesh-0.1.12.dist-info}/METADATA

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

inferencesh-0.1.12.dist-info/RECORD

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

inferencesh-0.1.10.dist-info/RECORD

@@ -1,8 +0,0 @@
-inferencesh/__init__.py,sha256=pR0MXSJe41LgJkjGK-jhZR7LjqCFdRZtNTV6qcjYSTI,123
-inferencesh/sdk.py,sha256=N1GubtBeFkvqnpDisU8DUm7376HEkug1AwgoTV4Irv0,4081
-inferencesh-0.1.10.dist-info/LICENSE,sha256=OsgqEWIh2el_QMj0y8O1A5Q5Dl-dxqqYbFE6fszuR4s,1086
-inferencesh-0.1.10.dist-info/METADATA,sha256=Xx4mNEwqLMfhZfdZenwPhA-XWMbgvvWEQ-WzMxyD5Tc,2584
-inferencesh-0.1.10.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-inferencesh-0.1.10.dist-info/entry_points.txt,sha256=6IC-fyozAqW3ljsMLGCXxJ0_ui2Jb-2fLHtoH1RTnEE,45
-inferencesh-0.1.10.dist-info/top_level.txt,sha256=TSMHg3T1ThMl1HGAWmzBClwOYH1ump5neof9BfHIwaA,12
-inferencesh-0.1.10.dist-info/RECORD,,