fixing update model and deployment

Author: guipleite

metadata.yaml

@@ -1,7 +1,7 @@
 author: guipleite
 datetime_creted: 29/03/2021_13:46:23:802394723
-deployment_uid: 5876f2ba-1e57-41a7-b452-430da96f5ac7
+deployment_uid: 59562979-4bb8-4cc4-85f0-fb7a280b8b3c
 model_type: scikit-learn_0.23
-model_uid: 9db8c7d8-bd1d-4c0a-92da-fad29f1747e3
+model_uid: 3d5e76dc-a4a3-43a9-ab54-debbdbdc8673
 project_name: Rain_aus
 project_version: v0.3

src/scripts/Pipelines/model_redeploy_pipeline.py

@@ -6,13 +6,12 @@
 
 """
     Usage:
-        python3 model_reploy_pipeline.py ./pickle_model ../path/to/project/ ../credentials.yaml
+        python3 model_reploy_pipeline.py ../path/to/project/ ../credentials.yaml
 
 """
 
-MODEL_PATH = os.path.abspath(sys.argv[1])
-PROJ_PATH = os.path.abspath(sys.argv[2])
-CRED_PATH = os.path.abspath(sys.argv[3])
+PROJ_PATH = os.path.abspath(sys.argv[1])
+CRED_PATH = os.path.abspath(sys.argv[2])
 META_PATH = PROJ_PATH + "/metadata.yaml"
 
 with open(CRED_PATH) as stream:
@@ -22,10 +21,10 @@
         print(exc)
 
 with open(META_PATH) as stream:
-        try:
-            metadata = yaml.safe_load(stream)
-        except yaml.YAMLError as exc:
-            print(exc)
+    try:
+        metadata = yaml.safe_load(stream)
+    except yaml.YAMLError as exc:
+        print(exc)
 
 wml_credentials = {"url": credentials["url"], "apikey": credentials["apikey"]}
 
@@ -41,22 +40,22 @@
 
 else:
     MODEL_GUID = input("MODEL GUID: ")
-    DEPLOYMENT_UID = input("DEPLOYMENT UID: ")  
+    DEPLOYMENT_UID = input("DEPLOYMENT UID: ")
 
 client.set.default_space(SPACE_ID)
 
 client.repository.list_models_revisions(MODEL_GUID)
 
 MODEL_VERSION = input("MODEL VERSION: ")
 
-metadata = {
+meta = {
     client.deployments.ConfigurationMetaNames.ASSET: {
         "id": MODEL_GUID,
         "rev": MODEL_VERSION,
     }
 }
 updated_deployment = client.deployments.update(
-    deployment_uid=DEPLOYMENT_UID, changes=metadata
+    deployment_uid=DEPLOYMENT_UID, changes=meta
 )
 
 status = None
@@ -67,3 +66,4 @@
     status = deployment_details["entity"]["status"].get("state")
 
 print("\nDeployment update finished with status: ", status)
+# print(deployment_details)

src/scripts/Pipelines/model_update_deployment_pipeline.py

@@ -3,29 +3,49 @@
 import yaml
 from ibm_watson_machine_learning import APIClient
 
-CRED_PATH = os.path.abspath(sys.argv[1])
+"""
+    Usage:
+        python3 model_update_deployment_pipeline.py ../path/to/project/ ../credentials.yaml
+
+"""
+
+PROJ_PATH = os.path.abspath(sys.argv[1])
+CRED_PATH = os.path.abspath(sys.argv[2])
+META_PATH = PROJ_PATH + "/metadata.yaml"
 
 with open(CRED_PATH) as stream:
     try:
         credentials = yaml.safe_load(stream)
     except yaml.YAMLError as exc:
         print(exc)
 
+with open(META_PATH) as stream:
+    try:
+        metadata = yaml.safe_load(stream)
+    except yaml.YAMLError as exc:
+        print(exc)
 
 wml_credentials = {"url": credentials["url"], "apikey": credentials["apikey"]}
 
 client = APIClient(wml_credentials)
 client.spaces.list()
 
 SPACE_ID = credentials["space_id"]
-MODEL_ID = input("MODEL ID: ")
-DEPLOYMENT_ID = input("DEPLOYMENT ID: ")
+
+if "deployment_uid" in metadata.keys():
+    MODEL_GUID = metadata["model_uid"]
+    DEPLOYMENT_UID = metadata["deployment_uid"]
+    print("\nExtracting DEPLOYMENT UID and MODEL GUID from metadata file\n")
+
+else:
+    MODEL_GUID = input("MODEL GUID: ")
+    DEPLOYMENT_UID = input("DEPLOYMENT UID: ")
 
 client.set.default_space(SPACE_ID)
 
-change_meta = {client.deployments.ConfigurationMetaNames.ASSET: {"id": MODEL_ID}}
+change_meta = {client.deployments.ConfigurationMetaNames.ASSET: {"id": MODEL_GUID}}
 
 print("Alterando o deploy abaixo: ")
-print(client.deployments.get_details(DEPLOYMENT_ID))
+print(client.deployments.get_details(DEPLOYMENT_UID))
 
-client.deployments.update(DEPLOYMENT_ID, change_meta)
+client.deployments.update(DEPLOYMENT_UID, change_meta)

src/scripts/Pipelines/model_update_pipeline.py

@@ -1,11 +1,18 @@
 import sys
 import os
 import yaml
+import joblib
 from ibm_watson_machine_learning import APIClient
 
+"""
+    Usage:
+        python3 model_update_pipeline.py ./pickle_model ../path/to/project/ ../credentials.yaml
+
+"""
+
 MODEL_PATH = os.path.abspath(sys.argv[1])
-CRED_PATH = os.path.abspath(sys.argv[2])
-PROJ_PATH = os.path.abspath(sys.argv[3])
+PROJ_PATH = os.path.abspath(sys.argv[2])
+CRED_PATH = os.path.abspath(sys.argv[3])
 META_PATH = PROJ_PATH + "/metadata.yaml"
 
 with open(CRED_PATH) as stream:
@@ -20,22 +27,31 @@
     except yaml.YAMLError as exc:
         print(exc)
 
+with open(MODEL_PATH, "rb") as file:
+    # pickle_model = pickle.load(file)
+    pipeline = joblib.load(file)
 
 wml_credentials = {"url": credentials["url"], "apikey": credentials["apikey"]}
 
 client = APIClient(wml_credentials)
 client.spaces.list()
 
 SPACE_ID = credentials["space_id"]
-MODEL_GUID = input("MODEL GUID: ")
+
+if "model_uid" in metadata.keys():
+    MODEL_GUID = metadata["model_uid"]
+    print("\nExtracting MODEL GUID from metadata file\n")
+
+else:
+    MODEL_GUID = input("MODEL GUID: ")
 
 client.set.default_space(SPACE_ID)
 
 print("\nCreating new version")
 
 published_model = client.repository.update_model(
     model_uid=MODEL_GUID,
-    update_model=MODEL_PATH,
+    update_model=pipeline,
     updated_meta_props={
         client.repository.ModelMetaNames.NAME: metadata["project_name"]
         + "_"