#68 fixing import directives

IncQueryLabs · Jun 21, 2022 · 5fad552 · 5fad552
1 parent 40072eb
commit 5fad552
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/source/incqueryserver-jupyter/iqs_jupyter/__init__.py b/source/incqueryserver-jupyter/iqs_jupyter/__init__.py
@@ -30,18 +30,15 @@
 from iqs_jupyter.core_extensions import *
 from iqs_jupyter.authentication import *
 
-if 'MmsRepositoryApi' in dir(iqs_client):
-    from iqs_jupyter.mms_extensions import *
-    from iqs_jupyter.mms_direct_extensions import *
+#if 'MmsRepositoryApi' in dir(iqs_client):
+from iqs_jupyter.mms_extensions import *
+from iqs_jupyter.mms_direct_extensions import *
 
-if 'RepositoryApi' in dir(iqs_client):
-    from iqs_jupyter.twc_extensions import *
-    from iqs_jupyter.twc_osmc_extensions import *
+#if 'RepositoryApi' in dir(iqs_client):
+from iqs_jupyter.twc_extensions import *
+from iqs_jupyter.twc_osmc_extensions import *
 
-if 'AnalysisApi' in dir(iqs_client):
-    from iqs_jupyter.analysis_extensions import *
-
-# namespace shortcut for API request/response classes
-from iqs_client import models as schema
+#if 'AnalysisApi' in dir(iqs_client):
+from iqs_jupyter.analysis_extensions import *
 
 
diff --git a/source/incqueryserver-jupyter/iqs_jupyter/analysis_extensions.py b/source/incqueryserver-jupyter/iqs_jupyter/analysis_extensions.py
@@ -19,7 +19,7 @@
 
 import html
 
-import iqs_client
+from iqs_client import models as iqs_client
 from iqs_jupyter.helpers import cell_to_html as _cell_to_html
 from iqs_jupyter.helpers import dict_to_element as _dict_to_element
 from iqs_jupyter.core_extensions import validation_color_scale

diff --git a/source/incqueryserver-jupyter/iqs_jupyter/core_extensions.py b/source/incqueryserver-jupyter/iqs_jupyter/core_extensions.py
@@ -22,7 +22,7 @@
 import html
 from typing import Optional
 
-import iqs_client
+from iqs_client import models as iqs_client
 
 import iqs_jupyter.tool_extension_point as ext_point
 from iqs_jupyter.helpers import cell_to_html as _cell_to_html

diff --git a/source/incqueryserver-jupyter/iqs_jupyter/mms_extensions.py b/source/incqueryserver-jupyter/iqs_jupyter/mms_extensions.py
@@ -21,7 +21,7 @@
 import ipywidgets as widgets
 from IPython.display import display
 
-import iqs_client
+from iqs_client import models as iqs_client
 
 import iqs_jupyter.config_defaults as defaults
 import iqs_jupyter.tool_extension_point as ext_point

diff --git a/source/incqueryserver-jupyter/iqs_jupyter/twc_extensions.py b/source/incqueryserver-jupyter/iqs_jupyter/twc_extensions.py
@@ -22,7 +22,7 @@
 import ipywidgets as widgets
 from IPython.display import display
 
-import iqs_client
+from iqs_client import models as iqs_client
 
 import iqs_jupyter.config_defaults as defaults
 import iqs_jupyter.tool_extension_point as ext_point