orient_express 0.3.1__tar.gz → 0.3.3__tar.gz

{orient_express-0.3.1 → orient_express-0.3.3}/PKG-INFO

@@ -1,16 +1,15 @@
 Metadata-Version: 2.1
 Name: orient_express
-Version: 0.3.1
+Version: 0.3.3
 Summary: A library to simplify model deployment to Vertex AI
 Author: Alexey Zankevich
 Author-email: alex.zankevich@shiftsmart.com
-Requires-Python: >=3.9
+Requires-Python: >=3.9,<3.13
 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
 Requires-Dist: google-cloud-aiplatform
 Requires-Dist: google-cloud-storage
 Requires-Dist: pandas

{orient_express-0.3.1 → orient_express-0.3.3}/orient_express/model_wrapper.py

@@ -16,7 +16,9 @@ class ModelExpress:
         model=None,
         region="us-central1",
         serialized_model_path="model.joblib",
-        docker_image_uri="us-docker.pkg.dev/vertex-ai/prediction/xgboost-cpu.1-7:latest",
+        serving_container_image_uri="us-west1-docker.pkg.dev/shiftsmart-api/orient-express/xgboost-scikit-learn:latest",
+        serving_container_predict_route="/v1/models/orient-express-model:predict",
+        serving_container_health_route="/v1/models/orient-express-model",
         endpoint_name=None,
         machine_type="n1-standard-4",
         min_replica_count=1,
@@ -29,26 +31,35 @@ class ModelExpress:
         self.project_name = project_name
         self.bucket_name = bucket_name
         self.serialized_model_path = serialized_model_path
-        self.docker_image_uri = docker_image_uri
+        self.serving_container_image_uri = serving_container_image_uri
+        self.serving_container_predict_route = serving_container_predict_route
+        self.serving_container_health_route = serving_container_health_route
         self.machine_type = machine_type
         self.min_replica_count = min_replica_count
         self.max_replica_count = max_replica_count
         self.endpoint = None
 
         if not endpoint_name:
-            self.endpoint_name = f"model-xpress-{model_name}"
+            self.endpoint_name = f"orient-express-{model_name}"
         else:
             self.endpoint_name = endpoint_name
 
+        self._vertex_initialized = False
+
     def colab_auth(self):
         from google.colab import auth
 
         auth.authenticate_user()
 
     def _vertex_init(self):
-        aiplatform.init(project=self.project_name, location=self.region)
+        if not self._vertex_initialized:
+            aiplatform.init(project=self.project_name, location=self.region)
+            self._vertex_initialized = True
 
     def get_latest_vertex_model(self, model_name):
+        """If there are a few models with the same name, load the most recent one.
+        It's highly recommended to keep only 1 model with the same name to avoid the confusion
+        """
         self._vertex_init()
 
         # Search for models with the specified display name
@@ -106,7 +117,9 @@ class ModelExpress:
             display_name=self.model_name,
             artifact_uri=artifact_uri,
             parent_model=parent_model,
-            serving_container_image_uri=self.docker_image_uri,
+            serving_container_image_uri=self.serving_container_image_uri,
+            serving_container_health_route=self.serving_container_health_route,
+            serving_container_predict_route=self.serving_container_predict_route,
             sync=True,
         )
 
@@ -147,6 +160,8 @@ class ModelExpress:
         )
 
     def remote_predict(self, input_df):
+        self._vertex_init()
+
         if not self.endpoint:
             endpoint = self.get_endpoint()
             if not endpoint:
@@ -160,6 +175,8 @@ class ModelExpress:
         return predictions.predictions
 
     def local_predict(self, input_df):
+        self._vertex_init()
+
         if not self.model:
             self.load_model_from_registry()
 
@@ -172,14 +189,16 @@ class ModelExpress:
         return self.model.predict_proba(input_df)
 
     def load_model_from_registry(self):
+        self._vertex_init()
+
+        vertex_model = self.get_latest_vertex_model(self.model_name)
+
         if self.model_version:
+            # reload the model using a specific model version
             vertex_model = aiplatform.Model(
-                model_name=self.model_name, version=self.model_version
+                model_name=vertex_model.resource_name, version=str(self.model_version)
             )
 
-        else:
-            vertex_model = self.get_latest_vertex_model(self.model_name)
-
         if not vertex_model:
             raise Exception(f"Model '{self.model_name}' not found in the registry.")
 
@@ -199,5 +218,4 @@ class ModelExpress:
             blob.download_to_filename(artifact_path)
 
     def df_to_features(self, df: pd.DataFrame):
-        #
         return df.to_dict(orient="records")

{orient_express-0.3.1 → orient_express-0.3.3}/pyproject.toml

@@ -1,12 +1,12 @@
 [tool.poetry]
 name = "orient_express"
-version = "0.3.1"
+version = "0.3.3"
 description = "A library to simplify model deployment to Vertex AI"
 authors = ["Alexey Zankevich <alex.zankevich@shiftsmart.com>"]
 readme = "README.md"
 
 [tool.poetry.dependencies]
-python = ">=3.9"
+python = ">=3.9,<3.13"
 google-cloud-aiplatform = "*"
 google-cloud-storage = "*"
 pandas = "*"
@@ -17,6 +17,12 @@ pytest = "8.3.3"
 scikit-learn = "1.5.2"
 xgboost = "2.1.2"
 
+[tool.poetry.group.inference.dependencies]
+scikit-learn = "1.5.2"
+kserve = "0.14.0"
+python-json-logger = "2.0.7"
+gcsfs = "^2024.10.0"
+
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"