cloudpss 4.5.8__tar.gz → 4.5.10__tar.gz

{cloudpss-4.5.8 → cloudpss-4.5.10}/PKG-INFO

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

{cloudpss-4.5.8 → cloudpss-4.5.10}/cloudpss/function/functionExecution.py

@@ -4,6 +4,8 @@ import json
 import signal
 import sys
 from ..utils import MatlabDataEncoder
+import threading
+import queue
 
 
 class EventSample(object):
@@ -23,7 +25,23 @@ class EventSample(object):
              eventHandlerKwargs] in self.__eventHandlerSample:
             eventHandlerSample(*eventHandlerArgs, **eventHandlerKwargs)
 
+class EventInput(object):
+    def __init__(self):
+        self.__eventHandlerSample = []
 
+    def __iadd__(self, EventHandler):
+        self.__eventHandlerSample.append(EventHandler)
+        return self
+
+    def __isub__(self, EventHandler):
+        self.__eventHandlerSample.remove(EventHandler)
+        return self
+
+    def __call__(self, *args, **kwargs):
+        for [eventHandlerSample] in self.__eventHandlerSample:
+            # 调用事件处理程序
+            if eventHandlerSample:
+                eventHandlerSample(*args, **kwargs)
 class Args(dict):
     """
         参数类
@@ -87,7 +105,9 @@ class FunctionExecution(object):
         self.token = kwargs.get('token', None)
         self.functionToken = kwargs.get('functionToken', None)
         self.__abortedEvents = EventSample()
+        self.__inputEvents = EventInput()
         self._args = None
+        self.__input_thread = None
         signal.signal(signal.SIGINT, self._on_abort)
 
     @property
@@ -185,6 +205,23 @@ class FunctionExecution(object):
         '''
         sys.exit(code)
 
+    def input_thread(self):
+        while True:
+            user_input = input()
+            self.__inputEvents(user_input)
+            
+    def on_input(self, func):
+        """
+            监听input事件
+
+            :params func 响应后的回调函数
+        """
+        if self.__input_thread is None:
+            self.__input_thread = threading.Thread(target=self.input_thread, args=())
+            self.__input_thread.start()
+            self.log('cloudpss input stream is ready', 'debug')
+        self.__inputEvents += [func]
+        
     def print(self, data):
         print(json.dumps(data, cls=MatlabDataEncoder)+'\n', flush=True)
 

{cloudpss-4.5.8 → cloudpss-4.5.10}/cloudpss/ieslab/DataManageModel.py

@@ -83,7 +83,7 @@ class DataManageModel(object):
             
             :return: 无
         '''
-        list = ['thermalLoads', 'heatingLoad', 'coolingLoad', 'electricLoads', 'fuels', 'typhoon', 'rainfall', 'earthquake', 'extremeCold', 'HydrogenLoad']
+        list = ['thermalLoads', 'heatingLoad', 'coolingLoad', 'electricLoads', 'fuels', 'typhoon', 'rainfall', 'earthquake', 'extremeCold', 'HydrogenLoad', 'ammoniaLoad']
         for kind,value in self._kindUrlMap.items():
             try:
                 if kind in list:
@@ -125,6 +125,7 @@ class DataManageModel(object):
         assert (dataType in self._kindNameMap
                 or dataType in self._kindUrlMap), "数据类型不存在"
         kind = self._kindNameMap.get(dataType, dataType)
+        print(kind)
         return copy.deepcopy(self._kindItemDataMap[kind])
 
     def AddDataItem(self, dataType, data):
@@ -151,7 +152,7 @@ class DataManageModel(object):
             self._kindIdMap[str(data['id'])]=kind
             self._itemDataMap[str(data['timeid'])]=data
             self._itemDataMap[str(data['id'])]=data
-            if kind in ['thermalLoads', 'heatingLoad','coolingLoad', 'electricLoads', 'fuels']:
+            if kind in ['thermalLoads', 'heatingLoad','coolingLoad', 'electricLoads', 'fuels', 'ammoniaLoad']:
                 dataList = self._fetchItemData(self._kindUrlMap[kind], None)
                 self._kindItemDataMap[kind] = dataList
                 return dataList[-1]['id']
@@ -490,7 +491,11 @@ class IESOptDataManageModel(DataManageModel):
         "氢气压缩设备": "HydrogenCompression",
         "氢负荷": "HydrogenLoad",
         "氢": "HydrogenProductionFuels",
-        "运氢槽车": "HydrogenTanker"
+        "运氢槽车": "HydrogenTanker",
+        "制氨设备": "AmmoniaProduction",
+        "储氨罐": "AmmoniaStoTank",
+        "制氮设备": "NitrogenProduction",
+        "氨负荷": "ammoniaLoad",
     }
     _kindUrlMap = {
         "PhotovoltaicSys": "api/ieslab-opt/rest/dpcs/",
@@ -537,5 +542,9 @@ class IESOptDataManageModel(DataManageModel):
         "ALK": "api/ieslab-opt/rest/hpc/",
         "PEME": "api/ieslab-opt/rest/hpc/",
         "SOEC": "api/ieslab-opt/rest/hpc/",
+        "AmmoniaProduction": "api/ieslab-opt/rest/apc/",
+        "AmmoniaStoTank": "api/ieslab-opt/rest/esc/",
+        "NitrogenProduction": "api/ieslab-opt/rest/asec/",
+        "ammoniaLoad": "api/ieslab-opt/rest/ammoniaLoad/",
     }
     pass

cloudpss-4.5.10/cloudpss/version.py

@@ -0,0 +1 @@
+__version__ = '4.5.10'

{cloudpss-4.5.8 → cloudpss-4.5.10}/cloudpss.egg-info/PKG-INFO

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

cloudpss-4.5.8/cloudpss/version.py

@@ -1 +0,0 @@
-__version__ = '4.5.8'