Infering API addr from git host

Author: aslisabanci

action.yml

@@ -39,13 +39,9 @@ inputs:
     required: false
     default: 'model_training.ipynb'
   git_host:
-    description: Git host for the Algorithmia algorithm repository. Change to git.algorithmia.com if the algorithm is hosted on Algorithmia.
+    description: Git host for the Algorithmia algorithm repository. Change to git.algorithmia.com if the algorithm is hosted on Algorithmia Marketplace or git.YOUR_DOMAIN for enterprise installations.
     required: false
     default: 'github.com'
-  algorithmia_api: 
-    description: API endpoint Algorithmia installation, for enterprise customers.
-    required: false
-    default: 'https://api.algorithmia.com'
 runs:
   using: 'docker'
   image: 'Dockerfile'
@@ -61,6 +57,5 @@ runs:
     - ${{ inputs.model_path }}
     - ${{ inputs.notebook_path }}
     - ${{ inputs.git_host }}
-    - ${{ inputs.algorithmia_host }}
 
 

src/action_main.py

@@ -17,7 +17,7 @@
     notebook_path = os.getenv("INPUT_NOTEBOOK_PATH")
     model_path = os.getenv("INPUT_MODEL_PATH")
     upload_path = os.getenv("INPUT_ALGORITHMIA_UPLOADPATH")
-    algorithmia_api = os.getenv("INPUT_ALGORITHMIA_API")
+    git_host = os.getenv("INPUT_GIT_HOST")
 
     error_template_str = "Field '{}' not defined in workflow file. Please check your workflow configuration"
     if not algorithmia_api_key:
@@ -40,7 +40,7 @@
 
             algorithmia_deployer = algorithmia_deployer.AlgorithmiaDeployer(
                 api_key=algorithmia_api_key,
-                api_address=algorithmia_api,
+                git_host=git_host,
                 username=algorithmia_username,
                 algo_name=algorithmia_algo_name,
                 model_path=model_path,

src/algorithmia_deployer.py

@@ -7,9 +7,11 @@
 
 class AlgorithmiaDeployer:
     def __init__(
-        self, api_key, api_address, username, algo_name, model_path, workspace_path,
+        self, api_key, git_host, username, algo_name, model_path, workspace_path,
     ) -> None:
-        self.algo_client = Algorithmia.client(api_key, api_address)
+        self.algo_client = Algorithmia.client(
+            api_key, self._api_addr_from_git_host(git_host)
+        )
         self.username = username
         self.algo_name = algo_name
         self.model_path = model_path
@@ -47,6 +49,16 @@ def upload_and_link_algo_model(
                 f"Model file not found at {self.model_full_path}. Please check your workflow configuration."
             )
 
+    def _api_addr_from_git_host(self, git_host):
+        # Examples:
+        # git.devopsbay1.enthalpy.click -> https://api.devopsbay1.enthalpy.click
+        # git.algorithmia.com -> https://api.algorithmia.com
+        # git.test.algorithmia.com -> https://api.test.algorithmia.com
+        domain = git_host.split("git.", 1)[1]
+        api_addr = f"https://api.{domain}"
+        print(f"API address for Algorithmia client is: {api_addr}")
+        return api_addr
+
     def _replace_placeholders(self, parametric_str):
         if "$ALGORITHMIA_USERNAME" in parametric_str:
             print(f"Replacing $ALGORITHMIA_USERNAME in {parametric_str}")