loop (+13 squashed commits)

Squashed commits:
[c38c34b] loop
[92e1c01] loop
[74a6566] loop
[89953c0] add async io
[6d223d1] add async io
[e02271b] add async io
[fde0a26] add async io
[999e375] add async io
[69fbc35] add async io
[f054b3f] add async io
[d599139] downgrade python
[6c768a4] downgrade python
[7d6219b] downgrade python

Author: SempaiEcchi

Pipfile

@@ -26,4 +26,4 @@ psycopg2 = "2.9.1"
 gunicorn = "20.1.0"
 
 [requires]
-python_version = "3.9"
+python_version = "3.8.10"

Pipfile.lock

@@ -1,20 +1,19 @@
+import asyncio
 from copy import deepcopy
 from uuid import uuid4
 from xml import etree
 
 import aiohttp
 import requests
 import os
-from aiohttp.client import ClientSession, ClientTimeout, ContentTypeError
+
 import xml.etree.ElementTree as ET
 
+from aiohttp import ContentTypeError, ClientSession, ClientTimeout
+
 import env
 from bpmn_model import *
 
-
-timeout = ClientTimeout(sock_connect=5)
-client_session = ClientSession(timeout=timeout)
-
 from utils.common import parse_expression, nested_dict_get, nested_dict_set
 
 NS = {
@@ -24,6 +23,8 @@
 
 BPMN_MAPPINGS = {}
 
+timeout = ClientTimeout(sock_connect=5)
+
 
 def bpmn_tag(tag):
     def wrap(object):
@@ -252,44 +253,52 @@ async def run_connector(self, variables, instance_id):
         )
 
         # Check method and make request
+        async with aiohttp.ClientSession(timeout=timeout) as client_session:
+            if method := self.connector_fields["input_variables"].get("method") or "GET":
+                if method == "POST":
+                    call_function = client_session.post
+                elif method == "PATCH":
+                    call_function = client_session.patch
+                else:
+                    call_function = client_session.get
+                if not isinstance(data, dict):
+                    data = dict(data)
+                response = await call_function(
+                    url,
+                    params=parameters,
+                    json=data,
+                    headers={'content-type': 'application/json'}
+                )
+                if response.status not in (200, 201):
+                    raise Exception(response.text)
+
+            r = {}
+            try:
+                r = await response.json()
+            except Exception as e:
+                print("error")
+                if not isinstance(e, ContentTypeError):
+                    raise e
+
+                # Check for output variables
+
+            if self.output_variables:
+                for key in self.output_variables:
+                    value = self.output_variables.get(key)
+                    if len(value) > 0:
+                        variables[key] = parse_expression(expression=value, process_variables=r)
+                    if key in r:
+                        variables[key] = r[key]
+            print(variables)
+        return r
+
+
+
 
-        if method := self.connector_fields["input_variables"].get("method") or "GET":
 
-            if method == "POST":
-                call_function = client_session.post
-            elif method == "PATCH":
-                call_function = client_session.patch
-            else:
-                call_function = client_session.get
-            if not isinstance(data,dict):
-                data = dict(data)
-            response = await call_function(
-                url,
-                params=parameters,
-                json=data,
-                headers={'content-type': 'application/json'}
-            )
-            if response.status not in (200, 201):
-                raise Exception(response.text)
 
-        r = {}
-        try:
-            r = await response.json()
-        except Exception as e:
-            print("error")
-            if not isinstance(e, ContentTypeError):
-                raise e
 
-            # Check for output variables
 
-        if self.output_variables:
-            for key in self.output_variables:
-                value = self.output_variables.get(key)
-                if len(value) > 0:
-                    variables[key] = parse_expression(expression=value, process_variables=r)
-                if key in r:
-                    variables[key] = r[key]
-        print(variables)
 
     async def run(self, variables, instance_id):
 

bpmn_types.py

@@ -0,0 +1 @@
+python-3.8.10

runtime.txt

@@ -1,12 +1,14 @@
+import uuid
+
 import aiohttp
 import os
-from aiohttp import web
 from uuid import uuid4
 import asyncio
+from aiohttp import web, ClientSession, ClientTimeout
 
 from aiohttp.web_ws import WebSocketResponse
 
-from bpmn_model import BpmnModel, UserFormMessage, get_model_for_instance, ReceiveMessage, BpmnInstance
+from bpmn_model import BpmnModel, UserFormMessage, get_model_for_instance, ReceiveMessage
 import aiohttp_cors
 import db_connector
 from functools import reduce
@@ -86,7 +88,8 @@ async def handle_new_instance(request):
 
 @routes.get("/model/{model_name}/instance")
 async def handle_new_instance(request):
-    _id = str(uuid4())
+    _id = str(uuid4()) + str(uuid.uuid1())
+
     model = request.match_info.get("model_name")
     instance = await app["bpmn_models"][model].create_instance(_id, {})
     asyncio.create_task(instance.run())
@@ -171,7 +174,7 @@ async def handle_task_info(request):
     m: BpmnModel = get_model_for_instance(instance_id)
     if not m:
         raise aiohttp.web.HTTPNotFound
-    instance: BpmnInstance = m.instances[instance_id]
+    instance = m.instances[instance_id]
     task = instance.model.elements[task_id]
 
     return web.json_response(task.get_info())
@@ -234,7 +237,7 @@ async def handle_instance_state(request):
 app = None
 
 
-def run():
+async def run():
     global app
     app = web.Application()
     app.on_startup.append(run_as_server)
@@ -264,4 +267,5 @@ async def serve():
 
 if __name__ == "__main__":
     app = run()
+
     web.run_app(app, port=os.environ.get('PORT', 9000))