Refactor _director and _utils modules; add %OnNew method in Common.cls and implement tests for production settings

Author: grongierisc

src/iop/_director.py

@@ -6,7 +6,6 @@
 import signal
 from dataclasses import dataclass
 
-from iop._business_host import _BusinessHost
 from iop._dispatch import dispatch_deserializer, dispatch_serializer
 from iop._utils import _Utils
 
@@ -278,7 +277,6 @@ def test_component(target,message=None,classname=None,body=None):
                 else:
                     message.json = _Utils.string_to_stream("{}")
         # serialize the message
-        business_host = _BusinessHost()
         serial_message = dispatch_serializer(message)
         response = iris.cls('IOP.Utils').dispatchTestComponent(target,serial_message)
         try:

src/iop/_utils.py

@@ -6,6 +6,7 @@
 import xmltodict
 import pkg_resources
 import importlib
+import importlib.util
 import json
 from iop._message import _Message, _PydanticMessage
 from pydantic import TypeAdapter
@@ -241,7 +242,7 @@ def migrate(filename=None):
             settings = _Utils.import_module_from_path('settings',filename)
         else:
             # import settings from the settings module
-            import settings
+            import settings # type: ignore
         # get the path of the settings file
         path = os.path.dirname(inspect.getfile(settings))
         try:
@@ -261,7 +262,7 @@ def migrate(filename=None):
         except AttributeError:
             print("No schemas to register")
         try:
-            sys.path.remove(path)
+            sys.path.remove(os.path.normpath(path))
         except ValueError:
             pass
 

src/iop/cls/IOP/Common.cls

@@ -37,11 +37,17 @@ Method GetModule() As %String
     Return ..%module
 }
 
+Method %OnNew(pConfigName As %String) As %Status
+{
+    $$$ThrowOnError(..Connect())
+	Quit $method($this,"initConfig",.pConfigName) ; call subclass
+}
+
 Method OnInit() As %Status
 {
     set tSC = $$$OK
     try {
-        $$$ThrowOnError(..Connect())
+        
         do ..%class."_dispatch_on_init"($this)
     } catch ex {
         set tSC = ex.AsStatus()

src/tests/bench/bo.py renamed to src/tests/bench/bench_bo.py

@@ -1,5 +1,5 @@
-from bo import BenchIoPOperation
-from bp import BenchIoPProcess
+from bench_bo import BenchIoPOperation
+from bench_bp import BenchIoPProcess
 
 import os
 

src/tests/bench/bp.py renamed to src/tests/bench/bench_bp.py

@@ -125,9 +125,14 @@ def OnMessage(self, pRequest):
         self.Adapter.PutLine(filename, " * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *")
 
         return
-
+    
 class MyOperation(BusinessOperation):
 
+    def OnMessage(self, request):
+        self.log_info("Received message: "+str(request))
+
+class MySettingOperation(BusinessOperation):
+
     my_empty_var : str
     my_none_var = None
     my_int_var :int = 0
@@ -136,8 +141,8 @@ class MyOperation(BusinessOperation):
     my_str_var = "foo"
 
     def OnMessage(self, request):
-        self.LOGINFO('hello')
-        return MyResponse(request.StringValue)
+        attr = request.StringValue
+        return MyResponse(self.__getattribute__(attr))
 
 if __name__ == "__main__":
 

src/tests/bench/settings.py

@@ -8,8 +8,9 @@
 CLASSES = {
     'Python.RedditService': RedditService,
     'Python.FilterPostRoutingRule': bp.FilterPostRoutingRule,
-    'Python.FileOperation': FileOperation,
     'Python.bp': bp,
+    'Python.FileOperation': FileOperation,
+    'UnitTest.MySettingOperation': MySettingOperation,
 }
 
 PRODUCTIONS = [
@@ -21,5 +22,43 @@
             "Description": "",
             "ActorPoolSize": "2"
         }
+    },
+    {
+        "Python.TestSettingProduction": {
+            "@Name": "Python.TestSettingProduction",
+            "@TestingEnabled": "true",
+            "@LogGeneralTraceEvents": "false",
+            "Description": "",
+            "ActorPoolSize": "2",
+            "Item": [
+                {
+                    "@Name": "UnitTest.MySettingOperation",
+                    "@Enabled": "true",
+                    "@ClassName": "UnitTest.MySettingOperation",
+                    "Setting": [
+                    {
+                        "@Target": "Host",
+                        "@Name": "my_int_var",
+                        "#text": "1"
+                    },
+                    {
+                        "@Target": "Host",
+                        "@Name": "my_float_var",
+                        "#text": "1.0"
+                    },
+                    {
+                        "@Target": "Host",
+                        "@Name": "my_untyped_var",
+                        "#text": "1"
+                    },
+                    {
+                        "@Target": "Host",
+                        "@Name": "my_str_var",
+                        "#text": "bar"
+                    }
+                    ]
+                }
+            ]
+        }
     }
-]
+]

src/tests/registerFilesIop/bo.py

@@ -0,0 +1,29 @@
+from iop._director import _Director
+from iop._utils import _Utils
+
+import os
+
+import iris
+
+class TestProductionSettings:
+    @classmethod
+    def setup_class(cls):
+        path = os.path.join(iris.__getattribute__('__ospath'),'src/tests/registerFilesIop/settings.py')
+        _Utils.migrate(path)
+        _Director.stop_production()
+        _Director.set_default_production('Python.TestSettingProduction')
+        _Director.start_production()
+
+    def test_my_none_var(self):
+        rsp = _Director.test_component('UnitTest.MySettingOperation',None,'iris.Ens.StringRequest',"my_none_var")
+        assert rsp.value == ''
+
+    def test_my_str_var(self):
+        rsp = _Director.test_component('UnitTest.MySettingOperation',None,'iris.Ens.StringRequest',"my_str_var")
+        assert rsp.value == "bar"
+
+
+    @classmethod
+    def teardown_class(cls):
+        _Director.stop_production()
+        _Director.set_default_production('test')