fxn 0.0.20__py3-none-any.whl → 0.0.21__py3-none-any.whl

fxn/api/value.py

@@ -14,7 +14,7 @@ from PIL import Image
 from pydantic import BaseModel
 from requests import get
 from tempfile import NamedTemporaryFile
-from typing import Dict, List, Optional, Union
+from typing import Any, Dict, List, Optional, Union
 from urllib.request import urlopen
 
 from .dtype import Dtype
@@ -84,7 +84,7 @@ class Value:
     @classmethod
     def from_value (
         cls,
-        value: Union[str, float, int, bool, ndarray, List, Dict[str, any], Path, Image.Image],
+        value: Union[str, float, int, bool, ndarray, List[Any], Dict[str, any], Path, Image.Image],
         name: str,
         min_upload_size: int=4096,
         key: str=None
@@ -100,6 +100,7 @@ class Value:
         Returns:
             Value: Function value.
         """
+        value = cls.__try_ensure_serializable(value)
         # None
         if value is None:
             return Value(None, type=Dtype.null)
@@ -140,14 +141,6 @@ class Value:
             buffer = BytesIO(value.encode("utf-8"))
             data = Storage.upload(buffer, UploadType.Value, name=name, data_url_limit=min_upload_size, key=key)
             return Value(data, type=Dtype.dict)
-        # Pydantic model
-        if isinstance(value, BaseModel):
-            value = value.model_dump(mode="json")
-            return Value.from_value(value, name=name, min_upload_size=min_upload_size, key=key)
-        # Dataclass # https://docs.python.org/3/library/dataclasses.html#dataclasses.is_dataclass
-        if is_dataclass(value) and not isinstance(value, type):
-            value = asdict(value)
-            return Value.from_value(value, name=name, min_upload_size=min_upload_size, key=key)
         # Image
         if isinstance(value, Image.Image):
             buffer = BytesIO()
@@ -155,7 +148,7 @@ class Value:
             value.save(buffer, format=format)
             data = Storage.upload(buffer, UploadType.Value, name=name, data_url_limit=min_upload_size, key=key)
             return Value(data, type=Dtype.image)
-        # Path
+        # Binary
         if isinstance(value, Path):
             assert value.exists(), "Value does not exist at the given path"
             assert value.is_file(), "Value path must point to a file, not a directory"
@@ -183,11 +176,23 @@ class Value:
 
     @classmethod
     def __download_value_data (cls, url: str) -> BytesIO:
-        # Check if data URL
         if url.startswith("data:"):
             with urlopen(url) as response:
                 return BytesIO(response.read())
-        # Download
         response = get(url)
         result = BytesIO(response.content)
-        return result
+        return result
+    
+    @classmethod
+    def __try_ensure_serializable (cls, value: Any) -> Any:
+        if value is None:
+            return value
+        if isinstance(value, Value): # passthrough
+            return value
+        if isinstance(value, list):
+            return [cls.__try_ensure_serializable(x) for x in value]
+        if is_dataclass(value) and not isinstance(value, type):
+            return asdict(value)
+        if isinstance(value, BaseModel):
+            return value.model_dump(mode="json")
+        return value

fxn/version.py

@@ -3,4 +3,4 @@
 #   Copyright © 2023 NatML Inc. All Rights Reserved.
 #
 
-__version__ = "0.0.20"
+__version__ = "0.0.21"

{fxn-0.0.20.dist-info → fxn-0.0.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fxn
-Version: 0.0.20
+Version: 0.0.21
 Summary: Run on-device and cloud AI prediction functions in Python. Register at https://fxn.ai.
 Home-page: https://fxn.ai
 Author: NatML Inc.

{fxn-0.0.20.dist-info → fxn-0.0.21.dist-info}/RECORD

@@ -1,6 +1,6 @@
 fxn/__init__.py,sha256=0NzZl5hRQ0MPNN4Wp9-ghqak2NJzhfHvVyBGX-IntKs,320
 fxn/magic.py,sha256=TRgE68OAo1djmeQRiqxnSJqa72td6zxnwo0s0bkdUKM,1041
-fxn/version.py,sha256=A06qHNetUacHz1BY6wJ_PrJ1-CGkYlkT5w48DYxY-jI,95
+fxn/version.py,sha256=pS0q_JGq_GGDrxYMd6x6dFCVcxH7u2LZZZT1h2PnK4g,95
 fxn/api/__init__.py,sha256=UcCERjadfSbqnt7urXYbrdRRFwA0QwpC9uBQYPJC5rE,460
 fxn/api/api.py,sha256=X2LRjer0s7ifecYsZmdqv5txEwPjA2ekdSCGUaQJ5So,927
 fxn/api/dtype.py,sha256=z9zjjsOk8X8LTCEpwLuWOTUys6nP_3L6VmZXLt0ilAY,617
@@ -11,16 +11,16 @@ fxn/api/profile.py,sha256=76RVnP0wF9eT5kefqbRVj2T7e-6yZbK4bzggDS1CYjY,876
 fxn/api/storage.py,sha256=GxSwYN5xOWovVJh1WfkVkwkWdCoBkeNP9OHTX8KgEiQ,4560
 fxn/api/tag.py,sha256=g7HuRv5ZCYYDy4iV8P0hR1tEQ1pZjv-HeqbE0-Li1Bs,832
 fxn/api/user.py,sha256=AMAwfVpsUsu1Q4Pu1LFfS8bReNaj9dNqBLOsF2qEVLQ,1272
-fxn/api/value.py,sha256=gJhxmLqdMAGVVw3Acoz9A4rnr2T0_DKJfdI5XU6bIWQ,7589
+fxn/api/value.py,sha256=ZL1NroqxP4RNkrbrrCaZurXsWp2qdglpnmTozRm8ooA,7625
 fxn/cli/__init__.py,sha256=5-yqKCUJCiNTA_7EHfCj5GZKthIQSdbPcVAdMnzYNLg,1492
 fxn/cli/auth.py,sha256=_5rZ9L-blD39U6-SgHV9V2ltyjJ7k32NY3bLvoGsaNc,1659
 fxn/cli/env.py,sha256=mnyaL27n59pCU-p2Jm1fo03se7btMV2zdoJWWVshF_M,1658
 fxn/cli/misc.py,sha256=gLEGGWyawUQaLOuy8bfS2wrJuS-tN-bleOrv5A07xck,690
 fxn/cli/predict.py,sha256=YP7BiqnT39AeeA3A9EXfHmw-6t5vCxOu27_kjinWdGE,3178
 fxn/cli/predictors.py,sha256=vAL1FioQSseEiu7jbXY0DRiHnnMmThK2csJLThizS7A,3481
-fxn-0.0.20.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-fxn-0.0.20.dist-info/METADATA,sha256=q9L4FVEjUiIYIn4yid0C4CYD66gUZ_t7aPRo9UZ7xPI,2887
-fxn-0.0.20.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-fxn-0.0.20.dist-info/entry_points.txt,sha256=QBwKIRed76CRY98VYQYrQDVEBZtJugxJJmBpilxuios,46
-fxn-0.0.20.dist-info/top_level.txt,sha256=1ULIEGrnMlhId8nYAkjmRn9g3KEFuHKboq193SEKQkA,4
-fxn-0.0.20.dist-info/RECORD,,
+fxn-0.0.21.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+fxn-0.0.21.dist-info/METADATA,sha256=1TAftjeYqJAaSUEgkUioXFghSBPyEK0P_NdPaeDNjSk,2887
+fxn-0.0.21.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+fxn-0.0.21.dist-info/entry_points.txt,sha256=QBwKIRed76CRY98VYQYrQDVEBZtJugxJJmBpilxuios,46
+fxn-0.0.21.dist-info/top_level.txt,sha256=1ULIEGrnMlhId8nYAkjmRn9g3KEFuHKboq193SEKQkA,4
+fxn-0.0.21.dist-info/RECORD,,