fix hardcoded urls

chrisClient.py

@@ -8,8 +8,8 @@
 class ChrisClient(BaseClient):
     def __init__(self, url: str, username: str, password: str):
         self.cl = client.Client(url, username, password)
-        self.cl.pacs_series_url = "http://localhost:8000/api/v1/pacs/series/"
-        self.req = PACSClient(username,password)
+        self.cl.pacs_series_url = f"{url}pacs/series/"
+        self.req = PACSClient(self.cl.pacs_series_url,username,password)
 
     def create_con(self,params:dict):
         return self.cl

chris_pacs_service.py

@@ -3,14 +3,14 @@
 
 
 class PACSClient(object):
-    def __init__(self, username: str, password: str):
+    def __init__(self, url: str, username: str, password: str):
         self.cl = request.Request(username, password)
-        self.pacs_series_url = "http://localhost:8000/api/v1/pacs/series/search/"
+        self.pacs_series_search_url = f"{url}search/"
 
 
     def get_pacs_files(self, params: dict):
         l_dir_path = set()
-        resp = self.cl.get(self.pacs_series_url,params)
+        resp = self.cl.get(self.pacs_series_search_url,params)
         for item in resp.items:
             for link in item.links:
                 folder = self.cl.get(link.href)

dyanon.py

@@ -13,6 +13,7 @@
 import pfdcm
 import sys
 import time
+import os
 
 LOG = logger.debug
 
@@ -27,7 +28,7 @@
 logger.remove()
 logger.add(sys.stderr, format=logger_format)
 
-__version__ = '1.0.1'
+__version__ = '1.0.2'
 
 DISPLAY_TITLE = r"""
        _           _                               
@@ -154,7 +155,7 @@ def main(options: Namespace, inputdir: Path, outputdir: Path):
 
         for d_job in l_job:
             d_job["send"] = {
-                "url" : options.orthancUrl,
+                "url"      : options.orthancUrl,
                 "username" : options.username,
                 "password" : options.password,
                 "aec"      : options.pushToRemote
@@ -196,6 +197,12 @@ def health_check(options) -> bool:
     """
     check if connections to pfdcm, orthanc, and CUBE is valid
     """
+    try:
+        if not options.pluginInstanceID:
+            options.pluginInstanceID = os.environ['CHRIS_PREV_PLG_INST_ID']
+    except Exception as ex:
+        LOG(ex)
+        return False
     try:
         # create connection object
         cube_con = ChrisClient(options.CUBEurl, options.CUBEuser, options.CUBEpassword)