iris-pex-embedded-python 2.3.3__tar.gz → 2.3.5__tar.gz

{iris_pex_embedded_python-2.3.3 → iris_pex_embedded_python-2.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iris_pex_embedded_python
-Version: 2.3.3
+Version: 2.3.5
 Summary: iris_pex_embedded_python
 Home-page: https://github.com/grongierisc/interoperability-embedded-python
 Author: grongier

{iris_pex_embedded_python-2.3.3 → iris_pex_embedded_python-2.3.5}/setup.py

@@ -26,7 +26,7 @@ def main():
         description='iris_pex_embedded_python',
         long_description=long_description,
         long_description_content_type='text/markdown',
-        version='2.3.3',
+        version='2.3.5',
         author='grongier',
         author_email='guillaume.rongier@intersystems.com',
         keywords='iris_pex_embedded_python',
@@ -46,8 +46,8 @@ def main():
             'Topic :: Utilities'
         ],
         package_dir={'': 'src'},
-        packages=['grongier.pex','grongier.iris'],
-        include_package_data=True,
+        packages=['grongier.pex','grongier.pex.data'],
+        package_data={'grongier.pex.data': ['**/*.cls']},
         python_requires='>=3.6',
         install_requires=[
             "dacite>=1.6.0",

{iris_pex_embedded_python-2.3.3 → iris_pex_embedded_python-2.3.5}/src/grongier/pex/_business_process.py

@@ -10,7 +10,9 @@ class _BusinessProcess(_BusinessHost):
     DISPATCH = []
 
     PERSISTENT_PROPERTY_LIST=None
-    """ A list of the variable names of persistent properties."""        
+    """ A list of the variable names of persistent properties."""     
+
+    Context=None   
 
     def on_message(self, request):
         """ Called when the business operation receives a message from another production component.
@@ -95,6 +97,8 @@ class _BusinessProcess(_BusinessHost):
 
     def _save_persistent_properties(self, host_object):
         """ For internal use only. """
+        if self.Context:
+            host_object.Context = self.Context
         if self.PERSISTENT_PROPERTY_LIST == None:
             return
         for prop in self.PERSISTENT_PROPERTY_LIST:
@@ -109,6 +113,8 @@ class _BusinessProcess(_BusinessHost):
 
     def _restore_persistent_properties(self, host_object):
         """ For internal use only. """
+        if host_object.Context:
+            self.Context = host_object.Context
         if self.PERSISTENT_PROPERTY_LIST == None:
             return
         for prop in self.PERSISTENT_PROPERTY_LIST:

{iris_pex_embedded_python-2.3.3 → iris_pex_embedded_python-2.3.5}/src/grongier/pex/_cli.py

@@ -26,10 +26,11 @@ def parse_args(argv):
     parser.add_argument('-k', '--kill', help='kill a production', action='store_true')
     parser.add_argument('-r', '--restart', help='restart a production', action='store_true')
     parser.add_argument('-x', '--status', help='status a production', action='store_true')
-    parser.add_argument('-M', '--migrate', help='migrate production and classes with settings file')
+    parser.add_argument('-M', '-m', '--migrate', help='migrate production and classes with settings file')
     parser.add_argument('-e', '--export', help='export a production', nargs='?', const='not_set')
     parser.add_argument('-v', '--version', help='display version', action='store_true')
     parser.add_argument('-L', '--log', help='display log', action='store_true')
+    parser.add_argument('-i', '--init', help='init the pex module in iris', nargs='?', const='not_set')
     return parser.parse_args(argv)
 
 def main(argv=None):
@@ -55,6 +56,12 @@ def main(argv=None):
             args.start = _Director.get_default_production()
         _Director.start_production_with_log(args.start)
 
+    elif args.init:
+        if args.init == 'not_set':
+            # set arg to None
+            args.init = None
+        _Utils.setup(args.start)
+
     elif args.kill:
         # kill a production
         _Director.shutdown_production()
@@ -112,6 +119,7 @@ def main(argv=None):
         print("  -x, --status          status a production")
         print("  -v, --version         display version")
         print("  -L, --log             display log")
+        print("  -i, --init            init the pex module in iris")
         print("")
         print("default production: " + _Director.get_default_production())
 

{iris_pex_embedded_python-2.3.3 → iris_pex_embedded_python-2.3.5}/src/grongier/pex/_common.py

@@ -2,8 +2,9 @@ import traceback
 import dataclasses
 import inspect
 import iris
+import abc
 
-class _Common():
+class _Common(metaclass=abc.ABCMeta):
     """ This is a common superclass for all component types that defines common methods."""
 
     INFO_URL: str
@@ -130,8 +131,8 @@ class _Common():
             
             if ""!=adapter:
                 ret.append(adapter)
-        except:
-            pass
+        except Exception as e:
+            raise e
         return ret
 
     @classmethod

{iris_pex_embedded_python-2.3.3 → iris_pex_embedded_python-2.3.5}/src/grongier/pex/_utils.py

@@ -3,6 +3,7 @@ import ast
 import iris
 import inspect
 import xmltodict
+import pkg_resources
 
 class _Utils():
     @staticmethod
@@ -19,9 +20,8 @@ class _Utils():
     def setup(path:str = None):
 
         if path is None:
-            # get the parent directory of the current module
-            # and append 'iris/Grongier/PEX' to it
-            path = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'iris/Grongier/PEX')
+            # get the path of the data folder with pkg_resources
+            path = pkg_resources.resource_filename(__name__, 'data')
 
         _Utils.raise_on_error(iris.cls('%SYSTEM.OBJ').LoadDir(path,'cubk',"*.cls",1))
 
@@ -190,13 +190,22 @@ class _Utils():
                     raise ValueError("The filename must be absolute")
                 # add the path to the system path
                 sys.path.append(path)
-                from settings import CLASSES, PRODUCTIONS
+            import settings
         except ImportError:
             # return an error if the settings file is not found
             # and explain how to create it
             raise ImportError("settings.py file not found. Please create it in the same directory as the main.py file. See the documentation for more information.")
-        _Utils.set_classes_settings(CLASSES)
-        _Utils.set_productions_settings(PRODUCTIONS)
+        try:
+            # set the classes settings
+            _Utils.set_classes_settings(settings.CLASSES)
+        except AttributeError:
+            print("No classes to register")
+        try:
+            # set the productions settings
+            _Utils.set_productions_settings(settings.PRODUCTIONS)
+        except AttributeError:
+            print("No productions to register")
+
 
 
     @staticmethod

iris_pex_embedded_python-2.3.5/src/grongier/pex/data/PEX/BusinessOperation.cls

@@ -0,0 +1,35 @@
+/* Copyright (c) 2021 by InterSystems Corporation.
+   Cambridge, Massachusetts, U.S.A.  All rights reserved.
+   Confidential property of InterSystems Corporation. */
+
+Class Grongier.PEX.BusinessOperation Extends (Ens.BusinessOperation, Grongier.PEX.Common) [ Inheritance = right, ProcedureBlock, System = 4 ]
+{
+
+Parameter SETTINGS = "%classname:Python BusinessOperation,%module:Python BusinessOperation,%settings:Python BusinessOperation,%classpaths:Python BusinessOperation";
+
+Method OnMessage(
+	request As %Library.Persistent,
+	Output response As %Library.Persistent) As %Status
+{
+	set tSC = $$$OK
+	try {
+		set response = ..%class."_dispatch_on_message"(request)
+	} catch ex {
+		set tSC = ex.AsStatus()
+	}
+	quit tSC
+}
+
+Method OnKeepalive(pStatus As %Status = {$$$OK}) As %Status
+{
+	set tSC = $$$OK
+	try {
+		$$$ThrowOnError(##super(pStatus))
+		do ..%class."on_keepalive"()
+	} catch ex {
+		set tSC = ex.AsStatus()
+	}
+	quit tSC
+}
+
+}

iris_pex_embedded_python-2.3.5/src/grongier/pex/data/PEX/BusinessProcess.cls

@@ -0,0 +1,118 @@
+/* Copyright (c) 2021 by InterSystems Corporation.
+   Cambridge, Massachusetts, U.S.A.  All rights reserved.
+   Confidential property of InterSystems Corporation. */
+
+Class Grongier.PEX.BusinessProcess Extends (Ens.BusinessProcess, Grongier.PEX.Common) [ Inheritance = right, ProcedureBlock, System = 4 ]
+{
+
+Parameter SETTINGS = "%classname:Python BusinessProcess,%module:Python BusinessProcess,%settings:Python BusinessProcess,%classpaths:Python BusinessProcess";
+
+Property persistentProperties As array Of %String(MAXLEN = "");
+
+Property Context As Ens.BP.Context;
+
+Method dispatchReply(response)
+{
+	set tSC = ..Reply(response)
+	if $$$ISERR(tSC) throw ##class(%Exception.StatusException).CreateFromStatus(tSC)
+	quit
+}
+
+Method dispatchSetTimer(
+	timeout,
+	completionKey)
+{
+	set tSC = ..SetTimer(timeout,$g(completionKey))
+	if $$$ISERR(tSC) throw ##class(%Exception.StatusException).CreateFromStatus(tSC)
+	quit
+}
+
+Method OnRequest(
+	request As %Persistent,
+	Output response As %Persistent) As %Status
+{
+	set tSC = $$$OK
+	try {
+		set response = ..%class."_dispatch_on_request"($this,request)
+	} catch ex {
+		set tSC = ex.AsStatus()
+	}
+	quit tSC
+}
+
+/// Handle a 'Response'
+Method OnResponse(
+	request As %Persistent,
+	Output response As %Persistent,
+	callRequest As %Persistent,
+	callResponse As %Persistent,
+	pCompletionKey As %String) As %Status
+{
+	set tSC = $$$OK
+	try {
+		set response = ..%class."_dispatch_on_response"($this,request,response,callRequest,callResponse,pCompletionKey)
+	} catch ex {
+		set tSC = ex.AsStatus()
+	}
+	quit tSC
+}
+
+Method OnComplete(
+	request As %Library.Persistent,
+	ByRef response As %Library.Persistent) As %Status
+{
+	set tSC = $$$OK
+	try {
+		set tSC = ..Connect() quit:$$$ISERR(tSC)
+		set response = ..%class."_dispatch_on_complete"($this,request,response)
+	} catch ex {
+		set tSC = ex.AsStatus()
+	}
+	quit tSC
+}
+
+Method getPersistentProperty(name)
+{
+	quit ..persistentProperties.GetAt(name)
+}
+
+Method setPersistentProperty(
+	name,
+	value)
+{
+	quit ..persistentProperties.SetAt(value,name)
+}
+
+Storage Default
+{
+<Data name="BusinessProcessDefaultData1">
+<Subscript>"BusinessProcess"</Subscript>
+<Value name="1">
+<Value>%classpaths</Value>
+</Value>
+<Value name="2">
+<Value>%classname</Value>
+</Value>
+<Value name="3">
+<Value>%module</Value>
+</Value>
+<Value name="4">
+<Value>%settings</Value>
+</Value>
+<Value name="5">
+<Value>%class</Value>
+</Value>
+<Value name="6">
+<Value>Context</Value>
+</Value>
+</Data>
+<Data name="persistentProperties">
+<Attribute>persistentProperties</Attribute>
+<Structure>subnode</Structure>
+<Subscript>"Grongier.PEX.BusinessProcess.persistentProperties"</Subscript>
+</Data>
+<DefaultData>BusinessProcessDefaultData1</DefaultData>
+<Type>%Storage.Persistent</Type>
+}
+
+}

iris_pex_embedded_python-2.3.5/src/grongier/pex/data/PEX/BusinessService.cls

@@ -0,0 +1,35 @@
+/* Copyright (c) 2021 by InterSystems Corporation.
+   Cambridge, Massachusetts, U.S.A.  All rights reserved.
+   Confidential property of InterSystems Corporation. */
+
+Class Grongier.PEX.BusinessService Extends (Ens.BusinessService, Grongier.PEX.Common) [ Inheritance = right, ProcedureBlock, System = 4 ]
+{
+
+Parameter SETTINGS = "%classname:Python BusinessService,%module:Python BusinessService,%settings:Python BusinessService,%classpaths:Python BusinessService";
+
+Method dispatchProcessInput(pInput As %RegisteredObject) As %RegisteredObject
+{
+	
+	quit ..%class."on_process_input"(pInput)
+}
+
+Method OnProcessInput(
+	request As %RegisteredObject,
+	Output response As %RegisteredObject) As %Status
+{
+	set tSC = $$$OK
+	try {
+		try {
+			set ..%class."_wait_for_next_call_interval" = ..%WaitForNextCallInterval
+		} catch {}
+		set response = ..%class."_dispatch_on_process_input"(request)
+		try {
+			set ..%WaitForNextCallInterval = ..%class."_wait_for_next_call_interval"
+		} catch {}
+	} catch ex {
+		set tSC = ex.AsStatus()
+	}
+	quit tSC
+}
+
+}

iris_pex_embedded_python-2.3.5/src/grongier/pex/data/PEX/Common.cls

@@ -0,0 +1,146 @@
+/* Copyright (c) 2021 by InterSystems Corporation.
+   Cambridge, Massachusetts, U.S.A.  All rights reserved.
+   Confidential property of InterSystems Corporation. */
+
+Include Ensemble
+
+Class Grongier.PEX.Common [ Abstract, ClassType = "", ProcedureBlock, System = 4 ]
+{
+
+/// One or more Classpaths (separated by '|' character) needed in addition to the ones configured in the Java Gateway Service
+Property %classpaths As %String(MAXLEN = "");
+
+Property %classname As %String(MAXLEN = "");
+
+Property %module As %String(MAXLEN = "");
+
+Property %settings As %String(MAXLEN = "");
+
+/// Instance of class
+Property %class As %SYS.Python;
+
+/// Get Class
+Method GetClass() As %SYS.Python
+{
+	Return ..%class
+}
+
+/// Get Classname
+Method GetClassname() As %String
+{
+	Return ..%classname
+}
+
+/// Get Classname
+Method GetModule() As %String
+{
+	Return ..%module
+}
+
+Method OnInit() As %Status
+{
+	set tSC = $$$OK
+	try {
+        $$$ThrowOnError(..Connect())
+		do ..%class."_dispatch_on_init"($this)
+	} catch ex {
+		set tSC = ex.AsStatus()
+	}
+	quit tSC
+}
+
+Method Connect() As %Status
+{
+	set tSC = $$$OK
+	try {
+		
+		set container = $this
+		
+		//set classpass
+		if ..%classpaths '="" {
+			set sys = ##class(%SYS.Python).Import("sys")
+			set delimiter = $s($system.Version.GetOS()="Windows":";",1:":")
+			set extraClasspaths = $tr(container.%classpaths,delimiter,"|")
+			for i=1:1:$l(extraClasspaths,"|") {
+				set onePath = $p(extraClasspaths,"|",i)
+				set onePath = ##class(%File).NormalizeDirectory(onePath)
+				if onePath?1"$$IRISHOME"1P.E set onePath = $e($system.Util.InstallDirectory(),1,*-1)_$e(onePath,11,*)
+				if onePath'="" do sys.path.append(onePath)
+			}
+		}
+		if $isObject(..%class)=0 {
+			set importlib = ##class(%SYS.Python).Import("importlib")
+			set builtins = ##class(%SYS.Python).Import("builtins")
+			set module = importlib."import_module"(..%module)
+			set class = builtins.getattr(module, ..%classname)
+			set ..%class = class."__new__"(class)
+		}
+		;
+		if ..%Extends("Grongier.PEX.InboundAdapter") || ..%Extends("Grongier.PEX.OutboundAdapter") {
+			do ..%class."_set_iris_handles"($this,..BusinessHost)
+		} elseif $this.%Extends("Grongier.PEX.BusinessProcess") {
+			do ..%class."_set_iris_handles"($this,$$$NULLOREF)
+		} else {
+			do ..%class."_set_iris_handles"($this,..Adapter)
+		}
+		;
+		do ..SetPropertyValues()
+		;
+		try {
+			do ..%class."_dispatch_on_connected"($this)
+		} catch ex {
+			$$$LOGWARNING(ex.DisplayString())
+		}
+		;
+	} catch ex {
+		set msg = $System.Status.GetOneStatusText(ex.AsStatus(),1)
+		set tSC = $$$ERROR($$$EnsErrGeneral,msg)
+	}
+	quit tSC
+}
+
+Method OnTearDown() As %Status
+{
+	set tSC = $$$OK
+    do ..%class."_dispatch_on_tear_down"()
+	quit tSC
+}
+
+Method SetPropertyValues()
+{
+	set remoteSettings = $tr(..%settings,$c(13))
+	for i=1:1:$l(remoteSettings,$c(10)) {
+		set oneLine = $p(remoteSettings,$c(10),i)
+		set property = $p(oneLine,"=",1) continue:property=""
+		set value = $p(oneLine,"=",2,*)
+		try {
+			set $property(..%class,property) = value
+		} catch ex {
+			$$$LOGWARNING(ex.DisplayString())
+		}
+	}
+	quit
+}
+
+Method dispatchSendRequestSync(
+	target,
+	request,
+	timeout,
+	description) As %String
+{
+	set tSC = ..SendRequestSync(target,request,.objResponse,timeout,description)
+	if $$$ISERR(tSC) throw ##class(%Exception.StatusException).CreateFromStatus(tSC)
+	quit $g(objResponse)
+}
+
+Method dispatchSendRequestAsync(
+	target,
+	request,
+	description)
+{
+	set tSC = ..SendRequestAsync(target,request,description)
+	if $$$ISERR(tSC) throw ##class(%Exception.StatusException).CreateFromStatus(tSC)
+	quit
+}
+
+}

iris_pex_embedded_python-2.3.5/src/grongier/pex/data/PEX/Director.cls

@@ -0,0 +1,57 @@
+/* Copyright (c) 2021 by InterSystems Corporation.
+   Cambridge, Massachusetts, U.S.A.  All rights reserved.
+   Confidential property of InterSystems Corporation. */
+
+Include (%occInclude, Ensemble)
+
+Class Grongier.PEX.Director [ Inheritance = right, ProcedureBlock, System = 4 ]
+{
+
+ClassMethod dispatchCreateBusinessService(pTargetDispatchName As %String) As Ens.BusinessService
+{
+	set tSC = ##class(Ens.Director).CreateBusinessService(pTargetDispatchName,.service)
+	if $$$ISERR(tSC) throw ##class(%Exception.StatusException).CreateFromStatus(tSC)
+	quit service
+}
+
+ClassMethod dispatchListProductions() As %String
+{
+	// Loop over the productions in this namespace
+	Set tRS = ##class(%ResultSet).%New("Ens.Config.Production:ProductionStatus")
+	If '$IsObject(tRS) Set tSC = %objlasterror Quit
+	
+	Set tSC = tRS.Execute()
+	Quit:$$$ISERR(tSC)
+	
+	set tDict = ##class(%SYS.Python).Import("builtins").dict()
+
+	While (tRS.Next()) {
+		Set tProduction = tRS.Data("Production")
+		Set tInfo = ##class(%SYS.Python).Import("builtins").dict()
+		do tInfo."__setitem__"("Status",tRS.Data("Status"))
+		do tInfo."__setitem__"("LastStartTime",tRS.Data("LastStartTime"))
+		do tInfo."__setitem__"("LastStopTime",tRS.Data("LastStopTime"))
+		do tInfo."__setitem__"("AutoStart",$G(^Ens.AutoStart)=tProduction)
+		do tDict."__setitem__"(tProduction,tInfo)
+	}
+
+	Kill tRS
+
+	return tDict
+}
+
+ClassMethod StatusProduction() As %String
+{
+	Set sc = $$$OK
+	Set tInfo = ##class(%SYS.Python).Import("builtins").dict()
+	$$$ThrowOnError(##class(Ens.Director).GetProductionStatus(.tProdName,.tStatus))
+	do tInfo."__setitem__"("Production",tProdName)
+	do tInfo."__setitem__"("Status",$CASE(tStatus,$$$eProductionStateRunning:"running",
+												$$$eProductionStateStopped:"stopped",
+												$$$eProductionStateSuspended:"suspended",
+												$$$eProductionStateTroubled:"toubled",
+												:"unknown"))
+	Return tInfo
+}
+
+}

iris_pex_embedded_python-2.3.5/src/grongier/pex/data/PEX/Duplex/Operation.cls

@@ -0,0 +1,29 @@
+Class Grongier.PEX.DuplexOperation Extends Grongier.PEX.PrivateSessionDuplex
+{
+
+ClassMethod OnBusinessType(pItem As Ens.Config.Item) As %Integer
+{
+    Quit $$$eHostTypeOperation
+}
+
+XData MessageMap
+{
+<MapItems>
+<MapItem MessageType="Ens.Request"><Method>OnMessage</Method></MapItem>
+</MapItems>
+}
+
+Method OnMessage(
+	request As %Library.Persistent,
+	Output response As %Library.Persistent) As %Status
+{
+	set tSC = $$$OK
+	try {
+		set response = ..%class."_dispatch_on_message"(request)
+	} catch ex {
+		set tSC = ex.AsStatus()
+	}
+	quit tSC
+}
+
+}