cloudpss 4.0.16__py3-none-any.whl → 4.0.18__py3-none-any.whl

cloudpss/runner/MessageStreamReceiver.py

@@ -19,7 +19,7 @@ class Message(object):
 class MessageStreamReceiver(object):
     """消息流读取函数结果"""
 
-    def __init__(self, id, db):
+    def __init__(self, id, db, **kwargs):
         self.origin = os.environ.get('CLOUDPSS_API_URL',
                                      'https://cloudpss.net/')
         self.id = id
@@ -61,8 +61,6 @@ class MessageStreamReceiver(object):
         if "when" not in msg:
             msg['when']= datetime.datetime.now()
         self.db.storeMessage(msg)
-        if(msg['type']=='terminate'):
-            self.close(self.ws)
 
     def on_error(self, ws, error):
         msg = {
@@ -88,6 +86,7 @@ class MessageStreamReceiver(object):
 
     def close(self, ws):
         ws.close()
+        self._status = 1
 
     def status(self):
         return self._status

cloudpss/runner/runner.py

@@ -74,6 +74,7 @@ class Runner(Generic[T]):
         """
         if self.receiver is None:
             raise Exception('not find receiver')
+        time.sleep(0)
         return self.receiver.status()
 
     def __listen(self, **kwargs):
@@ -142,6 +143,16 @@ class Runner(Generic[T]):
             t= [ i.split('=') for i in re.split(r'\s+',debug) if i.find('=')>0]
             for i in t:
                 debugargs[i[0]]=i[1]
+        
+        context= [
+            function,
+            rid,
+            f"model/@sdk/{str(int(time.time() * random.random()))}",
+        ]
+        
+        PARENT_JOB_ID =kwargs.get("PARENT_JOB_ID",None)
+        if PARENT_JOB_ID is not None:
+            context.append(f"job/parent/{PARENT_JOB_ID}")
         variables = {
             "input": {
                 "args": {
@@ -150,11 +161,7 @@ class Runner(Generic[T]):
                     "_ModelArgs": config["args"],
                     "implement":implement
                 },
-                "context": [
-                    function,
-                    rid,
-                    f"model/@sdk/{str(int(time.time() * random.random()))}",
-                ],
+                "context": context,
                 "policy": policy,
                 "debug":debugargs
             }
@@ -184,7 +191,7 @@ class Runner(Generic[T]):
 
 
         query = '''mutation($input:CreateJobInput!){job:createJob(input:$input){id input output status position}}'''
-        variables = Runner.__createJobVariables(job, config, revisionHash, rid,policy)
+        variables = Runner.__createJobVariables(job, config, revisionHash, rid,policy, **kwargs)
         r = graphql_request(query, variables)
         if 'errors' in r:
             raise Exception(r['errors'])

cloudpss/version.py

@@ -1 +1 @@
-__version__ = '4.0.16'
+__version__ = '4.0.18'

{cloudpss-4.0.16.dist-info → cloudpss-4.0.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudpss
-Version: 4.0.16
+Version: 4.0.18
 Summary: cloudpss sdk
 Home-page: https://www.cloudpss.net
 Author: cloudpss
@@ -18,7 +18,7 @@ Requires-Dist: PyJWT
 Requires-Dist: numpy
 Requires-Dist: PyYAML
 Requires-Dist: requests
-Requires-Dist: websocket-client
+Requires-Dist: websocket-client (>=1.4.0)
 Requires-Dist: pytz
 Requires-Dist: deprecated
 Requires-Dist: zstandard

{cloudpss-4.0.16.dist-info → cloudpss-4.0.18.dist-info}/RECORD

@@ -1,6 +1,6 @@
 cloudpss/__init__.py,sha256=Ov8K45KxSsPalPErvTRUb2GvPdJ3myucFqx7s37_YZo,777
 cloudpss/verify.py,sha256=KF4Gd59DGvCyIEkRD7rNnekWw22XxJpi3DW6keb6j4c,1498
-cloudpss/version.py,sha256=55swFEl0A5JJ1y5LHxY47Q2aP4ZViH8Eksx3NZBZji0,22
+cloudpss/version.py,sha256=HtpvLSSEp0Li-XbWpJi-tnvxg2kOETfbOBfNmmqOwaQ,22
 cloudpss/asyncio/__init__.py,sha256=CJGopQl_vz3z3fJsK7NjMX5uzkzfrJrbqKVhyYqlYWc,198
 cloudpss/asyncio/job/__init__.py,sha256=3UIFZYjJTzuckM61o8kim1c3PWt2SSHTL72jrGu5IzI,51
 cloudpss/asyncio/job/job.py,sha256=ExA-8JVOWWW5neVvNazPk4i3Z-q8xqYBL4qXU1m3rgM,3891
@@ -57,11 +57,11 @@ cloudpss/runner/DSLabResult.py,sha256=xJqKA3e1KSXQmLDe9_T6fG1exdE9j7EjfIfvBMmqiJ
 cloudpss/runner/IESLabEvaluationResult.py,sha256=uFNLiN5kzlzSGlLIq3ybuRwB-ufYytflVrXV5g7voOU,5841
 cloudpss/runner/IESLabPlanResult.py,sha256=dCyTbMtITy9XDjE42knrpJrvaH7dvFgfQMZbx9hybRs,6862
 cloudpss/runner/IESLabTypicalDayResult.py,sha256=3egAzmv32sr4wKaVgLxsM75ScSb08F4-iLEbuPkoi_c,8001
-cloudpss/runner/MessageStreamReceiver.py,sha256=sjZPZFbfepMIb-kgAl3zBcin0idIIL-37vpUmxvP3DI,2847
+cloudpss/runner/MessageStreamReceiver.py,sha256=dT-rKslQbRt3bMTGXupa1YrocHl2zTWOCHlsXcbgfhs,2812
 cloudpss/runner/__init__.py,sha256=aZ00V2AzQNBbER0xi6pqFFyiLFM-6r1fxvzdxxUJA_4,241
 cloudpss/runner/receiver.py,sha256=d8vOtBJ_Iqo3syJXgFFxwii1MXF7CyHRoXy6eT81Zq4,4096
 cloudpss/runner/result.py,sha256=GFpd7848gsLRuzhVcWbCwmAjR84Lhik_3pNCjOV8VOY,13291
-cloudpss/runner/runner.py,sha256=dyh_Sm38F-W8HatjRuVFEqd5Jla-d_GasRZ978zdMvw,7808
+cloudpss/runner/runner.py,sha256=A100N93JsKKougZItU88Fw8W8X3k8TuCPXqy8ECrlTQ,8003
 cloudpss/runner/storage.py,sha256=zFET_zwPIOF2Cnh9sgFiS0HFxV1OmVsU34bGUQ6PpkA,4162
 cloudpss/runner/transform.py,sha256=krOgTZiJSJAb5QSwerAqlbC4Ma0PKi__0WOZlAxw4O8,11613
 cloudpss/utils/IO.py,sha256=Uh1NOlBn15Jl5_aWS2QRO2-QsKlFT9o8DPtP8-8Z2PA,5314
@@ -71,7 +71,7 @@ cloudpss/utils/graphqlUtil.py,sha256=swl6XT1UmUQHdHjMWw3M0i8meEmVKNQvX0SHsbgg8TU
 cloudpss/utils/httprequests.py,sha256=-RYi1Dc4QDqqupuw0x-lq74dFvCqPrZfCJKgrdolEpk,1643
 cloudpss/utils/matlab.py,sha256=SLwVt790BjklJK2XNELt9R2n_1ej9Y8QsTIdFkKXLWE,795
 cloudpss/utils/yamlLoader.py,sha256=KRlRkHFltOjqxa_sesdBLf1W5J7XTgvubszsSw-XR0U,2885
-cloudpss-4.0.16.dist-info/METADATA,sha256=qBvWqGy5yC2L0wcD_1Ptqazlo19cg2CKfFAj1hr-B7E,2369
-cloudpss-4.0.16.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-cloudpss-4.0.16.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
-cloudpss-4.0.16.dist-info/RECORD,,
+cloudpss-4.0.18.dist-info/METADATA,sha256=LU9FgheEEf9VhPnO0CLONapU-EY7T5b_2bS07AY-x5E,2379
+cloudpss-4.0.18.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+cloudpss-4.0.18.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
+cloudpss-4.0.18.dist-info/RECORD,,