fxn 0.0.36__tar.gz → 0.0.38__tar.gz

{fxn-0.0.36 → fxn-0.0.38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fxn
-Version: 0.0.36
+Version: 0.0.38
 Summary: Run prediction functions locally in Python. Register at https://fxn.ai.
 Author-email: "NatML Inc." <hi@fxn.ai>
 License:                                  Apache License
@@ -239,20 +239,24 @@ $ pip install --upgrade fxn
 ```
 
 > [!NOTE]
-> Function requires Python 3.9+
+> Function requires Python 3.10+
 
 ## Retrieving your Access Key
-Head over to [fxn.ai](https://fxn.ai) to create an account by logging in. Once you do, generate an access key:
+Head over to [fxn.ai](https://www.fxn.ai/account/developer) to create an account by logging in. Once you do, generate an access key:
 
 ![generate access key](https://raw.githubusercontent.com/fxnai/.github/main/access_key.gif)
 
 ## Making a Prediction
-Let's run the [`@fxn/greeting`](https://fxn.ai/@fxn/greeting) predictor which accepts a `name` and returns a congenial greeting. Run the following Python script:
+First, create a Function client, specifying your access key:
 ```py
 from fxn import Function
 
 # Create the Function client
 fxn = Function(access_key="<Function access key>")
+```
+
+Then make a prediction:
+```py
 # Create a prediction
 prediction = fxn.predictions.create(
     tag="@fxn/greeting",
@@ -264,16 +268,18 @@ print(prediction.results[0])
 
 > [!TIP]
 > Explore public predictors [on Function](https://fxn.ai/explore) or [create your own](https://fxn.ai/waitlist).
-r
-## Using the Function CLI
-Open up a terminal and run the following command:
 
+## Using the Function CLI
+Open up a terminal and login to the Function CLI:
 ```sh
 # Login to Function
-fxn auth login <ACCESS KEY>
+$ fxn auth login <ACCESS KEY>
+```
 
+Then make a prediction:
+```sh
 # Make a prediction using the Function CLI
-fxn predict @fxn/greeting --name Peter
+$ fxn predict @fxn/greeting --name Peter
 ```
 
 ___

{fxn-0.0.36 → fxn-0.0.38}/README.md

@@ -14,20 +14,24 @@ $ pip install --upgrade fxn
 ```
 
 > [!NOTE]
-> Function requires Python 3.9+
+> Function requires Python 3.10+
 
 ## Retrieving your Access Key
-Head over to [fxn.ai](https://fxn.ai) to create an account by logging in. Once you do, generate an access key:
+Head over to [fxn.ai](https://www.fxn.ai/account/developer) to create an account by logging in. Once you do, generate an access key:
 
 ![generate access key](https://raw.githubusercontent.com/fxnai/.github/main/access_key.gif)
 
 ## Making a Prediction
-Let's run the [`@fxn/greeting`](https://fxn.ai/@fxn/greeting) predictor which accepts a `name` and returns a congenial greeting. Run the following Python script:
+First, create a Function client, specifying your access key:
 ```py
 from fxn import Function
 
 # Create the Function client
 fxn = Function(access_key="<Function access key>")
+```
+
+Then make a prediction:
+```py
 # Create a prediction
 prediction = fxn.predictions.create(
     tag="@fxn/greeting",
@@ -39,16 +43,18 @@ print(prediction.results[0])
 
 > [!TIP]
 > Explore public predictors [on Function](https://fxn.ai/explore) or [create your own](https://fxn.ai/waitlist).
-r
-## Using the Function CLI
-Open up a terminal and run the following command:
 
+## Using the Function CLI
+Open up a terminal and login to the Function CLI:
 ```sh
 # Login to Function
-fxn auth login <ACCESS KEY>
+$ fxn auth login <ACCESS KEY>
+```
 
+Then make a prediction:
+```sh
 # Make a prediction using the Function CLI
-fxn predict @fxn/greeting --name Peter
+$ fxn predict @fxn/greeting --name Peter
 ```
 
 ___

{fxn-0.0.36 → fxn-0.0.38}/fxn/__init__.py

@@ -5,4 +5,4 @@
 
 from .function import Function
 from .types import *
-from .version import __version__
+from .version import *

fxn-0.0.38/fxn/cli/misc.py

@@ -0,0 +1,32 @@
+# 
+#   Function
+#   Copyright © 2024 NatML Inc. All Rights Reserved.
+#
+
+from rich import print
+from typer import Exit, Option
+from webbrowser import open as open_browser
+
+from ..version import __version__
+
+def _explore (value: bool):
+    if value:
+        open_browser("https://fxn.ai/explore")
+        raise Exit()
+
+def _learn (value: bool):
+    if value:
+        open_browser("https://docs.fxn.ai")
+        raise Exit()
+
+def _version (value: bool):
+    if value:
+        print(__version__)
+        raise Exit()
+
+def cli_options (
+    explore: bool = Option(None, "--explore", callback=_explore, help="Explore predictors on Function."),
+    learn: bool = Option(None, "--learn", callback=_learn, help="Learn about Function."),
+    version: bool = Option(None, "--version", callback=_version, help="Get the Function CLI version.")
+):
+    pass

{fxn-0.0.36 → fxn-0.0.38}/fxn/function.py

@@ -6,7 +6,7 @@
 from os import environ
 
 from .api import GraphClient
-from .services import EnvironmentVariableService, PredictionService, PredictorService, StorageService, UserService
+from .services import PredictionService, PredictorService, UserService
 
 class Function:
     """
@@ -26,16 +26,11 @@ class Function:
     users: UserService
     predictors: PredictorService
     predictions: PredictionService
-    #environment_variables: EnvironmentVariableService
-    #storage: StorageService
 
     def __init__ (self, access_key: str=None, api_url: str=None):
         access_key = access_key or environ.get("FXN_ACCESS_KEY", None)
         api_url = api_url or environ.get("FXN_API_URL", "https://api.fxn.ai")
-        client = GraphClient(access_key, api_url)
-        storage = StorageService(client)
-        self.client = client
-        self.users = UserService(client)
-        self.predictors = PredictorService(client, storage)
-        self.predictions = PredictionService(client)
-        #self.environment_variables = EnvironmentVariableService(self.client)
+        self.client = GraphClient(access_key, api_url)
+        self.users = UserService(self.client)
+        self.predictors = PredictorService(self.client)
+        self.predictions = PredictionService(self.client)

{fxn-0.0.36 → fxn-0.0.38}/fxn/services/__init__.py

@@ -5,6 +5,4 @@
 
 from .user import UserService, PROFILE_FIELDS, USER_FIELDS
 from .predictor import PredictorService, PREDICTOR_FIELDS
-from .prediction import PredictionService, PREDICTION_FIELDS
-from .environment import EnvironmentVariableService, ENVIRONMENT_VARIABLE_FIELDS
-from .storage import StorageService
+from .prediction import PredictionService, PREDICTION_FIELDS

{fxn-0.0.36 → fxn-0.0.38}/fxn/services/prediction.py

@@ -17,6 +17,7 @@ from PIL import Image
 from platform import machine, system
 from pydantic import BaseModel
 from requests import get, post
+from tempfile import gettempdir
 from typing import Any, AsyncIterator, Dict, List, Optional, Union
 from urllib.parse import urlparse
 
@@ -35,7 +36,7 @@ class PredictionService:
         self,
         tag: str,
         *,
-        inputs: Optional[Dict[str, Union[ndarray, str, float, int, bool, List, Dict[str, Any], Path, Image.Image]]] = None,
+        inputs: Optional[Dict[str, ndarray | str | float | int | bool | List[Any] | Dict[str, Any] | Path | Image.Image]] = None,
         acceleration: Acceleration=Acceleration.Default,
         client_id: str=None,
         configuration_id: str=None
@@ -58,7 +59,7 @@ class PredictionService:
             return self.__predict(tag=tag, predictor=self.__cache[tag], inputs=inputs)
         # Query
         response = post(
-            f"{self.client.api_url}/predict/{tag}?rawOutputs=true",
+            f"{self.client.api_url}/predict/{tag}",
             json={ },
             headers={
                 "Authorization": f"Bearer {self.client.access_key}",
@@ -124,35 +125,27 @@ class PredictionService:
         prediction = self.__predict(tag=tag, predictor=predictor, inputs=inputs)
         # Yield
         yield prediction
-    
+
     @classmethod
     def __load_fxnc (self) -> Optional[CDLL]:
-        # Get resource
-        package, resource = None, None
-        os = system()
-        if os == "Darwin":
-            package = f"fxn.lib.macos.{machine()}"
-            resource = f"Function.dylib"
-        elif os == "Linux" and False: # INCOMPLETE # Linux
-            package = f"fxn.lib.linux.{machine()}"
-            resource = f"libFunction.so"
-        elif os == "Windows":
-            package = f"fxn.lib.windows.{machine()}"
-            resource = f"Function.dll"
-        else:
-            return None
-        # Load
+        os = system().lower()
+        os = "macos" if os == "darwin" else os
+        arch = machine()
+        arch = "arm64" if arch == "aarch64" else arch
+        arch = "x86_64" if arch == "x64" else arch
+        package = f"fxn.lib.{os}.{arch}"
+        resource = "libFunction.so"
+        resource = "Function.dylib" if os == "macos" else resource
+        resource = "Function.dll" if os == "windows" else resource
         with resources.path(package, resource) as fxnc_path:
             return load_fxnc(fxnc_path)
 
     def __get_client_id (self) -> str:
         # Fallback if fxnc failed to load
         if not self.__fxnc:
-            return {
-                "Darwin":  f"macos-{machine()}",
-                "Linux": f"linux-{machine()}",
-                "Windows": f"windows-{machine()}"
-            }[system()]
+            os = system().lower()
+            os = "macos" if os == "darwin" else os
+            return f"{os}-{machine()}"
         # Get
         buffer = create_string_buffer(64)
         status = self.__fxnc.FXNConfigurationGetClientID(buffer, len(buffer))
@@ -383,7 +376,7 @@ class PredictionService:
             raise RuntimeError(f"Failed to convert Function value to Python value because Function value has unsupported type: {dtype}")
 
     def __get_resource_path (self, resource: PredictionResource) -> Path:
-        cache_dir = Path.home() / ".fxn" / "cache"
+        cache_dir = self.__class__.__get_resource_dir() / ".fxn" / "cache"
         cache_dir.mkdir(exist_ok=True)
         res_name = Path(urlparse(resource.url).path).name
         res_path = cache_dir / res_name
@@ -394,7 +387,18 @@ class PredictionService:
         with open(res_path, "wb") as f:
             f.write(req.content)
         return res_path
-    
+
+    @classmethod
+    def __get_resource_dir (cls) -> Path:
+        try:
+            check = Path.home() / ".fxntest"
+            with open(check, "w") as f:
+                f.write("fxn")
+            check.unlink()
+            return Path.home()
+        except:
+            return Path(gettempdir())
+
     @classmethod
     def __try_ensure_serializable (cls, object: Any) -> Any:
         if object is None:
@@ -427,11 +431,6 @@ resources {{
     url
     name
 }}
-results {{
-    data
-    type
-    shape
-}}
 latency
 error
 logs

{fxn-0.0.36 → fxn-0.0.38}/fxn/services/predictor.py

@@ -7,14 +7,12 @@ from typing import List
 
 from ..api import GraphClient
 from ..types import Predictor, PredictorStatus
-from .storage import StorageService
 from .user import PROFILE_FIELDS
 
 class PredictorService:
 
-    def __init__ (self, client: GraphClient, storage: StorageService) -> None:
+    def __init__ (self, client: GraphClient) -> None:
         self.client = client
-        self.storage = storage
 
     def retrieve (self, tag: str) -> Predictor:
         """
@@ -85,7 +83,7 @@ class PredictorService:
         predictors = [Predictor(**predictor) for predictor in predictors]
         # Return
         return predictors
-    
+
     def search (
         self,
         query: str,

{fxn-0.0.36 → fxn-0.0.38}/fxn/types/__init__.py

@@ -4,9 +4,6 @@
 #
 
 from .dtype import Dtype
-from .environment import EnvironmentVariable
 from .prediction import Prediction, PredictionResource
 from .predictor import Acceleration, AccessMode, EnumerationMember, Parameter, Predictor, PredictorStatus, Signature
-from .profile import Profile
-from .storage import UploadType
-from .user import User
+from .user import Profile, User

{fxn-0.0.36 → fxn-0.0.38}/fxn/types/predictor.py

@@ -11,16 +11,16 @@ from pydantic import AliasChoices, BaseModel, ConfigDict, Field
 from typing import Any, Dict, List, Optional, Tuple
 
 from .dtype import Dtype
-from .profile import Profile
+from .user import Profile
 
 class Acceleration (IntFlag):
     """
     Predictor acceleration.
     """
     Default = 0,
-    CPU = 1 << 0,
-    GPU = 1 << 1,
-    NPU = 1 << 2
+    CPU     = 1 << 0,
+    GPU     = 1 << 1,
+    NPU     = 1 << 2
 
 class AccessMode (str, Enum):
     """

fxn-0.0.36/fxn/types/profile.py → fxn-0.0.38/fxn/types/user.py

@@ -27,4 +27,9 @@ class Profile (BaseModel):
     avatar: Optional[str] = Field(default=None, description="User avatar URL.")
     bio: Optional[str] = Field(default=None, description="User bio.")
     website: Optional[str] = Field(default=None, description="User website.")
-    github: Optional[str] = Field(default=None, description="User GitHub handle.")
+    github: Optional[str] = Field(default=None, description="User GitHub handle.")
+
+class User (Profile):
+    """
+    User.
+    """

{fxn-0.0.36 → fxn-0.0.38}/fxn/version.py

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

{fxn-0.0.36 → fxn-0.0.38}/fxn.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fxn
-Version: 0.0.36
+Version: 0.0.38
 Summary: Run prediction functions locally in Python. Register at https://fxn.ai.
 Author-email: "NatML Inc." <hi@fxn.ai>
 License:                                  Apache License
@@ -239,20 +239,24 @@ $ pip install --upgrade fxn
 ```
 
 > [!NOTE]
-> Function requires Python 3.9+
+> Function requires Python 3.10+
 
 ## Retrieving your Access Key
-Head over to [fxn.ai](https://fxn.ai) to create an account by logging in. Once you do, generate an access key:
+Head over to [fxn.ai](https://www.fxn.ai/account/developer) to create an account by logging in. Once you do, generate an access key:
 
 ![generate access key](https://raw.githubusercontent.com/fxnai/.github/main/access_key.gif)
 
 ## Making a Prediction
-Let's run the [`@fxn/greeting`](https://fxn.ai/@fxn/greeting) predictor which accepts a `name` and returns a congenial greeting. Run the following Python script:
+First, create a Function client, specifying your access key:
 ```py
 from fxn import Function
 
 # Create the Function client
 fxn = Function(access_key="<Function access key>")
+```
+
+Then make a prediction:
+```py
 # Create a prediction
 prediction = fxn.predictions.create(
     tag="@fxn/greeting",
@@ -264,16 +268,18 @@ print(prediction.results[0])
 
 > [!TIP]
 > Explore public predictors [on Function](https://fxn.ai/explore) or [create your own](https://fxn.ai/waitlist).
-r
-## Using the Function CLI
-Open up a terminal and run the following command:
 
+## Using the Function CLI
+Open up a terminal and login to the Function CLI:
 ```sh
 # Login to Function
-fxn auth login <ACCESS KEY>
+$ fxn auth login <ACCESS KEY>
+```
 
+Then make a prediction:
+```sh
 # Make a prediction using the Function CLI
-fxn predict @fxn/greeting --name Peter
+$ fxn predict @fxn/greeting --name Peter
 ```
 
 ___

{fxn-0.0.36 → fxn-0.0.38}/fxn.egg-info/SOURCES.txt

@@ -3,7 +3,6 @@ README.md
 pyproject.toml
 fxn/__init__.py
 fxn/function.py
-fxn/magic.py
 fxn/version.py
 fxn.egg-info/PKG-INFO
 fxn.egg-info/SOURCES.txt
@@ -31,22 +30,18 @@ fxn/cli/misc.py
 fxn/cli/predict.py
 fxn/cli/predictors.py
 fxn/lib/__init__.py
+fxn/lib/linux/arm64/libFunction.so
+fxn/lib/linux/x86_64/libFunction.so
 fxn/lib/macos/arm64/Function.dylib
 fxn/lib/macos/x86_64/Function.dylib
 fxn/lib/windows/arm64/Function.dll
 fxn/lib/windows/x86_64/Function.dll
 fxn/services/__init__.py
-fxn/services/environment.py
 fxn/services/prediction.py
 fxn/services/predictor.py
-fxn/services/storage.py
 fxn/services/user.py
 fxn/types/__init__.py
 fxn/types/dtype.py
-fxn/types/environment.py
 fxn/types/prediction.py
 fxn/types/predictor.py
-fxn/types/profile.py
-fxn/types/storage.py
-fxn/types/tag.py
 fxn/types/user.py

fxn-0.0.36/fxn/cli/misc.py

@@ -1,26 +0,0 @@
-# 
-#   Function
-#   Copyright © 2024 NatML Inc. All Rights Reserved.
-#
-
-from rich import print
-from typer import Exit, Option
-from webbrowser import open as open_browser
-
-from ..version import __version__
-
-def _learn_callback (value: bool):
-    if value:
-        open_browser("https://docs.fxn.ai")
-        raise Exit()
-
-def _version_callback (value: bool):
-    if value:
-        print(__version__)
-        raise Exit()
-
-def cli_options (
-    learn: bool = Option(None, "--learn", callback=_learn_callback, help="Learn about Function."),
-    version: bool = Option(None, "--version", callback=_version_callback, help="Get the Function CLI version.")
-):
-    pass

fxn-0.0.36/fxn/magic.py

@@ -1,35 +0,0 @@
-# 
-#   Function
-#   Copyright © 2024 NatML Inc. All Rights Reserved.
-#
-
-from IPython.core.interactiveshell import InteractiveShell
-from IPython.core.magic import Magics, magics_class, line_magic
-from typing import List
-
-@magics_class
-class FunctionMagics (Magics):
-
-    @line_magic
-    def fxn (self, line: str):
-        COMMANDS = {
-            "python": self.__python,
-            "image": self.__image,
-        }
-        args = line.split(" ")
-        command = COMMANDS.get(args[0], None)
-        if command is not None:
-            command(args[1:])
-        else:
-            raise RuntimeError(f"Unrecognized Function command: {args[0]}")
-
-    def __python (self, args: List[str]):
-        version = args[0]
-        print(f"Predictor will use Python {version} when running on Function")
-
-    def __image (self, args: List[str]):
-        image = args[0]
-        print(f"Predictor will use base image {image} when running on Function")
-
-def load_ipython_extension (ipython: InteractiveShell):
-    ipython.register_magics(FunctionMagics)

fxn-0.0.36/fxn/services/environment.py

@@ -1,111 +0,0 @@
-#
-#   Function
-#   Copyright © 2024 NatML Inc. All Rights Reserved.
-#
-
-from typing import List
-
-from ..api import GraphClient
-from ..types import EnvironmentVariable
-
-class EnvironmentVariableService:
-
-    def __init__ (self, client: GraphClient) -> None:
-        self.client = client
-        self.__value = "xxxxxxxx"
-
-    def list (self, organization: str=None) -> List[EnvironmentVariable]:
-        """
-        List the current user's environment variables.
-
-        Note that the variable values can only viewed at https://fxn.ai.
-
-        Parameters:
-            organization (str): Organization username.
-
-        Returns:
-            list: User environment variables.
-        """
-        # Query
-        response = self.client.query(f"""
-            query ($input: UserInput) {{
-                user (input: $input) {{
-                    ... on User {{
-                        environmentVariables {{
-                            {ENVIRONMENT_VARIABLE_FIELDS}
-                        }}
-                    }}
-                    ... on Organization {{
-                        environmentVariables {{
-                            {ENVIRONMENT_VARIABLE_FIELDS}
-                        }}
-                    }}
-                }}
-            }}
-            """,
-            { "input": { "username": organization } if organization is not None else None }
-        )
-        # Create envs
-        assert response["user"] is not None, "Failed to list environment variables because user could not be found. Check that you are authenticated."
-        environments = response["user"]["environmentVariables"]
-        environments = [EnvironmentVariable(**env, value=self.__value) for env in environments]
-        # Return
-        return environments
-    
-    def create (self, name: str, value: str, organization: str=None) -> EnvironmentVariable:
-        """
-        Create an environment variable.
-
-        This environment variable will apply to all predictors you create.
-
-        Parameters:
-            name (str): Variable name.
-            value (str): Variable value.
-            organization (str): Organization username. Use this for organization environment variables.
-
-        Returns:
-            EnvironmentVariable: Created environment variable.
-        """
-        # Query
-        response = self.client.query(f"""
-            mutation ($input: CreateEnvironmentVariableInput!) {{
-                environment: createEnvironmentVariable (input: $input) {{
-                    {ENVIRONMENT_VARIABLE_FIELDS}
-                }}
-            }}
-            """,
-            { "input": { "name": name, "value": value, "organization": organization } }
-        )
-        # Create env
-        environment = response["environment"]
-        environment = EnvironmentVariable(**environment, value=self.__value)
-        # Return
-        return environment
-    
-    def delete (self, name: str, organization: str=None) -> bool:
-        """
-        Delete an environment variable.
-
-        Parameters:
-            name (str): Variable name.
-            organization (str): Organization username. Use this for organization environment variables.
-            access_key (str): Function access key.
-        
-        Returns:
-            bool: Whether the environment variable was successfully deleted.
-        """
-        # Query
-        response = self.client.query(f"""
-            mutation ($input: DeleteEnvironmentVariableInput!) {{
-                result: deleteEnvironmentVariable (input: $input)
-            }}
-            """,
-            { "input": { "name": name, "organization": organization } }
-        )
-        # Return
-        return response["result"]
-
-    
-ENVIRONMENT_VARIABLE_FIELDS = f"""
-name
-"""

fxn-0.0.36/fxn/services/storage.py

@@ -1,159 +0,0 @@
-# 
-#   Function
-#   Copyright © 2024 NatML Inc. All Rights Reserved.
-#
-
-from base64 import b64encode
-from io import BytesIO
-from magika import Magika
-from pathlib import Path
-from requests import put
-from rich.progress import open as open_progress, wrap_file
-from urllib.parse import urlparse, urlunparse
-
-from ..api import GraphClient
-from ..types import UploadType
-
-class StorageService:
-
-    def __init__ (self, client: GraphClient) -> None:
-        self.client = client
-
-    def create_upload_url (self, name: str, type: UploadType, key: str=None) -> str:
-        """
-        Create an upload URL.
-
-        Parameters:
-            name (str): File name.
-            type (UploadType): Upload type.
-            key (str): File key. This is useful for grouping related files.
-
-        Returns:
-            str: File upload URL.
-        """
-        # Query
-        response = self.client.query(f"""
-            mutation ($input: CreateUploadUrlInput!) {{
-                createUploadUrl (input: $input)
-            }}
-            """,
-            { "input": { "type": type, "name": name, "key": key } }
-        )
-        # Return
-        return response["createUploadUrl"]
-    
-    def upload (
-        self,
-        file: str | Path | BytesIO,
-        *,
-        type: UploadType,
-        name: str=None,
-        data_url_limit: int=None,
-        key: str=None,
-        verbose: bool=False
-    ) -> str:
-        """
-        Upload a file and return the URL.
-
-        Parameters:
-            file (str | Path | BytesIO): Input file.
-            type (UploadType): File type.
-            name (str): File name. This MUST be provided if `file` is not a file path.
-            data_url_limit (int): Return a data URL if the file is smaller than this limit (in bytes).
-            key (str): File key. This is useful for grouping related files.
-            verbose (bool): Print a progress bar for the upload.
-
-        Returns:
-            str: Upload URL.
-        """
-        file = Path(file) if isinstance(file, str) else file
-        if isinstance(file, Path):
-            return self.__upload_file(file, type=type, name=name, key=key, data_url_limit=data_url_limit, verbose=verbose)
-        else:
-            return self.__upload_buffer(file, type=type, name=name, key=key, data_url_limit=data_url_limit, verbose=verbose)
-        
-    def __upload_file (
-        self,
-        file: Path,
-        *,
-        type: UploadType,
-        name: str=None,
-        key: str=None,
-        data_url_limit: int=None,
-        verbose: bool=False
-    ) -> str:
-        # Check file
-        assert file.exists(), f"Cannot upload {file.name} because the file does not exist"
-        assert file.is_file(), f"Cannot upload {file.name} becaause it does not point to a file"   
-        # Create data URL
-        mime = self.__infer_mime(file)
-        if file.stat().st_size < (data_url_limit or 0):
-            with open(file, mode="rb") as f:
-                buffer = BytesIO(f.read())
-            return self.__create_data_url(buffer, mime=mime)
-        # Upload
-        name = name or file.name
-        url = self.create_upload_url(name, type, key=key)
-        with open_progress(file, mode="rb", description=name, disable=not verbose) as f:
-            put(url, data=f, headers={ "Content-Type": mime }).raise_for_status()
-        # Return
-        return self.__simplify_url(url)
-    
-    def __upload_buffer (
-        self,
-        file: BytesIO,
-        *,
-        type: UploadType,
-        name: str=None,
-        key: str=None,
-        data_url_limit: int=None,
-        verbose: bool=False
-    ) -> str:
-        # Check name
-        assert name, "You must specify the file `name` if the `file` is not a path"
-        # Create data URL
-        file.seek(0)
-        mime = self.__infer_mime(file)
-        size = file.getbuffer().nbytes
-        if size < (data_url_limit or 0):
-            return self.__create_data_url(file, mime=mime)
-        # Upload
-        url = self.create_upload_url(name, type, key=key)
-        with wrap_file(file, total=size, description=name, disable=not verbose) as f:
-            put(url, data=f, headers={ "Content-Type": mime }).raise_for_status()
-        # Return
-        return self.__simplify_url(url)
-    
-    def __create_data_url (self, file: BytesIO, *, mime: str) -> str:
-        encoded_data = b64encode(file.getvalue()).decode("ascii")
-        url = f"data:{mime};base64,{encoded_data}"
-        return url
-    
-    def __simplify_url (self, url: str) -> str:
-        if url.startswith("data:"):
-            return url
-        parsed_url = urlparse(url)
-        parsed_url = parsed_url._replace(netloc="cdn.fxn.ai", query="")
-        url = urlunparse(parsed_url)
-        return url
-    
-    def __infer_mime (self, file: str | Path | BytesIO) -> str:
-        MAGIC_TO_MIME = {
-            b"\x00\x61\x73\x6d": "application/wasm"
-        }
-        # Read magic
-        file = Path(file) if isinstance(file, str) else file
-        if isinstance(file, Path):
-            with open(file, "rb") as f:
-                magic = f.read(4)
-        elif isinstance(file, BytesIO):
-            magic = file.getvalue()[:4]
-        # Check known mime
-        mime = MAGIC_TO_MIME.get(magic)
-        # Infer
-        if mime is None:
-            magika = Magika()
-            result = magika.identify_bytes(file.getvalue()) if isinstance(file, BytesIO) else magika.identify_path(file)
-            mime = result.output.mime_type
-        # Return
-        return mime

fxn-0.0.36/fxn/types/environment.py

@@ -1,17 +0,0 @@
-# 
-#   Function
-#   Copyright © 2024 NatML Inc. All Rights Reserved.
-#
-
-from pydantic import BaseModel, Field
-
-class EnvironmentVariable (BaseModel):
-    """
-    Predictor environment variable.
-
-    Members:
-        name (str): Variable name.
-        value (str): Variable value.
-    """
-    name: str = Field(description="Variable name.")
-    value: str = Field(description="Variable value.")

fxn-0.0.36/fxn/types/storage.py

@@ -1,14 +0,0 @@
-# 
-#   Function
-#   Copyright © 2024 NatML Inc. All Rights Reserved.
-#
-
-from enum import Enum
-
-class UploadType (str, Enum):
-    """
-    Upload URL type.
-    """
-    Media = "MEDIA"
-    Notebook = "NOTEBOOK"
-    Value = "VALUE"

fxn-0.0.36/fxn/types/tag.py

@@ -1,28 +0,0 @@
-#
-#   Function
-#   Copyright © 2024 NatML Inc. All Rights Reserved.
-#
-
-from __future__ import annotations
-from pydantic import BaseModel, Field
-
-class Tag (BaseModel):
-    """
-    Predictor tag.
-
-    Members:
-        username (str): Predictor owner username.
-        name (str): Predictor name.
-    """
-    username: str = Field(description="Predictor owner username.")
-    name: str = Field(description="Predictor name.")
-
-    def from_str (cls, tag: str) -> Tag:
-        """
-        Parse a predictor tag from a string.
-        """
-        username, name = tag.lower()[1:].split("/")
-        return Tag(username=username, name=name)
-
-    def __str__ (self):
-        return f"@{self.username}/{self.name}"

fxn-0.0.36/fxn/types/user.py

@@ -1,11 +0,0 @@
-# 
-#   Function
-#   Copyright © 2024 NatML Inc. All Rights Reserved.
-#
-
-from .profile import Profile
-
-class User (Profile):
-    """
-    User.
-    """