fxn 0.0.29__tar.gz → 0.0.30__tar.gz

{fxn-0.0.29 → fxn-0.0.30}/PKG-INFO

@@ -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
 

{fxn-0.0.29 → fxn-0.0.30}/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-0.0.29 → fxn-0.0.30}/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 → fxn-0.0.30}/fxn.egg-info/PKG-INFO

@@ -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
 

{fxn-0.0.29 → fxn-0.0.30}/setup.py

@@ -25,7 +25,7 @@ setup(
     long_description=long_description,
     long_description_content_type="text/markdown",
     license="Apache License 2.0",
-	python_requires=">=3.7",
+	python_requires=">=3.9",
     install_requires=[
         "aiohttp",
         "magika",