cloudpss 5.0.2__tar.gz → 5.0.3__tar.gz

{cloudpss-5.0.2 → cloudpss-5.0.3}/PKG-INFO

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

{cloudpss-5.0.2 → cloudpss-5.0.3}/cloudpss/job/TemplateCompiler.py

@@ -2,7 +2,7 @@ import json
 from collections import namedtuple
 from typing import Any, Dict, List, Union
 import copy
-
+import traceback
 PARSER_STATUS_TEXT = 0
 PARSER_STATUS_EXPRESSION_SIMPLE = 1
 PARSER_STATUS_EXPRESSION_COMPLEX = 2
@@ -105,6 +105,7 @@ def parse_interpolation_impl(template, start, length):
         'values': values,
     }
     
+    
 # 是否为 ArrayBuffer
 def is_array_buffer(value: Any) -> bool:
     return isinstance(value, (memoryview, bytearray))
@@ -113,15 +114,28 @@ def is_array_buffer(value: Any) -> bool:
 def is_error(value: Any) -> bool:
     return isinstance(value, Exception)
 
+def formula(template: str) -> str:
+    
+    value=None
+    try:
+        from mirascript import compile
+        value = compile(template, input_mode='script')
+    except ImportError:
+        raise ImportError('mirascript is required for formula evaluation')
+    
+    return {
+        'type': 'formula',
+        'value': value,
+    }
 
 def parse_template(template: str) -> Any:
     if not template:
         return ''
+    if len(template) <= 1:
+        return template
     if template.startswith('='):
-        return {
-            'type': 'formula',
-            'value': template[1:].strip(),
-        }
+        # print("formula template:", template)
+        return formula(template[1:].strip())
     if template.startswith('$'):
         result = parse_interpolation_impl(template, 1, len(template)-1)
         if len(result['templates']) == 0:
@@ -140,7 +154,11 @@ class TemplateCompiler:
         self.options = options
         self.params = {}
         self.copyable = []
+        self.useList = []
 
+    def use(self, name: str) -> str:
+        self.useList.append(name)
+        return len(self.useList) - 1
     # 构建求值
     def build_eval(self, expression: str, type_: str) -> str:
         evaluator = self.options['evaluator']
@@ -149,28 +167,28 @@ class TemplateCompiler:
         return evaluator['compile'](expression, type_)
 
     # 构建字符串
-    def build_string(self, str_: str) -> Union[str, bool]:
+    def build_template(self, str_: str) -> Union[str, bool]:
         parsed = parse_template(str_)
+        
+        
+        
         if isinstance(parsed, str):
-            return json.dumps(parsed), False
-        if parsed['type'] == 'formula':
-            return self.build_eval(parsed['value'], parsed['type']), True
-        result = ''
-        for i in range(len(parsed['templates'])):
-            if parsed['templates'][i]:
-                result += (result and '+' or '') + json.dumps(parsed['templates'][i])
-            if i < len(parsed['values']):
-                if not result:
-                    result = '""'
-                result += '+' + self.build_eval(parsed['values'][i], parsed['type'])
-        return result, True
+            return json.dumps(parsed)
+        useIndex = self.use(parsed['value'][0])
+        # print("parsed template:", parsed['value'],str_,useIndex)
+        
+        return """useList[{useIndex}](context)""".format(useIndex=useIndex)
+        # return "1"
+        
+        
+       
 
     # 构建 Error
     def build_error(self, err: Exception) -> str:
         constructor="Error"
         if err.__class__.__name__ == constructor:
-            return f'new {constructor}({self.build_string(err.message)[0]})'
-        return f'Object.assign(new {constructor}({self.build_string(err.message)[0]}), {{name: {self.build_string(err.name)[0]}}})'
+            return f'new {constructor}({self.build_template(err.message)[0]})'
+        return f'Object.assign(new {constructor}({self.build_template(err.message)[0]}), {{name: {self.build_template(err.name)[0]}}})'
 
     # 构建数组
     def build_array(self, arr: List[Any]) -> str:
@@ -195,11 +213,8 @@ class TemplateCompiler:
             if self.options['objectKeyMode'] == 'ignore':
                 result += json.dumps(key)
             else:
-                e, is_expression = self.build_string(key)
-                if is_expression:
-                    result += f'[{e}]'
-                else:
-                    result += e
+                e = self.build_template(key)
+                result += f'{e}'
             result += ':'
             result += self.build_value(value)
         return '{' + result + '}'
@@ -214,8 +229,10 @@ class TemplateCompiler:
             return 'False'
         if isinstance(value, (int, float)):
             return str(value)
+        
         if isinstance(value, str):
-            return self.build_string(value)[0]
+            return self.build_template(value)
+        
         if isinstance(value, Exception):
             return self.build_error(value)
         if isinstance(value, list):
@@ -234,12 +251,15 @@ class TemplateCompiler:
         source = self.build_value(self.template)
         if self.copyable:
             self.params['copyable'] = self.copyable
-        params = list(self.params.items())
+        # params = list(self.params.items())
+        # print("template source:", source)
         try:
-            result = eval(f'lambda context: ({source})')
+            result = eval(f'lambda context: ({source})',{"useList": self.useList})
+            # result = eval(f'lambda context: (useList[127](context))',{"useList": self.useList})
             result.source = source
             return result
         except Exception as e:
+            traceback.print_exc()
             raise ValueError(f'Failed to compile template: {source}\n{str(e)}')
 
 
@@ -263,9 +283,42 @@ def template(templates,options={}):
 
 
 if __name__ == "__main__":
+   
+    # f =open("D:/code/python/test/result1-temp.json","r",encoding="utf-8")
+    
+    # message =f.read()
+    # f.close()
+    # message = json.loads(message)
+    
+    # id =message[0]
+    
+    # templates=message[3:]
     
-    message =[1, 1, {'component_load_5_无功功率': [0], 'component_load_5_有功功率': [0], 'time': ['placeholder']}, {'data': {'title': '负荷5功率(kW)', 'traces': [{'name': '有功功率', 'type': 'scatter', 'x': '=time', 'y': '=component_load_5_有功功率'}, {'name': '无功功率', 'type': 'scatter', 'x': '=time', 'y': '=component_load_5_无功功率'}], 'xAxis': {'title': 'time'}, 'yAxis': {'title': '功率(kW)'}}, 'key': '/component_load_5_功率(kW)', 'type': 'plot', 'verb': 'append', 'version': 1}]
-    message =[782312650, 1, {'t': [], 'd5': [], 'd8': [], 'd9': [], 'v0': 'append', 'd6': [], 'v1': 'append'}, {'key': 'plot-1', 'version': 1, 'type': 'plot', 'verb': '=v0', 'data': {'title': '整流侧交流电流', 'layout': {'xaxis.range': '=xr0', 'xaxis.autorange': False}, 'traces': [{'name': 'Ia', 'type': 'scattergl', 'yaxis': 'y', 'x': '=t', 'y': '=d5'}, {'name': 'Ib', 'type': 'scattergl', 'yaxis': 'y', 'x': '=t', 'y': '=d8'}, {'name': 'Ic', 'type': 'scattergl', 'yaxis': 'y', 'x': '=t', 'y': '=d9'}]}}, {'key': 'plot-2', 'version': 1, 'type': 'plot', 'verb': '=v1', 'data': {'title': 'A相上桥臂电容电压', 'layout': {'xaxis.range': '=xr1', 'xaxis.autorange': False}, 'traces': [{'name': 'Vc', 'type': 'scattergl', 'yaxis': 'y', 'x': '=t', 'y': '=d6'}]}}]
+    # x= template(templates)
+    
+    # f2 =open("D:/code/python/test/result1-temp-value.json","r",encoding="utf-8")
+    # data =f2.read()
+    # f2.close()
+    # values=json.loads(data)
+    
+    # print("x: ",x)
+    
+    # data= values[2]
+    # try:
+    #     s=x({**message[2],**data})
+    #     print("s: ",s)
+    # except Exception as e:
+    #     traceback.print_exc()
+    #     print(f'Error: {e}')
+    
+
+    message =[
+        782312650,
+        1, 
+        {'t': [], 'd5': [], 'd8': [], 'd9': [], 'v0': 'append', 'd6': [], 'v1': 'append'},
+        {'key': 'plot-1', 'version': 1, 'type': 'plot', 'verb': '=v0', 'data': {'title': '整流侧交流电流', 'layout': {'xaxis.range': '=xr0', 'xaxis.autorange': False}, 'traces': [{'name': 'Ia', 'type': 'scattergl', 'yaxis': 'y', 'x': '=t', 'y': '=d5'}, {'name': 'Ib', 'type': 'scattergl', 'yaxis': 'y', 'x': '=t', 'y': '=d8'}, {'name': 'Ic', 'type': 'scattergl', 'yaxis': 'y', 'x': '=t', 'y': '=d9'}]}}, 
+        {'key': 'plot-2', 'version': 1, 'type': 'plot', 'verb': '=v1', 'data': {'title': 'A相上桥臂电容电压', 'layout': {'xaxis.range': '=xr1', 'xaxis.autorange': False}, 'traces': [{'name': 'Vc', 'type': 'scattergl', 'yaxis': 'y', 'x': '=t', 'y': '=d6'}]}}
+    ]
     id =message[0]
     
     templates=message[3:]
@@ -274,9 +327,9 @@ if __name__ == "__main__":
     
     values=[782312650, 1, {'t': [0.009999999999999967, 0.010999999999999961, 0.011999999999999955, 0.012999999999999949, 0.013999999999999943, 0.014999999999999937, 0.015999999999999945, 0.016999999999999973, 0.018000000000000002, 0.01900000000000003], 'd5': [0.07483153188510672, 0.09331340076657475, 0.10060354339781043, 0.08143820164529898, 0.06475492808815062, 0.03988870901471444, 0.017856545584211857, -0.00022077163899950848, -0.01795813197603053, -0.02080189617972792], 'd8': [-0.1375203178103291, -0.10701993395081587, -0.08370609309571676, -0.04136648742407317, -0.009632672956318231, 0.012930786595120338, 0.023576938091071184, 0.027067414097930786, 0.02056424854512571, 0.0032354404004249202], 'd9': [0.06256431502056557, 0.013651990940627457, -0.01694762608987588, -0.039966571588256096, -0.055297953120400006, -0.05275643941375492, -0.04137165007706727, -0.02687559851684142, -0.0025904403473839465, 0.017612961883902756], 'd6': [11.089656437630765, 11.090168556304207, 11.09058932753887, 11.090721058893884, 11.090593484855583, 11.090478358824114, 11.090135588005115, 11.089385203292103, 11.088182236357547, 11.086255229686746], 'xr0': [0, 2], 'xr1': [0, 2]}]
     
-    print(x)
+    # print(x)
     
     data= values[2]
-    s=x(data)
+    s=x({**message[2],**data})
     
     print(s)

{cloudpss-5.0.2 → cloudpss-5.0.3}/cloudpss/job/TemplateManager.py

@@ -33,5 +33,6 @@ class TemplateManager():
         t = self.templateMap.get(id,None)
         if t is None:
             return []
+        args= {**t['value'][2],**args}
         return t['template'](args)
     

{cloudpss-5.0.2 → cloudpss-5.0.3}/cloudpss/job/messageStreamReceiver.py

@@ -141,7 +141,7 @@ class MessageStreamReceiver(JobReceiver):
                 "content": "websocket closed",
             },
         }
-        self.messages.append(msg)
+        # self.messages.append(msg)
         self._status = 1
         self.ws = None
         if self.job is not None:

{cloudpss-5.0.2 → cloudpss-5.0.3}/cloudpss/job/result/__init__.py

@@ -25,6 +25,7 @@ RESULT = {
     'function/CloudPSS/ieslab-gmm':IESLabTypicalDayResult,
     'function/CloudPSS/ieslab-optimization': IESResult,
     'function/CloudPSS/ieslab-gmm-opt':IESLabTypicalDayResult,
+    'function/CloudPSS/tsinge': EMTResult,
 }
 
 

cloudpss-5.0.3/cloudpss/version.py

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

{cloudpss-5.0.2 → cloudpss-5.0.3}/cloudpss.egg-info/PKG-INFO

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

{cloudpss-5.0.2 → cloudpss-5.0.3}/cloudpss.egg-info/SOURCES.txt

@@ -95,6 +95,7 @@ cloudpss/utils/yamlLoader.py
 test/test-async.py
 test/test-async2.py
 test/test-async3.py
+test/test-eval.py
 test/test-plot.py
 test/test-plot1.py
 test/test-sdk.py
@@ -103,6 +104,7 @@ test/test-snapshot.py
 test/test-tmp.py
 test/test-topology.py
 test/test-topology1.py
+test/test-topology33.py
 test/test-yield.py
 test/test.py
 test/test11.py

cloudpss-5.0.3/test/test-eval.py

@@ -0,0 +1,9 @@
+if __name__ == "__main__":
+    
+    t={
+        "a":4,
+        "b":2
+    }
+    x="""lambda context: (context.get("a",None) + context.get("b",None)+a)"""
+   
+    print(eval(x,t)({"a":1,"b":2}))

cloudpss-5.0.3/test/test-topology.py

@@ -0,0 +1,27 @@
+import sys
+import os
+sys.path.append(os.path.join(os.path.dirname(__file__), '..\\'))
+import cloudpss
+import time
+import numpy as np
+import json
+
+if __name__ == '__main__':
+    os.environ['CLOUDPSS_API_URL'] = 'http://10.101.10.233/'
+    print('CLOUDPSS connected')
+    cloudpss.setToken(
+        'eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MSwidXNlcm5hbWUiOiJhZG1pbiIsInNjb3BlcyI6WyJtb2RlbDo5ODM2NyIsImZ1bmN0aW9uOjk4MzY3IiwiYXBwbGljYXRpb246MzI4MzEiXSwicm9sZXMiOlsiYWRtaW4iXSwidHlwZSI6ImFwcGx5IiwiZXhwIjoxODEyMTg5MTc3LCJub3RlIjoidGVzdCIsImlhdCI6MTc4MTA4NTE3N30.DqEEQSztiCALqumIbDVodK-tzWz_x5WpGtevkLyKi3qrKXpZGgclCyjrFLNT9YlJWYD12N-C7qe5x_tTeJZ_3w')
+    print('Token done')
+    # project = cloudpss.Model.fetch('model/open-cloudpss/CSEE_PFO_Temporary-v1b1')
+    
+    # topology = project.fetchTopology(config={'args':{}},maximumDepth=50)
+
+
+    
+
+    topology = cloudpss.ModelTopology.fetch('tlHIN5yZlnBM7VS11ssM8ReNAB2rNpSa-p4P-XKQYwFjOX9ZVWaqKArPj8vQV6Ay','emtp',config={'args':{}})
+    
+    print(topology)
+    
+    topology.dump(topology, 'topology.json', indent=4)
+    

cloudpss-5.0.3/test/test-topology33.py

@@ -0,0 +1,27 @@
+import sys
+import os
+sys.path.append(os.path.join(os.path.dirname(__file__), '..\\'))
+import cloudpss
+import time
+import numpy as np
+import json
+
+if __name__ == '__main__':
+    os.environ['CLOUDPSS_API_URL'] = 'http://10.101.10.33/'
+    print('CLOUDPSS connected')
+    cloudpss.setToken(
+        'eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MSwidXNlcm5hbWUiOiJhZG1pbiIsInNjb3BlcyI6WyJtb2RlbDo5ODM2NyIsImZ1bmN0aW9uOjk4MzY3IiwiYXBwbGljYXRpb246MzI4MzEiXSwicm9sZXMiOlsiYWRtaW4iXSwidHlwZSI6ImFwcGx5IiwiZXhwIjoxODEyMTk0MDg0LCJub3RlIjoieHgiLCJpYXQiOjE3ODEwOTAwODR9.SsS8E92Ya9xro-zrVw7b6Gf-o-xLpg3Wja2eCqCq6qK_Fajl-MqCTzHsNUIKZ2El4UweZovv8ZT6DqBwBkDOvw')
+    print('Token done')
+    # project = cloudpss.Model.fetch('model/open-cloudpss/CSEE_PFO_Temporary-v1b1')
+    
+    # topology = project.fetchTopology(config={'args':{}},maximumDepth=50)
+
+
+    
+
+    topology = cloudpss.ModelTopology.fetch('UOOLix43SwMTDdVSaYUDsBkvP_fbajRetIJcATOtJ9mFtMkRxZRPinS1JOvBb3Zg','emtp',config={'args':{}})
+    
+    print(topology)
+    
+    topology.dump(topology, 'topology2.json', indent=4)
+    

cloudpss-5.0.2/cloudpss/version.py

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

cloudpss-5.0.2/test/test-topology.py

@@ -1,25 +0,0 @@
-import sys
-import os
-sys.path.append(os.path.join(os.path.dirname(__file__), '..\\'))
-import cloudpss
-import time
-import numpy as np
-import json
-
-if __name__ == '__main__':
-    os.environ['CLOUDPSS_API_URL'] = 'http://10.101.10.42/'
-    print('CLOUDPSS connected')
-    cloudpss.setToken(
-        'eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MSwidXNlcm5hbWUiOiJhZG1pbiIsInNjb3BlcyI6WyJicm93c2VyIl0sInR5cGUiOiJicm93c2VyIiwiZXhwIjoxNzc2NDIzODExLCJpYXQiOjE3NzM3NDU0MTF9.U7rBhaNes1JF6CvyaE4eMDs6dwTxTYqa_kZAaTW70gikWUal7pQBpwx7S53y7nhmjxM8ISxwMsc-QWW_wJId_g')
-    print('Token done')
-    project = cloudpss.Model.fetch('model/admin/adfw123')
-    
-    topology = project.fetchTopology(config={'args':{}},maximumDepth=10)
-
-
-
-
-    topology.dump(topology,'test.json')
-    
-    
-