cloudpss 4.5.1a1__py3-none-any.whl → 4.5.1a3__py3-none-any.whl

cloudpss/job/job.py

@@ -259,7 +259,9 @@ class Job(Generic[T]):
         sender =  self.write()
         if resultType is None:
             resultType = getResultClass(self.context[0])
-        return resultType(receiver, sender)
+        self._result= resultType(receiver, sender)
+        
+        return self._result
 
     
 

cloudpss/job/messageStreamReceiver.py

@@ -1,3 +1,4 @@
+import datetime
 import logging
 import sys
 
@@ -29,7 +30,21 @@ class MessageStreamReceiver(JobReceiver):
         self.origin = os.environ.get("CLOUDPSS_API_URL", "https://cloudpss.net/")
         self.__hasOpen = False
         self.templates=TemplateManager()
-
+        self.timeOffset=0
+        self.lastMessageTime=0
+    
+    
+    def updateTime(self,timestamp):
+        self.lastMessageTime = timestamp
+        
+    ## 判断是否到达当前时间点的数据或者消息流结束
+    def isEnd(self):
+        
+        if self.status == 1:
+            return True
+        logging.debug('lastMessageTime',self.lastMessageTime)
+        return (self.lastMessageTime/1000)>=time.time()-self.timeOffset
+        
     def __path(self, from_=None):
         if self.id is None:
             raise Exception("id is None")
@@ -50,6 +65,7 @@ class MessageStreamReceiver(JobReceiver):
     def __on_message(self, message):
         
         data = IO.deserialize(message, "ubjson")
+        self.updateTime(data["timestamp"])
         self.ws.url = self.__path(data["id"])
         msg = IO.deserialize(data["data"], "ubjson")
         
@@ -71,7 +87,6 @@ class MessageStreamReceiver(JobReceiver):
 
 
     def __on_error(self,  *args, **kwargs):
-        print(args)
         logging.debug("MessageStreamReceiver error")
         msg = {
             "type": "log",
@@ -115,6 +130,10 @@ class MessageStreamReceiver(JobReceiver):
     
     def __on_open(self,ws, *args, **kwargs):
         self.ws = ws
+        gmt_format = '%a, %d %b %Y %H:%M:%S GMT'
+        serverTime = datetime.datetime.strptime(ws.sock.headers['date'],gmt_format)
+        self.timeOffset = time.time()+time.timezone-serverTime.timestamp()
+        
         logging.debug(f"MessageStreamReceiver on_open")
         self._status = 0
         self.__hasOpen = True

cloudpss/version.py

@@ -1 +1 @@
-__version__ = '4.5.1-alpha.1'
+__version__ = '4.5.1-alpha.3'

{cloudpss-4.5.1a1.dist-info → cloudpss-4.5.1a3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudpss
-Version: 4.5.1a1
+Version: 4.5.1a3
 Summary: cloudpss sdk
 Home-page: https://www.cloudpss.net
 Author: cloudpss

{cloudpss-4.5.1a1.dist-info → cloudpss-4.5.1a3.dist-info}/RECORD

@@ -1,6 +1,6 @@
 cloudpss/__init__.py,sha256=xnA-UjehYOzH6KV7vOXHwdbGEiw6g_OPKzrbZA9Fuc8,858
 cloudpss/verify.py,sha256=KF4Gd59DGvCyIEkRD7rNnekWw22XxJpi3DW6keb6j4c,1498
-cloudpss/version.py,sha256=OkdClTVu2YIpXJok-ghyrL4EsxAGY2L98DrzpSeM68Q,30
+cloudpss/version.py,sha256=e0G7hMynx1ngWLqRLQceSGe8j6JeXo7mShYO0alsBvk,30
 cloudpss/asyncio/__init__.py,sha256=CJGopQl_vz3z3fJsK7NjMX5uzkzfrJrbqKVhyYqlYWc,198
 cloudpss/asyncio/job/__init__.py,sha256=3UIFZYjJTzuckM61o8kim1c3PWt2SSHTL72jrGu5IzI,51
 cloudpss/asyncio/job/job.py,sha256=Bn2BEERw1J8YarFauTzVrGJK7nmaoMsdlrFUqiHRth4,3897
@@ -34,9 +34,9 @@ cloudpss/ieslab/__init__.py,sha256=gr1rXYw9vIAGOe60eg7LyMHP7QDXvNf4dJ5GTR_kj1Y,2
 cloudpss/job/TemplateCompiler.py,sha256=MuJDTQ54wRo5bGSvBJBJjXJ7u463dwpRkaLwIwm_hLE,9936
 cloudpss/job/TemplateManager.py,sha256=PYFWcnJMlvXsoqKh_GMMti72o0ajLWYssrOGUtknMwY,1099
 cloudpss/job/__init__.py,sha256=3UIFZYjJTzuckM61o8kim1c3PWt2SSHTL72jrGu5IzI,51
-cloudpss/job/job.py,sha256=kI8Yptc19q8A2UocxfG-GF25hhoKPpZTXndIJjQJJAY,8253
+cloudpss/job/job.py,sha256=pV-J0VBnyExIabzt2hMnIvLFdowWz-QT0DuR80Gv9AE,8297
 cloudpss/job/jobReceiver.py,sha256=PNYxcN33LiXZVyc4tzhPlpWxKnyWO_ElKjJ9wsxsroI,925
-cloudpss/job/messageStreamReceiver.py,sha256=eCxaEDFFkY5SEb72sy50C_HOispujmtrlmxVGrzIWVc,4564
+cloudpss/job/messageStreamReceiver.py,sha256=JtS-p0ka8eVVyG4I00G_A4Vu_uI-l3TfBrX_Fhojxow,5269
 cloudpss/job/messageStreamSender.py,sha256=QQO6XtoZNLiUJXeSZmim-XFDBrb9i-JAjMPHKXcscZA,2365
 cloudpss/job/result/EMTResult.py,sha256=xC9ws7bH-2nhpF8lqzZLqcOL-IcYS-JeBboEHgX96wk,6941
 cloudpss/job/result/IESLabSimulationResult.py,sha256=a47Ic1vvfHTK_vEokOZxJBnQReqYOWux_aePPic_Hrs,84
@@ -74,7 +74,7 @@ cloudpss/utils/graphqlUtil.py,sha256=zGEhRZvy5JMipFKFxjDmbc-HQP3aPZ5noDwi-RTXWSk
 cloudpss/utils/httprequests.py,sha256=KYE8iIqaBEN6gTdxFgUyvdKf3kbSizxxgmNN8_1BQjQ,1850
 cloudpss/utils/matlab.py,sha256=SLwVt790BjklJK2XNELt9R2n_1ej9Y8QsTIdFkKXLWE,795
 cloudpss/utils/yamlLoader.py,sha256=bv_vPDK_e0n_vZ5FwpDJ_NJWqMAwfU3AbhkvQIxPCy4,2677
-cloudpss-4.5.1a1.dist-info/METADATA,sha256=0p3hoIkBLkmJ8RQ5o8Tjw6QFCfhMdmNQlyv_XAtOjEQ,2403
-cloudpss-4.5.1a1.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-cloudpss-4.5.1a1.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
-cloudpss-4.5.1a1.dist-info/RECORD,,
+cloudpss-4.5.1a3.dist-info/METADATA,sha256=KCvAI0Vkq4lgfzNJ4c8eHjOLTABwD7bwpjeQfLMCpmc,2403
+cloudpss-4.5.1a3.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+cloudpss-4.5.1a3.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
+cloudpss-4.5.1a3.dist-info/RECORD,,