Merge pull request #5 from kbase/dev-client

Add dynamic service support

Author: MrCreosote

src/kbase/sdk_baseclient.py

@@ -107,7 +107,9 @@ def __init__(
         if self.timeout < 1:
             raise ValueError("Timeout value must be at least 1 second")
 
-    def _call(self, url: str, method: str, params: list[Any], context: dict[str, Any] | None):
+    def _call(
+        self, url: str, method: str, params: list[Any], context: dict[str, Any] | None = None
+    ):
         arg_hash = {"method": method,
                     "params": params,
                     "version": "1.1",
@@ -149,6 +151,21 @@ def _call(self, url: str, method: str, params: list[Any], context: dict[str, Any
             return resp["result"][0]
         return resp["result"]
 
+    def _get_service_url(self, service_method: str, service_version: str | None):
+        if not self.lookup_url:
+            return self.url
+        service = service_method.split(".")[0]
+        service_status_ret = self._call(
+            self.url, "ServiceWizard.get_service_status",
+            [{"module_name": service, "version": service_version}]
+        )
+        return service_status_ret["url"]
+
+    def _set_up_context(self, service_ver: str = None):
+        if service_ver:
+            return {"service_ver": service_ver}
+        return None
+
     def call_method(self, service_method: str, args: list[Any], *, service_ver: str | None = None):
         """
         Call a standard or dynamic service synchronously.
@@ -159,8 +176,6 @@ def call_method(self, service_method: str, args: list[Any], *, service_ver: str
         service_ver - the version of the service to run, e.g. a git hash
             or dev/beta/release.
         """
-        # TDOO NEXT implement dynamic methods
-        #url = self._get_service_url(service_method, service_ver)
-        #context = self._set_up_context(service_ver)
-        url = self.url
-        return self._call(url, service_method, args, None)
+        url = self._get_service_url(service_method, service_ver)
+        context = self._set_up_context(service_ver)
+        return self._call(url, service_method, args, context)

test/test_sdk_baseclient.py

@@ -213,3 +213,41 @@ def test_missing_error_key(mockserver):
     )
     assert got.value.code == 0
     assert got.value.data == ""
+
+
+###
+# Dynamic service tests
+# 
+# All of the 3 ways of calling services use the same underlying _call method, so we don't
+# reiterate those tests every time.
+###
+
+def test_dynamic_service(url_and_token):
+    bc = sdk_baseclient.SDKBaseClient(
+        url_and_token[0] + "/services/service_wizard", lookup_url=True
+    )
+    res = bc.call_method("HTMLFileSetServ.status", [])
+    del res["git_commit_hash"]
+    ver = res["version"]
+    del res["version"]
+    assert res == {
+        'git_url': 'https://github.com/kbaseapps/HTMLFileSetServ',
+        'message': '',
+        'state': 'OK',
+    }
+    assert semver.Version.parse(ver) > semver.Version.parse("0.0.8")
+
+
+def test_dynamic_service_with_service_version(url_and_token):
+    # Current version of HFS is 0.0.9 everywhere
+    bc = sdk_baseclient.SDKBaseClient(
+        url_and_token[0] + "/services/service_wizard", lookup_url=True
+    )
+    res = bc.call_method("HTMLFileSetServ.status", [], service_ver="0.0.8")
+    del res["git_commit_hash"]
+    assert res == {
+        'git_url': 'https://github.com/kbaseapps/HTMLFileSetServ',
+        'message': '',
+        'state': 'OK',
+        "version": "0.0.8"
+    }