frogml 1.1.62__py3-none-any.whl → 1.2.19__py3-none-any.whl

frogml/storage/frog_ml.py

@@ -35,7 +35,6 @@ from frogml.storage.models.model_manifest import ModelManifest
 from frogml.storage.models.serialization_metadata import SerializationMetadata
 from frogml.storage.utils import (
     assemble_artifact_url,
-    calculate_sha2,
     is_not_none,
     is_valid_thread_number,
     join_url,
@@ -43,6 +42,7 @@ from frogml.storage.utils import (
     validate_not_folder_paths,
     validate_path_exists,
 )
+from typing_extensions import Self
 
 
 class FileType(Enum):
@@ -74,6 +74,11 @@ class FrogMLStorage(BaseStorage):
             max_workers=self.http_threads_count
         )
 
+    def get_repository_configuration(self: Self, repository_key: str):
+        return self.artifactory_api.get_repository_configuration(
+            repository_key=repository_key
+        )
+
     def upload_dataset_version(
         self,
         repository: str,
@@ -243,11 +248,8 @@ class FrogMLStorage(BaseStorage):
             )
 
         except FrogMLValidationError as error:
-            logger.error(error.args[0], exc_info=False)
-
-        return FrogMLEntityVersion(
-            entity_name="", namespace="", version="", entity_manifest=None
-        )
+            logger.exception(error.args[0])
+            raise
 
     def download_dataset_version(
         self,
@@ -257,7 +259,7 @@ class FrogMLStorage(BaseStorage):
         target_path: str,
         namespace: Optional[str] = None,
     ) -> None:
-        return self.__download_entity_version(
+        self.__download_entity_version(
             repository=repository,
             entity_name=dataset_name,
             version=version,
@@ -274,7 +276,7 @@ class FrogMLStorage(BaseStorage):
         target_path: str,
         namespace: Optional[str] = None,
     ) -> None:
-        return self.__download_entity_version(
+        self.__download_entity_version(
             repository=repository,
             entity_name=model_name,
             version=version,
@@ -600,18 +602,6 @@ class FrogMLStorage(BaseStorage):
             if is_checksum_deploy_success is False:
                 self.artifactory_api.upload_file(url=url, file_path=full_path)
 
-    @staticmethod
-    def __calculate_sha2_no_error(file_path: str) -> Optional[str]:
-        # Used to calculate sha2 without raising an exception
-        if os.path.exists(file_path) is False:
-            logger.debug(f"File {file_path} does not exist, can't calculate sha256")
-            return None
-        try:
-            return calculate_sha2(file_path)
-        except Exception as e:
-            logger.debug(f"Failed to calculate sha256 for file {file_path}. Error: {e}")
-            return None
-
     @staticmethod
     def __verify_download_required_args_not_none(
         repository: str, entity_name: str, version: str, target_path: str

frogml/storage/models/frogml_dataset_version.py

@@ -1,3 +1,5 @@
+from typing_extensions import Self
+
 from frogml.storage.models.frogml_entity_version import FrogMLEntityVersion
 
 
@@ -10,9 +12,7 @@ class FrogMLDatasetVersion(FrogMLEntityVersion):
     """
 
     @classmethod
-    def from_entity_version(
-        cls, entity_version: FrogMLEntityVersion
-    ) -> "FrogMLDatasetVersion":
+    def from_entity_version(cls, entity_version: FrogMLEntityVersion) -> Self:
         return cls(
             entity_name=entity_version.entity_name,
             version=entity_version.version,

frogml/storage/models/frogml_model_version.py

@@ -1,3 +1,6 @@
+from typing_extensions import Self
+
+from frogml.storage.models.entity_manifest import EntityManifest
 from frogml.storage.models.frogml_entity_version import FrogMLEntityVersion
 
 
@@ -9,10 +12,10 @@ class FrogMLModelVersion(FrogMLEntityVersion):
         FrogMLEntityVersion: Base class for entity versions.
     """
 
+    entity_manifest: EntityManifest
+
     @classmethod
-    def from_entity_version(
-        cls, entity_version: FrogMLEntityVersion
-    ) -> "FrogMLModelVersion":
+    def from_entity_version(cls, entity_version: FrogMLEntityVersion) -> Self:
         return cls(
             entity_name=entity_version.entity_name,
             version=entity_version.version,

frogml/storage/utils/_input_checks_utility.py

@@ -27,7 +27,9 @@ def _validate_user_input_dict(user_input: Optional[dict[str, str]]) -> None:
     if user_input is None:
         return
 
-    valid_characters_pattern_with_slash: str = r"^[a-zA-Z0-9_-]+([./][a-zA-Z0-9_-]+)*$"
+    valid_characters_pattern_with_slash: str = (
+        r"(^[a-zA-Z0-9_-]+([./][a-zA-Z0-9_-]+)*$)|(^\[[\[\]\d.,\s-]+\]$)"
+    )
     for key, value in user_input.items():
         _validate_user_input(field_value=key, field_name="properties")
         _validate_user_input(

{frogml-1.1.62.dist-info → frogml-1.2.19.dist-info}/METADATA

@@ -1,17 +1,19 @@
 Metadata-Version: 2.3
 Name: frogml
-Version: 1.1.62
+Version: 1.2.19
 Summary: frogml contains the necessary objects and communication tools for using the JFrog ml Platform
 License: Apache-2.0
 Keywords: mlops,ml,deployment,serving,model
 Author: JFrog
-Requires-Python: >=3.9,<3.12
+Requires-Python: >=3.9,<3.14
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Provides-Extra: catboost
@@ -21,28 +23,30 @@ Provides-Extra: scikit-learn
 Provides-Extra: torch
 Provides-Extra: transformers
 Requires-Dist: PyYAML (>=6.0.2)
-Requires-Dist: cachetools
+Requires-Dist: cachetools (>=5.2,<7)
 Requires-Dist: catboost (>=1.2.8,<2.0.0) ; extra == "catboost"
 Requires-Dist: chevron (==0.14.0)
 Requires-Dist: cloudpickle (==2.2.1)
-Requires-Dist: dacite (==1.8.1)
+Requires-Dist: dacite (==1.9.2)
 Requires-Dist: dependency-injector (>=4.0)
 Requires-Dist: filelock
-Requires-Dist: grpcio (>=1.57.0)
+Requires-Dist: grpcio (>=1.71.2,<1.75)
 Requires-Dist: joblib (>=1.3.2,<2.0.0)
 Requires-Dist: libcst (>=1.8.2,<2.0.0)
 Requires-Dist: marshmallow-dataclass (>=8.5.8,<9.0.0)
 Requires-Dist: onnx (>=1.18.0,<2.0.0) ; extra == "onnx"
 Requires-Dist: pandas (>=1.4.0) ; extra == "feature-store"
-Requires-Dist: protobuf (>=4.25.8)
+Requires-Dist: protobuf (>=4.25.8,<5) ; python_version < "3.12"
+Requires-Dist: protobuf (>=6.33.1,<7) ; python_version >= "3.12"
 Requires-Dist: pyarrow (>=20.0.0) ; extra == "feature-store"
 Requires-Dist: pyathena (>=2.2.0,!=2.18.0) ; extra == "feature-store"
 Requires-Dist: pydantic
-Requires-Dist: pyspark (==3.4.2) ; extra == "feature-store"
-Requires-Dist: python-jose[cryptography] (>=3.4.0)
+Requires-Dist: pyjwt (>=2.10.1,<3)
+Requires-Dist: pyspark (==3.5.7) ; (python_version < "3.12") and (extra == "feature-store")
+Requires-Dist: pyspark (>=4.0.1,<5) ; (python_version >= "3.12") and (extra == "feature-store")
 Requires-Dist: python-json-logger (>=2.0.2)
 Requires-Dist: requests
-Requires-Dist: retrying (==1.3.4)
+Requires-Dist: retrying (==1.4.2)
 Requires-Dist: scikit-learn (>=1.5,<2.0) ; extra == "scikit-learn"
 Requires-Dist: strenum (>=0.4.15,<0.5.0)
 Requires-Dist: torch (>=2.7.1,<3.0.0) ; extra == "torch"
@@ -62,6 +66,7 @@ Frogml Core contains all the objects and tools necessary to use the Frogml Platf
 - [Overview](#overview)
 - [Working with Artifactory](#Working-with-Artifactory)
 - [Upload ML model to Artifactory](#Upload-ML-model-to-Artifactory)
+- [Local Development Setup](#local-development-setup)
 
 ## Overview
 
@@ -85,3 +90,28 @@ The version parameter is optional. If not specified, Artifactory will set the ve
 Additionally, you can add properties to the model in Artifactory to categorize and label it.
 The function upload_model_version returns an instance of FrogMlModelVersion, which includes the model's name, version, and namespace.
 
+## Local Development Setup
+
+To install FrogML locally with development dependencies, you must authenticate with **Repo21** (a private JFrog repository) to fetch the `QwakBentoML` dependency.
+### 1. Generate Credentials
+1. Log in to **Repo 21** via JFrog Okta.
+2. Go to **User Profile** (top right) → **Set Me Up**.
+3. Select **PyPI** and choose the repository `artifactory-pypi-virtual`.
+4. Click **Generate Token & Create Instructions**. Your **username** and **token** will be displayed there.
+
+### 2. Configure Poetry
+Choose **one** of the following methods to authenticate:
+
+#### Option A: Global Configuration
+Run the following command to persist your credentials:
+```bash
+poetry config http-basic.jfrog <your_username> <your_token>
+```
+
+#### Option B: Environment Variables
+Export the credentials as environment variables:
+```bash
+export POETRY_HTTP_BASIC_JFROG_USERNAME=<your_username>
+export POETRY_HTTP_BASIC_JFROG_PASSWORD=<your_token>
+```
+