UC101 finish

main.py

@@ -3,18 +3,21 @@
 from qgate.uc.uc101 import UC101
 from qgate.uc import ucsetup, ucoutput
 
-
-if __name__ == '__main__':
-
+def test():
     setup= ucsetup.UCSetup("0-size-100",
                          ["qgate-sln-mlrun-private.env", "qgate-sln-mlrun.env"])
 
     ucoutput.UCOutput(setup)
     aa=UC101(setup)
+    aa.exec()
 
-    # sln = qgate.Solution("0-size-100",
-    #                      ["qgate-sln-mlrun-private.env", "qgate-sln-mlrun.env"])
-    # try:
-    #     sln.create(force=True)
-    # finally:
-    #     sln.delete()
+if __name__ == '__main__':
+
+#    test()
+
+    sln = qgate.Solution("0-size-100",
+                         ["qgate-sln-mlrun-private.env", "qgate-sln-mlrun.env"])
+    try:
+        sln.create(force=True)
+    finally:
+        sln.delete()

qgate/uc/uc101.py

@@ -22,7 +22,7 @@ def desc(self):
     def exec(self):
 
         # create projects
-        dir=os.path.join(os.getcwd(), self._model_definition, "01-model", "01-project", "*.json")
+        dir=os.path.join(os.getcwd(), self.setup.model_definition, "01-model", "01-project", "*.json")
         for file in glob.glob(dir):
             with open(file, "r") as json_file:
                 json_content = json.load(json_file)

qgate/uc/ucbase.py

@@ -22,10 +22,21 @@ def __init__(self, setup: UCSetup, name):
         self._setup=setup
         self._name=name
 
+    @property
+    def setup(self):
+        return self._setup
+
     @property
     def desc(self):
         raise NotImplemented()
 
+    @property
+    def name(self):
+        return self._name
+
+    def exec(self):
+        raise NotImplemented()
+
     def _get_json_header(self, json_content):
         """ Get common header from config files
 
@@ -40,10 +51,6 @@ def _get_json_header(self, json_content):
         lbls = None if json_content.get('labels') is None else json_content.get('labels')
         return name, desc, lbls, kind
 
-    @property
-    def name(self):
-        return self._name
-
     @staticmethod
     def str2bool(v):
         return v.lower() in ("yes", "true", "t", "1")

qgate/uc/ucoutput.py

@@ -36,9 +36,8 @@ def __del__(self):
         self._file.close()
 
     def _headr(self):
-        self._print(datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S'))
         self._print("QGate version: " + __version__)
-
+        self._print(datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S'))
 
     def _footer(self):
         total, free = self._memory()

qgate/uc/ucsetup.py

@@ -30,4 +30,8 @@ def __str__(self):
 
     @property
     def model_output(self):
-        return self._model_output
+        return self._model_output
+
+    @property
+    def model_definition(self):
+        return self._model_definition