cloudpss 4.5.18__tar.gz → 4.6.0a1__tar.gz

{cloudpss-4.5.18 → cloudpss-4.6.0a1}/PKG-INFO

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

{cloudpss-4.5.18 → cloudpss-4.6.0a1}/cloudpss/ieslab/DataManageModel.py

@@ -83,7 +83,7 @@ class DataManageModel(object):
             
             :return: 无
         '''
-        list = ['thermalLoads', 'heatingLoad', 'coolingLoad', 'electricLoads', 'fuels', 'typhoon', 'rainfall', 'earthquake', 'extremeCold', 'HydrogenLoad', 'ammoniaLoad']
+        list = ['thermalLoads', 'heatingLoad', 'coolingLoad', 'electricLoads', 'fuels', 'typhoon', 'rainfall', 'earthquake', 'extremeCold', 'HydrogenLoad', 'ammoniaLoad', 'MethaneLoad']
         for kind,value in self._kindUrlMap.items():
             try:
                 if kind in list:
@@ -496,6 +496,11 @@ class IESOptDataManageModel(DataManageModel):
         "制氮设备": "NitrogenProduction",
         "氨负荷": "ammoniaLoad",
         "氨": "Ammonia",
+        "制甲烷设备": "MethaneProduction",
+        "碳捕集设备": "CarbonCapture",
+        "储碳装置": "CarbonStorage",
+        "甲烷负荷": "MethaneLoad",
+        "甲烷": "Methane",
     }
     _kindUrlMap = {
         "PhotovoltaicSys": "api/ieslab-opt/rest/dpcs/",
@@ -547,5 +552,10 @@ class IESOptDataManageModel(DataManageModel):
         "NitrogenProduction": "api/ieslab-opt/rest/asec/",
         "ammoniaLoad": "api/ieslab-opt/rest/ammoniaLoad/",
         "Ammonia": "api/ieslab-opt/rest/ammonia/",
+        "MethaneProduction": "api/ieslab-opt/rest/mcp/",
+        "CarbonCapture": "api/ieslab-opt/rest/cc/",
+        "CarbonStorage": "api/ieslab-opt/rest/escs/",
+        "MethaneLoad": "api/ieslab-opt/rest/methaneLoad/",
+        "Methane": "api/ieslab-opt/rest/methane/",
     }
     pass

{cloudpss-4.5.18 → cloudpss-4.6.0a1}/cloudpss/ieslab/PlanModel.py

@@ -171,7 +171,7 @@ class IESLabOptModel(object):
         '''
             获取当前算例的优化目标设置信息
 
-            :return: Dict 类型，例如：{'OptGoal': <OptimizationMode.经济性: 0>, 'StoSen': "10", '@debug': '', 'clustering_algorithm': '0', 'num_method': '0', 'PowUnPrice': '1000', 'HeatAbandonPrice': '1000'}
+            :return: Dict 类型，例如：{'OptGoal': <OptimizationMode.经济性: 0>, 'StoSen': "10", '@debug': '', 'clustering_algorithm': '0', 'num_method': '0', AbandonRen: '0', 'PowUnPrice': '1000', 'HeatAbandonPrice': '1000'}
         '''
         try:
             url = f'{self._baseUri}/simuOpt/'
@@ -184,6 +184,7 @@ class IESLabOptModel(object):
                     "@debug": "",
                     "clustering_algorithm": "0",
                     "num_method": "0",
+                    "AbandonRen": "0",
                     "PowUnPrice": "1000",
                     "HeatAbandonPrice": "1000"
                 }
@@ -195,6 +196,7 @@ class IESLabOptModel(object):
                     "@debug": value["@debug"],
                     "clustering_algorithm": value["clustering_algorithm"],
                     "num_method": value["num_method"],
+                    "AbandonRen": value["AbandonRen"],
                     "PowUnPrice": value["PowUnPrice"],
                     "HeatAbandonPrice": value["HeatAbandonPrice"]
                 }
@@ -205,7 +207,7 @@ class IESLabOptModel(object):
         '''
             设置当前算例的优化目标
 
-            :param data: dict 类型，例如：{'OptGoal': <OptimizationMode.经济性: 0>, 'StoSen': "10", '@debug': '', 'clustering_algorithm': '0', 'num_method': '0', 'PowUnPrice': '1000', 'HeatAbandonPrice': '1000'}
+            :param data: dict 类型，例如：{'OptGoal': <OptimizationMode.经济性: 0>, 'StoSen': "10", '@debug': '', 'clustering_algorithm': '0', 'num_method': '0','AbandonRen': '0', 'PowUnPrice': '1000', 'HeatAbandonPrice': '1000'}
 
             :return: boolean 类型，为 True 则设置成功
         '''
@@ -219,6 +221,7 @@ class IESLabOptModel(object):
                 "@debug": data.get('@debug', ''),
                 "clustering_algorithm": data.get('clustering_algorithm', ''),
                 "num_method": data.get('num_method', ''),
+                "AbandonRen": data.get('AbandonRen', ''),
                 "PowUnPrice": data.get('PowUnPrice', ''),
                 "HeatAbandonPrice": data.get('HeatAbandonPrice', '')
             }
@@ -267,6 +270,7 @@ class IESLabOptModel(object):
                 "@debug": self.optimizationInfo.get('@debug', ''),
                 "clustering_algorithm": self.optimizationInfo.get('clustering_algorithm', '0'),
                 "num_method": self.optimizationInfo.get('num_method', '0'),
+                "AbandonRen": self.optimizationInfo.get('AbandonRen', '0'),
                 "PowUnPrice": self.optimizationInfo.get('PowUnPrice', '1000'),
                 "HeatAbandonPrice": self.optimizationInfo.get('HeatAbandonPrice', '1000'),
             }

{cloudpss-4.5.18 → cloudpss-4.6.0a1}/cloudpss/job/job.py

@@ -4,7 +4,6 @@ import re
 import time
 
 from cloudpss.job.result.result import Result
-from cloudpss.utils.parseDebugArgs import parse_debug_args
 from .result import getResultClass
 
 from cloudpss.utils.IO import IO
@@ -66,7 +65,6 @@ class Job(Generic[T]):
         input,
         output,
         position,
-        **kwargs
     ):
         super(Job, self).__init__()
         self.id = id
@@ -86,10 +84,9 @@ class Job(Generic[T]):
         self.__receiver = None
         self.__sender = None
         self._result = None
-        self.baseUrl = kwargs.get("baseUrl", None)
 
     @staticmethod
-    def fetch(id, **kwargs):
+    def fetch(id):
         """
         获取job信息
         """
@@ -97,10 +94,11 @@ class Job(Generic[T]):
             raise Exception("id is None")
        
         variables = {"_a": {"id": id}}
-        r =  graphql_request(Job.__jobQuery, variables,**kwargs)
+
+        r =  graphql_request(Job.__jobQuery, variables)
         if "errors" in r:
             raise Exception(r["errors"])
-        return Job(**r["data"]["job"],**kwargs)
+        return Job(**r["data"]["job"])
         
     
     # @staticmethod
@@ -135,12 +133,9 @@ class Job(Generic[T]):
         debug = job["args"].get("@debug", None )
         debugargs={}
         if debug is not None:
-            parsed = parse_debug_args(debug)
-            if parsed is not None:
-                debugargs = parsed
-            # t= [ i.split('=') for i in re.split(r'\s+',debug) if i.find('=')>0]
-            # for i in t:
-            #     debugargs[i[0]]=i[1]
+            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,
             f"model/@sdk/{str(int(time.time() * random.random()))}",
@@ -167,7 +162,7 @@ class Job(Generic[T]):
         }
         return variables
     @staticmethod
-    def create(revisionHash, job, config, name=None, rid=None, policy=None,  **kwargs):
+    def create(revisionHash, job, config, name=None, rid=None, policy=None, **kwargs):
         """
         创建一个运行任务
 
@@ -182,11 +177,11 @@ class Job(Generic[T]):
         >>> runner = Runner.runRevision(revision,job,config,'')
         """
         variables=Job.__createJobVariables(job, config, revisionHash, rid=rid, policy=policy, **kwargs)
-        r =  graphql_request(Job.__createJobQuery, variables,**kwargs)
+        r =  graphql_request(Job.__createJobQuery, variables)
         if "errors" in r:
             raise Exception(r["errors"])
         id = r["data"]["job"]["id"]
-        return  Job.fetch(id,**kwargs)
+        return  Job.fetch(id)
         
     
 
@@ -207,7 +202,7 @@ class Job(Generic[T]):
         if receiver is not None:
             self.__receiver = receiver
         if self.__receiver is None:
-            self.__receiver = MessageStreamReceiver(self.output,baseUrl=self.baseUrl)
+            self.__receiver = MessageStreamReceiver(self.output)
             self.__receiver.connect(**kwargs)
         return self.__receiver
 
@@ -221,7 +216,7 @@ class Job(Generic[T]):
         if sender is not None:
             self.__sender = sender
         if self.__sender is None:
-            self.__sender = MessageStreamSender(self.input,baseUrl=self.baseUrl)
+            self.__sender = MessageStreamSender(self.input)
         self.__sender.connect_legacy(**kwargs)
         return self.__sender
     
@@ -270,7 +265,7 @@ class Job(Generic[T]):
 
     
 
-    def abort(self,timeout=3,**kwargs):
+    def abort(self,timeout=3):
         """
         中断当前运行实例
         """
@@ -283,8 +278,8 @@ class Job(Generic[T]):
         '''
         variables = {
             'input': {
-                'id': self.id,
+                'id': self.taskId,
                 'timeout': timeout
             }
         }
-        graphql_request(query, variables,**kwargs)
+        graphql_request(query, variables)

{cloudpss-4.5.18 → cloudpss-4.6.0a1}/cloudpss/job/messageStreamReceiver.py

@@ -24,12 +24,10 @@ class Message(object):
     
     
 class MessageStreamReceiver(JobReceiver):
-    def __init__(self, output,**kwargs):
+    def __init__(self, output):
         super().__init__()
         self.id = output
-        self.origin = kwargs.get("baseUrl",None)
-        if self.origin is None:
-            self.origin =os.environ.get("CLOUDPSS_API_URL", "https://cloudpss.net/")
+        self.origin = os.environ.get("CLOUDPSS_API_URL", "https://cloudpss.net/")
         self.__hasOpen = False
         self.templates=TemplateManager()
         self.timeOffset=0
@@ -66,28 +64,26 @@ class MessageStreamReceiver(JobReceiver):
             message = args[1]
         return self.__on_message(message)
     def __on_message(self, message):
-        try:
-            data = IO.deserialize(message, "ubjson")
-            self.updateTime(data["timestamp"])
-            self.ws.url = self.__path(data["id"])
-            msg = IO.deserialize(data["data"], "ubjson")
-            if type(msg) is list:
-                if len(msg) == 3:
-                    pass
-                    
-                    templateMessage = self.templates.invoke(msg)
-                    for m in templateMessage:
-                        self.messages.append(m)
-                    return
-                else:
-                    self.templates.create(msg)
-                    return
-            
-            self.messages.append(msg)
-            return msg
-        except Exception as e:
-            self.ws.close()
-            return None
+        
+        data = IO.deserialize(message, "ubjson")
+        self.updateTime(data["timestamp"])
+        self.ws.url = self.__path(data["id"])
+        msg = IO.deserialize(data["data"], "ubjson")
+        if type(msg) is list:
+            if len(msg) == 3:
+                pass
+                
+                templateMessage = self.templates.invoke(msg)
+                # print(templateMessage)
+                for m in templateMessage:
+                    self.messages.append(m)
+                return
+            else:
+                self.templates.create(msg)
+                return
+        
+        self.messages.append(msg)
+        return msg
 
 
     def __on_error(self,  *args, **kwargs):

{cloudpss-4.5.18 → cloudpss-4.6.0a1}/cloudpss/job/messageStreamSender.py

@@ -12,12 +12,10 @@ import logging
 
 
 class MessageStreamSender:
-    def __init__(self, input,**kwargs):
+    def __init__(self, input):
         super().__init__()
         self.input = input
-        self.origin = kwargs.get("baseUrl",None)
-        if self.origin is None:
-            self.origin =os.environ.get("CLOUDPSS_API_URL", "https://cloudpss.net/")
+        self.origin = os.environ.get("CLOUDPSS_API_URL", "https://cloudpss.net/")
         self.__hasOpen = False
 
     def __on_message(self, ws, message):

{cloudpss-4.5.18 → cloudpss-4.6.0a1}/cloudpss/job/result/EMTResult.py

@@ -38,11 +38,6 @@ class EMTResult(Result):
         该类只提供 EMT 仿真使用
 
     """
-    
-    def __init__(self, receiver, sender = None):
-        super().__init__(receiver, sender)
-        self.virtualInput=VirtualInput()
-    
     __messageIndex = 0
     def getPlots(self):
         '''
@@ -145,21 +140,15 @@ class EMTResult(Result):
         else:
             raise Exception('transmitter is None')
         
-    def send(self,message=None):
+    def send(self,message):
         """
             发送消息
         """
         if self._sender is not None:
-            val ={
-                "type": 'virtual_input',
-                "data": message,
-            } 
+            val =message
             if type(message) is VirtualInput:
                 val = message.toJson()
             
-            if message is  None:
-                val = self.virtualInput.toJson()
-            
             self._sender.write(val)
         else:
             raise Exception('transmitter is None')

{cloudpss-4.5.18 → cloudpss-4.6.0a1}/cloudpss/model/implements/diagram.py

@@ -73,7 +73,7 @@ class DiagramImplement(object):
 
         >>>> diagram.addComponent(args)
         """
-        id = "comp_" + str(uuid.uuid4()).replace("-", "_")
+        id = "comp_" + str(uuid.uuid4())
         shape = "diagram-component"
         definition = definition
         label = label or definition
@@ -126,10 +126,8 @@ class DiagramImplement(object):
         component = self.cells.get(key)
         if not component:
             return False
+        position = component.position.copy()
         del self.cells[key]
-        position=getattr(component, "position", None)
-        if position is None:
-            return True
         for edge in self.cells.values():
             if edge.shape == "diagram-edge":
                 if edge.source.get("cell") == key:

{cloudpss-4.5.18 → cloudpss-4.6.0a1}/cloudpss/model/model.py

@@ -298,7 +298,7 @@ class Model(object):
         return config
 
     @staticmethod
-    def fetchMany(name=None, cursor=[], pageSize=10,owner=None,**kwargs):
+    def fetchMany(name=None, cursor=[], pageSize=10,owner=None):
         """
         获取用户可以运行的项目列表
 
@@ -332,13 +332,13 @@ class Model(object):
         if name is not None:
             variables["_search"] = name
 
-        data = graphql_request(Model.__models_query, {"input": variables},**kwargs)
+        data = graphql_request(Model.__models_query, {"input": variables})
         if "errors" in data:
             raise Exception(data["errors"][0]["message"])
         return data["data"]["models"]['items']
 
     @staticmethod
-    def fetch(rid,**kwargs):
+    def fetch(rid):
         """
         获取项目
 
@@ -349,7 +349,7 @@ class Model(object):
         >>> model=Model.fetch('model/Demo/test')
 
         """
-        data = graphql_request(Model.__model_query, {"rid": rid},**kwargs)
+        data = graphql_request(Model.__model_query, {"rid": rid})
         if "errors" in data:
             raise Exception(data["errors"][0]["message"])
         return Model(data["data"]["model"])
@@ -464,7 +464,7 @@ class Model(object):
 
 
     @staticmethod
-    def create(model,**kwargs):
+    def create(model):
         """
         新建项目
 
@@ -506,13 +506,12 @@ class Model(object):
                     },
                 }
             },
-            **kwargs
         )
 
     
 
     @staticmethod
-    def update(model,**kwargs):
+    def update(model):
         """
         更新项目
 
@@ -556,7 +555,7 @@ class Model(object):
                     'tags': tags,
                     "permissions": permissions,
                 }
-            },**kwargs)
+            })
         if "errors" in r:
             raise Exception(r["errors"][0]["message"])
         return r

{cloudpss-4.5.18 → cloudpss-4.6.0a1}/cloudpss/model/revision.py

@@ -75,8 +75,7 @@ class ModelRevision(object):
 
             >>> revision.run(revision,job,config,'')
         """
-        
-        revision= ModelRevision.create(self,**kwargs)
+        revision= ModelRevision.create(self)
         if stop_on_entry is not None:
             job['args']['stop_on_entry'] = stop_on_entry
         return Job.create(
@@ -85,7 +84,7 @@ class ModelRevision(object):
     
 
     @staticmethod
-    def create(revision, parentHash=None, **kwargs):
+    def create(revision, parentHash=None):
         """
             创建一个新版本
 
@@ -96,11 +95,12 @@ class ModelRevision(object):
             >>> ModelRevision.create(model.revision)
             {hash:'4043acbddb9ce0c6174be65573c0380415bc48186c74a459f88865313743230c'}
         """
+
         r = revision.toJSON()
         if 'hash' in r:
             del r['hash']
         variables = {'a': {**r, 'parent': parentHash}}
-        r = graphql_request(ModelRevision.__createModelRevisionQuery, variables,**kwargs)
+        r = graphql_request(ModelRevision.__createModelRevisionQuery, variables)
         if 'errors' in r:
             raise Exception(r['errors'])
         

{cloudpss-4.5.18 → cloudpss-4.6.0a1}/cloudpss/runner/runner.py

@@ -7,7 +7,6 @@ import random
 from deprecated import deprecated
 
 from cloudpss.utils.graphqlUtil import graphql_request
-from cloudpss.utils.parseDebugArgs import parse_debug_args
 from .receiver import Receiver
 from .MessageStreamReceiver import MessageStreamReceiver
 from .result import IESLabSimulationResult, PowerFlowResult, EMTResult, Result, IESResult
@@ -165,12 +164,9 @@ class Runner(Generic[T]):
         debug = job["args"].get("@debug", None )
         debugargs={}
         if debug is not None:
-            parsed = parse_debug_args(debug)
-            if parsed is not None:
-                debugargs = parsed
-            # t= [ i.split('=') for i in re.split(r'\s+',debug) if i.find('=')>0]
-            # for i in t:
-            #     debugargs[i[0]]=i[1]
+            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,

cloudpss-4.6.0a1/cloudpss/utils/graphqlUtil.py

@@ -0,0 +1,11 @@
+# coding=UTF-8
+import json
+from cloudpss.utils import request
+
+
+def graphql_request(query, variables=None, **kwargs):
+    payload = {'query': query, 'variables': variables}
+    
+    r = request('POST', 'graphql', data=json.dumps(payload), **kwargs)
+
+    return json.loads(r.text)

{cloudpss-4.5.18 → cloudpss-4.6.0a1}/cloudpss/utils/httprequests.py

@@ -12,8 +12,7 @@ def request(method, uri, baseUrl=None, params={}, token=None, **kwargs):
     if baseUrl == None:
         baseUrl = os.environ.get('CLOUDPSS_API_URL', 'https://cloudpss.net/')
     url = requests.compat.urljoin(baseUrl,uri)
-    if token is None:
-        token = os.environ.get('CLOUDPSS_TOKEN', None)
+    token = os.environ.get('CLOUDPSS_TOKEN', None)
     
     if token:
         headers = {

cloudpss-4.6.0a1/cloudpss/version.py

@@ -0,0 +1 @@
+__version__ = '4.6.0.alpha.1'

{cloudpss-4.5.18 → cloudpss-4.6.0a1}/cloudpss.egg-info/PKG-INFO

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

{cloudpss-4.5.18 → cloudpss-4.6.0a1}/cloudpss.egg-info/SOURCES.txt

@@ -80,7 +80,6 @@ cloudpss/utils/dataEncoder.py
 cloudpss/utils/graphqlUtil.py
 cloudpss/utils/httprequests.py
 cloudpss/utils/matlab.py
-cloudpss/utils/parseDebugArgs.py
 cloudpss/utils/yamlLoader.py
 test/test-async.py
 test/test-async2.py

cloudpss-4.5.18/cloudpss/utils/graphqlUtil.py

@@ -1,11 +0,0 @@
-# coding=UTF-8
-import json
-from cloudpss.utils import request
-
-
-def graphql_request(query, variables=None, baseUrl=None,token=None,**kwargs):
-    payload = {'query': query, 'variables': variables}
-    
-    r = request('POST', 'graphql', data=json.dumps(payload),baseUrl=baseUrl,token=token, **kwargs)
-
-    return json.loads(r.text)

cloudpss-4.5.18/cloudpss/utils/parseDebugArgs.py

@@ -1,93 +0,0 @@
-def parse_debug_args(debug=None):
-    if not debug or not isinstance(debug, str):
-        return None
-
-    tokens = []
-
-    # 1. 先按照非转义的空格拆分字符串，获取每个 token
-    current_token = ''
-    escaping = False  # 表示当前是否在处理转义字符
-
-    for char in debug:
-        if escaping:
-            # 如果上一个字符是 '\'，则把当前字符直接添加到 token，并保留 '\' 以供二阶段使用
-            current_token += '\\' + char
-            escaping = False
-        elif char == '\\':
-            # 开始转义
-            escaping = True
-        elif char.isspace():
-            # 如果遇到空格 (并且不在转义状态)，说明一个 token 结束
-            if current_token:
-                tokens.append(current_token)
-                current_token = ''
-        else:
-            # 普通字符，直接添加
-            current_token += char
-
-    # 最后一个 token 加入数组（如果有的话）
-    if current_token:
-        tokens.append(current_token)
-
-    if not tokens:
-        return None
-
-    # 2. 对每个 token，找第一个非转义的 '=' 分割 key/value
-    entries = []
-
-    for token in tokens:
-        key = ''
-        value = ''
-        has_equal = False
-        escaping = False
-
-        # 我们只需要区分第一处真正的 '='
-        for char in token:
-            if escaping:
-                # 处理转义字符
-                if char == 'b':
-                    escaped_char = '\b'
-                elif char == 'f':
-                    escaped_char = '\f'
-                elif char == 'n':
-                    escaped_char = '\n'
-                elif char == 'r':
-                    escaped_char = '\r'
-                elif char == 't':
-                    escaped_char = '\t'
-                elif char == 'v':
-                    escaped_char = '\v'
-                else:
-                    escaped_char = char
-                
-                # 直接添加当前字符
-                if not has_equal:
-                    key += escaped_char
-                else:
-                    if escaped_char in ['\\', '$']:
-                        # 保留转义字符
-                        value += '\\' + escaped_char
-                    else:
-                        value += escaped_char
-                escaping = False
-            elif char == '\\':
-                escaping = True
-            elif char == '=' and not has_equal:
-                # 遇到第一个非转义的 '=' 时，视为 key/value 分隔
-                has_equal = True
-            else:
-                # 普通字符
-                if not has_equal:
-                    key += char
-                else:
-                    value += char
-
-        # 添加 key 和 value 到 entries 列表
-        entries.append((key, value))
-
-    return dict(entries)
-
-# 示例用法
-# debug_str = r"TASK_CMD=cloudpssrun:mkl DOCKER_MOUNT=/dev/disk/by-id:/dev/disk/by-id:ro\n/home/cloudpss/NR_ADPSS_HVDC37.key:/usr/include/NR_ADPSS_HVDC37.key:ro\n"
-# result = parse_debug_args(debug_str)
-# print(result)

cloudpss-4.5.18/cloudpss/version.py

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