Multiclass-interface 1.0__tar.gz → 1.1__tar.gz

{Multiclass_interface-1.0 → Multiclass_interface-1.1/Multiclass_interface.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Multiclass_interface
-Version: 1.0
+Version: 1.1
 Summary: Multiclass interface
 Author-email: "Mads M. Pedersen" <mmpe@dtu.dk>
 Project-URL: Homepage, https://gitlab.windenergy.dtu.dk/DYNAMIKS/multiclass_interface

{Multiclass_interface-1.0/Multiclass_interface.egg-info → Multiclass_interface-1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Multiclass_interface
-Version: 1.0
+Version: 1.1
 Summary: Multiclass interface
 Author-email: "Mads M. Pedersen" <mmpe@dtu.dk>
 Project-URL: Homepage, https://gitlab.windenergy.dtu.dk/DYNAMIKS/multiclass_interface

{Multiclass_interface-1.0 → Multiclass_interface-1.1}/multiclass_interface/multiprocess_interface.py

@@ -48,8 +48,9 @@ def run(cls, inputQueue, outputQueue, cls_args, **kwargs):
 class ProcessClass():
     cls = None
 
-    def __init__(self, cls, cls_attrs={}):
+    def __init__(self, cls, cls_attrs={}, index=""):
         self.cls_attrs = cls_attrs
+        self.index = index
         self.cls = cls
         self.ctx = multiprocessing.get_context('spawn')
         self.inputQueue = self.ctx.Queue()
@@ -103,7 +104,7 @@ class ProcessClass():
         return self.get_result(raise_exception=True, cmd=lambda: f"checking if '{name}' is callable")
 
     def __setattr__(self, name, value):
-        if name in {'cls', 'ctx', 'inputQueue', 'outputQueue', 'closed', 'process', 'cls_attrs'}:
+        if name in {'cls', 'ctx', 'inputQueue', 'outputQueue', 'closed', 'process', 'cls_attrs', 'index'}:
             return object.__setattr__(self, name, value)
         else:
             self.inputQueue.put(('setattr', (name, value), {}))
@@ -124,7 +125,10 @@ class ProcessClass():
             else:
                 if hasattr(cmd, '__call__'):
                     cmd = cmd()
-                e = Exception(f'{self.cls.__name__} process died before or while {cmd}')
+                p_id = f'{self.cls.__name__} process'
+                if self.index:
+                    p_id += f" index {self.index}"
+                e = Exception(f'{p_id} died before or while {cmd}')
                 if raise_exception:
                     raise e
                 return e
@@ -153,7 +157,8 @@ class ThreadClass(ProcessClass):
 class MultiProcessClassInterface(MultiObjectList):
 
     def __init__(self, cls, args_lst, cls_attrs={}):
-        MultiObjectList.__init__(self, [ProcessClass(cls, cls_attrs)(*args) for args in args_lst], SubsetProcessWrapper)
+        MultiObjectList.__init__(self, [ProcessClass(cls, cls_attrs, i)(*args)
+                                 for i, args in enumerate(args_lst)], SubsetProcessWrapper)
 
     def __getattr__(self, name):
         obj_lst = self.obj_lst

{Multiclass_interface-1.0 → Multiclass_interface-1.1}/multiclass_interface/tests/test_multiprocessinterface.py

@@ -79,11 +79,12 @@ def test_subset(mpri):
         mpri[1].close()
 
 
-def test_():
-    pri = ProcessClass(MyTest)(1)
+@pytest.mark.parametrize('index,s', [('', ''), (5, ' index 5')])
+def test_dying_process(index, s):
+    pri = ProcessClass(MyTest, index=index)(1)
 
     def run():
-        with pytest.raises(Exception, match="MyTest process died before or while checking if 'work' is callable"):
+        with pytest.raises(Exception, match=f"MyTest process{s} died before or while checking if 'work' is callable"):
             pri.work(5)
     t = Thread(target=run)
     t.start()

{Multiclass_interface-1.0 → Multiclass_interface-1.1}/multiclass_interface/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.0'
-__version_tuple__ = version_tuple = (1, 0)
+__version__ = version = '1.1'
+__version_tuple__ = version_tuple = (1, 1)