fxn 0.0.29__py3-none-any.whl → 0.0.30__py3-none-any.whl

fxn/services/prediction/service.py

@@ -7,9 +7,9 @@ from aiohttp import ClientSession
 from ctypes import byref, c_double, c_int32, create_string_buffer
 from dataclasses import asdict, is_dataclass
 from datetime import datetime, timezone
-from filetype import guess_mime
 from io import BytesIO
 from json import dumps, loads
+from magika import Magika
 from numpy import array, float32, frombuffer, int32, ndarray
 from numpy.typing import NDArray
 from pathlib import Path
@@ -367,28 +367,35 @@ class PredictionService:
             )
         finally:
             fxnc.FXNProfileRelease(profile)
-            #fxnc.FXNValueMapRelease(input_map)
+            fxnc.FXNValueMapRelease(input_map)
             fxnc.FXNValueMapRelease(output_map)
 
-    def __parse_prediction (self, data: Dict[str, Any], *, raw_outputs: bool, return_binary_path: bool) -> Prediction:
+    def __parse_prediction (
+            self,
+            data: Dict[str, Any],
+            *,
+            raw_outputs: bool,
+            return_binary_path: bool
+        ) -> Prediction:
         prediction = Prediction(**data)
         prediction.results = [Value(**value) for value in prediction.results] if prediction.results is not None else None
         prediction.results = [self.to_object(value, return_binary_path=return_binary_path) for value in prediction.results] if prediction.results is not None and not raw_outputs else prediction.results
         return prediction
 
     def __get_data_dtype (self, data: Union[Path, BytesIO]) -> Dtype:
-        mime = guess_mime(str(data) if isinstance(data, Path) else data)
-        if not mime:
-            return Dtype.binary
-        if mime.startswith("image"):
+        magika = Magika()
+        result = magika.identify_bytes(data.getvalue()) if isinstance(data, BytesIO) else magika.identify_path(data)
+        group = result.output.group
+        if group == "image":
             return Dtype.image
-        if mime.startswith("video"):
-            return Dtype.video
-        if mime.startswith("audio"):
+        elif group == "audio":
             return Dtype.audio
-        if isinstance(data, Path) and data.suffix in [".obj", ".gltf", ".glb", ".fbx", ".usd", ".usdz", ".blend"]:
+        elif group == "video":
+            return Dtype.video
+        elif isinstance(data, Path) and data.suffix in [".obj", ".gltf", ".glb", ".fbx", ".usd", ".usdz", ".blend"]:
             return Dtype._3d
-        return Dtype.binary
+        else:
+            return Dtype.binary
 
     def __download_value_data (self, url: str) -> BytesIO:
         if url.startswith("data:"):

fxn/version.py

@@ -3,4 +3,4 @@
 #   Copyright © 2024 NatML Inc. All Rights Reserved.
 #
 
-__version__ = "0.0.29"
+__version__ = "0.0.30"

{fxn-0.0.29.dist-info → fxn-0.0.30.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fxn
-Version: 0.0.29
+Version: 0.0.30
 Summary: Run on-device and cloud AI prediction functions in Python. Register at https://fxn.ai.
 Home-page: https://fxn.ai
 Author: NatML Inc.
@@ -14,7 +14,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Scientific/Engineering :: Image Recognition
 Classifier: Topic :: Software Development :: Libraries
-Requires-Python: >=3.7
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp

{fxn-0.0.29.dist-info → fxn-0.0.30.dist-info}/RECORD

@@ -1,7 +1,7 @@
 fxn/__init__.py,sha256=tWk0-aCNHX_yCS-Dg90pYnniNka9MWFoNMk6xY7u4nI,157
 fxn/function.py,sha256=H2oviHGWfal2O7d386R8BZDMUZYdfOuMB7OijiPKo54,1632
 fxn/magic.py,sha256=PQmXhO9EvJ5EZylioV-6gsCvqhVRYscKBSOBoN4VhTk,1041
-fxn/version.py,sha256=2bH3KKQTSZHS38Wa1uImYccLoJHRXdAc_UJR20CpoME,95
+fxn/version.py,sha256=A2_mJosEtqos00n0S2q_ctD70NhvQ0jouy6KHj5ttxI,95
 fxn/cli/__init__.py,sha256=gwMG0euV0qCe_vSvJLqBd6VWoQ99T-y4xQXeA4m4Wf0,1492
 fxn/cli/auth.py,sha256=MpHxhqPjGY92TmaTh3o58i868Cv-6Xgf13Si1NFluMg,1677
 fxn/cli/env.py,sha256=shqoP4tUiXdOoil73oiUYpqGeVcR119HPYFKgnoF894,1553
@@ -17,7 +17,7 @@ fxn/services/storage.py,sha256=MY4in8XXVHDIpp8f928PFdujwegESb6m1zzop6d-z58,5517
 fxn/services/user.py,sha256=z7mencF-muknruaUuoleu6JoL-QsPJcrJ6ONT_6U7fk,1219
 fxn/services/prediction/__init__.py,sha256=TPox_z58SRjIvziCt1UnLNN1O23n_iF6HcmI0p9hwpQ,129
 fxn/services/prediction/fxnc.py,sha256=UsU95dWaRoyxMEEKYjh5b4Sa0bspUn7tXdwNu9ug6fc,11673
-fxn/services/prediction/service.py,sha256=rBz51l2jh8K2LldHyWjA-XROYwHCtaUlAmUrDOSpL_E,20217
+fxn/services/prediction/service.py,sha256=-p-J5LOX18EQcAO316C0DGZw6YS9Kvjc5Y7VomqaNKs,20333
 fxn/types/__init__.py,sha256=jHLpQnvUKGQujVPK3li1rIkANBBvw6l_EznzIsfoD88,438
 fxn/types/dtype.py,sha256=YpTnIG-yzrQwda27GzfGZcel-zF3gOMMoHhcWD915BY,617
 fxn/types/environment.py,sha256=FbmfGjSb5yYMT9IyDj8zNUpsoP3RbzqM6tK8gn2TfDs,394
@@ -28,9 +28,9 @@ fxn/types/storage.py,sha256=AtVKR3CtHzvSWLiJS_bbUyIA2Of_IKZVeL5_1PqqrQ0,228
 fxn/types/tag.py,sha256=hWzSDCo8VjRHjS5ZLuFi3xVo8cuCNaNeULQ2mHEuwzM,707
 fxn/types/user.py,sha256=_hc1YQh0WydniAurywA70EDs4VCY5rnGRYSiRc97Ab0,150
 fxn/types/value.py,sha256=_Euyb3ffydKV1Q68Mf2G9mz7gKD5NzFap-aX1NEuNuY,767
-fxn-0.0.29.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-fxn-0.0.29.dist-info/METADATA,sha256=Hei9Ql3Jq6M_7zmVU6TxLPvbAjndXA_7rcexy45dRs8,3340
-fxn-0.0.29.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-fxn-0.0.29.dist-info/entry_points.txt,sha256=QBwKIRed76CRY98VYQYrQDVEBZtJugxJJmBpilxuios,46
-fxn-0.0.29.dist-info/top_level.txt,sha256=1ULIEGrnMlhId8nYAkjmRn9g3KEFuHKboq193SEKQkA,4
-fxn-0.0.29.dist-info/RECORD,,
+fxn-0.0.30.dist-info/LICENSE,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+fxn-0.0.30.dist-info/METADATA,sha256=0gDRWpFCUFnqGqMVveI9E7pf5YQEZYO54gG1vBKdDmc,3340
+fxn-0.0.30.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+fxn-0.0.30.dist-info/entry_points.txt,sha256=QBwKIRed76CRY98VYQYrQDVEBZtJugxJJmBpilxuios,46
+fxn-0.0.30.dist-info/top_level.txt,sha256=1ULIEGrnMlhId8nYAkjmRn9g3KEFuHKboq193SEKQkA,4
+fxn-0.0.30.dist-info/RECORD,,