pass registry and staging as separate args

building_dao/building_generic.py

@@ -9,6 +9,8 @@ import requests
 from requests.exceptions import HTTPError
 
 from retrying import retry
+
+from MaxIcsRegistry import MaxIcsRegistry
 from .settings import Settings
 
 MAX_RETRIES = 5  # max retries number
@@ -40,13 +42,13 @@ class BuildingGeneric:
     This way, a VersionConflictError pops whenever a conflicts of versions happens
     """
 
-    def __init__(self, uid: str = None, **kwargs) -> None:
+    def __init__(self, uid: str = None, staging: bool = False, registry: MaxIcsRegistry = None, **kwargs) -> None:
 
         self.logger = logging.getLogger(self.__class__.__name__)
         self._uid = uid
         self._building = None
 
-        self.settings = Settings(**kwargs)
+        self.settings = Settings(staging=staging, registry=registry, **kwargs)
 
         if self._uid:
             self.fetch(timeout=kwargs.get("timeout", None))

building_dao/settings.py

@@ -8,8 +8,6 @@ class Settings:
     def __init__(self, staging: bool = False, registry=None, **kwargs) -> None:
 
         self.logger = logging.getLogger(self.__class__.__name__)
-        staging = kwargs.get("staging", False)
-        registry = kwargs.get("registry")
 
         if not registry:
             self.logger.warning("Registry is not set when initializing Building. Calling registry...")