Dotenv location dependent inits

Author: agahkarakuzu

example.py

@@ -6,7 +6,8 @@
             registry_url="https://binder-registry.conp.cloud",
             gh_user_repo_name = "agahkarakuzu/mriscope",
             gh_repo_commit_hash = "ae64d9ed17e6ce66ecf94d585d7b68a19a435d70",
-            binder_image_tag = "489ae0eb0d08fe30e45bc31201524a6570b9b7dd"))
+            binder_image_tag = "489ae0eb0d08fe30e45bc31201524a6570b9b7dd",
+            dotenv = "/where/dotenv/is/located"))
 
 
 hub = JupyterHubLocalSpawner(resources,

myst_libre/rees/rees.py

@@ -11,6 +11,10 @@ def __init__(self, rees_dict):
         self.gh_user_repo_name = rees_dict['gh_user_repo_name']
         self.gh_repo_commit_hash = rees_dict['gh_repo_commit_hash']
         self.binder_image_tag = rees_dict['binder_image_tag']
+
+        if 'dotenv' in rees_dict.keys():
+            self.dotenvloc = rees_dict['dotenv']
+
         # Initialize as base to rees
         BuildSourceManager.__init__(self)
         DockerRegistryClient.__init__(self)

myst_libre/tools/authenticator.py

@@ -3,13 +3,16 @@
 from myst_libre.abstract_class import AbstractClass
 
 class Authenticator(AbstractClass):
-    def __init__(self):
+    def __init__(self,dotenvloc = '.'):
         super().__init__()
         self._auth = {}
+        self.dotenvloc = dotenvloc
         self._load_auth_from_env()
 
     def _load_auth_from_env(self):
-        load_dotenv()
+        
+        load_dotenv(os.path.join(self.dotenvloc,'.env'))
+
         username = os.getenv('DOCKER_PRIVATE_REGISTRY_USERNAME')
         password = os.getenv('DOCKER_PRIVATE_REGISTRY_PASSWORD')
 
@@ -20,5 +23,8 @@ def _load_auth_from_env(self):
             self._auth['username'] = username
             self._auth['password'] = password
 
-        del os.environ['DOCKER_PRIVATE_REGISTRY_USERNAME']
-        del os.environ['DOCKER_PRIVATE_REGISTRY_PASSWORD']
+        try:
+            del os.environ['DOCKER_PRIVATE_REGISTRY_USERNAME']
+            del os.environ['DOCKER_PRIVATE_REGISTRY_PASSWORD']
+        except:
+            pass 

myst_libre/tools/docker_registry_client.py

@@ -23,12 +23,19 @@ class DockerRegistryClient(Authenticator):
     def __init__(self, **kwargs):
         for key, value in kwargs.items():
             setattr(self, key, value)
-        super().__init__()
+        
+        if hasattr(self, 'dotenvloc'):
+            super().__init__(self.dotenvloc)
+            self.rest_client = RestClient(self.dotenvloc)
+        else:
+            super().__init__()
+            self.rest_client = RestClient()
+
         self.registry_url_bare = self.registry_url.replace("http://", "").replace("https://", "")
         self.found_image_name = None
         self.found_image_tags = None
         self.docker_images = []
-        self.rest_client = RestClient()
+
 
     def get_token(self):
         """

myst_libre/tools/rest_client.py

@@ -17,8 +17,9 @@ class RestClient(Authenticator):
     Args:
         auth (dict): Authentication credentials.
     """
-    def __init__(self):
-        super().__init__()
+    def __init__(self,dotenvloc = '.'):
+        print(dotenvloc)
+        super().__init__(dotenvloc)
         self.session = requests.Session()
         self.session.auth = HTTPBasicAuth(self._auth['username'], self._auth['password'])