cloudpss 4.5.2__py3-none-any.whl → 4.5.3__py3-none-any.whl

cloudpss/dslab/dataManageModel.py

@@ -1,6 +1,7 @@
 from ..utils import request, fileLoad, graphql_request
 import json
 import time, datetime
+import urllib.parse
 import copy
 import os 
 from cloudpss.dslab.files import getCurveData
@@ -268,6 +269,24 @@ class DataManageModel(object):
         if data.get('extra', None) is None:
             return None
         return data.get('extra', None).get('data', None)
+    
+    def UpdateItemExtra(self, kind, data):
+        '''
+            更新kind类型对应数据项的基准出力曲线、负荷曲线、策略曲线数据
+            :params: kind str类型，数据的种类标识，包含：光伏、光伏曲线、风机、风机曲线、燃气、燃气曲线、水电、水电曲线、火电、火电曲线、生物质发电、生物质发电曲线、垃圾电厂、垃圾电厂曲线、传输线、变压器、开关、负荷分类、负荷用户、储能设备、储能运行策略、上网电价、输配电价、常数电价、阶梯电价、分时电价、分时阶梯电价
+            :params: data dict类型，表示添加的数据内容，其数据结构应满足对应数据项的结构要求，形如：{'data': {}, 'extra': [], 'id': ""}
+    
+            :return: list<dict>类型，返回该种类下所有数据项的列表
+        '''
+        url = f"{self._baseUri}rest/{kind}"
+        r = {
+            'id': data.get('id', ''),
+            'data': data.get('data', {}),
+            'extra': data.get('extra', []),
+        }
+
+        self._updateItemData(url, r)
+        return self._fetchItemData(url)
 
 class DSLabDataManageModel(DataManageModel):
     _baseUri = 'api/dslab/'

cloudpss/dslab/dslab.py

@@ -146,6 +146,29 @@ class DSLab(object):
             raise Exception("不是储能规划方案内核运行生成算法的计算方案")
         return self.run(job=job, name=name)
 
+    def runIESShortCurrent(self,job=None,name=None, **kwargs)->Runner[IESResult]:
+        '''
+            运行 短路电流计算 内核，如果当前 model 没有创建  Job 时报错，默认使用第一个计算方案，进行仿真。
+            
+            :param: job 计算方案名称，可选，字符串类型或者字典类型,默认使用第一个计算方案，如果同名使用最靠前一个
+            :params name:  任务名称，为空时使用项目的参数方案名称和计算方案名称
+
+            :return: runner Runner[IESResult]
+        '''
+        rid = 'function/CloudPSS/short-circuit-current-calculation'
+        if job is None:
+            currentJob = self.model.context['currentJob']
+            job = self.model.jobs[currentJob]
+            if job['rid'] != rid:
+                for j in self.model.jobs:
+                    if j['rid'] == rid:
+                        job = j
+        if job is None:
+            raise Exception("找不到短路电流计算方案内核运行的计算方案")
+        if job['rid'] != rid:
+            raise Exception("不是短路电流计算方案内核运行生成算法的计算方案")
+        return self.run(job=job, name=name)
+    
     @staticmethod
     def createProjectGroup(name, description=None, createById=None):
         '''

cloudpss/job/TemplateManager.py

@@ -1,3 +1,4 @@
+import logging
 from cloudpss.job.TemplateCompiler import template
 class TemplateManager():
     

cloudpss/model/implements/diagram.py

@@ -1,3 +1,4 @@
+import re
 from .component import Component
 from typing import Optional
 import uuid
@@ -140,7 +141,7 @@ class DiagramImplement(object):
                     position["y"] += 5
         return True
 
-    def updateComponent(self, key: str, args: dict) -> bool:
+    def updateComponent(self, key: str, **kwargs: dict) -> bool:
         """
         更新元件
 
@@ -150,10 +151,36 @@ class DiagramImplement(object):
 
         >>>> diagram.updateComponent(key)
         """
-        component = self.cells.get(key)
-        if not component:
+        component = self.cells.get(key,None)
+        if component is None:
             return False
-        for k, v in self.cells.items():
-            if k == key:
-                v.__dict__.update(args)
-                return True
+        for k, v in kwargs.items():
+            if component.__dict__.get(k,None) is None:
+                raise Exception(f"Component has no attribute {k}")
+            if k == 'args' and not isinstance(v, dict):
+                raise Exception(f"Component args must be dict")
+            if k == 'pins' and not isinstance(v, dict):
+                raise Exception(f"Component pins must be dict")
+            if k == 'position' and not isinstance(v, dict):
+                raise Exception(f"Component position must be dict")
+            if k == 'size' and not isinstance(v, dict):
+                raise Exception(f"Component size must be dict")
+            if k == 'style' and not isinstance(v, dict):
+                raise Exception(f"Component style must be dict")
+            if k == 'props' and not isinstance(v, dict):
+                raise Exception(f"Component props must be dict")
+            if k == 'context' and not isinstance(v, dict):
+                raise Exception(f"Component context must be dict")
+            
+            if k == 'definition' and not re.match(r'^model/([!()\-.0-9@A-Z\[\]_a-z{}~]{1,240})/([!()\-.0-9@A-Z\[\]_a-z{}~]{1,240})$', v):
+                raise Exception(f"Component definition must be in the format of 'model/owner/key'")
+            
+            if k == 'zIndex' and v < 0:
+                raise Exception(f"Component zIndex must be greater than 0")
+            
+            if isinstance(v, dict):
+                component.__dict__[k].update(v)
+                continue
+            
+            component.__dict__[k] = v
+            

cloudpss/model/model.py

@@ -137,7 +137,7 @@ class Model(object):
             raise ValueError("不存在拓扑实现")
         return diagramImplement.removeComponent(key)
     
-    def updateComponent(self, key, args):
+    def updateComponent(self, key, **kwargs):
         """
         更新元件实现
 
@@ -148,7 +148,7 @@ class Model(object):
         diagramImplement = self.revision.getImplements().getDiagram()
         if diagramImplement is None:
             raise ValueError("不存在拓扑实现")
-        return diagramImplement.updateComponent(key, args)
+        return diagramImplement.updateComponent(key, **kwargs)
 
 
     def getComponentsByRid(self, rid: str):
@@ -397,6 +397,7 @@ class Model(object):
         data = IO.load(filePath, format)
         return data
 
+
     @staticmethod
     def dump(model, file, format="yaml", compress="gzip"):
         """

cloudpss/utils/IO.py

@@ -2,6 +2,7 @@ import io
 import json
 import ubjson
 import yaml
+from yaml.dumper import SafeDumper
 import gzip
 import base64
 import struct
@@ -85,6 +86,7 @@ class IO(object):
             result = ubjson.dumpb(obj)
         if format == 'yaml':
             result = yaml.dump(obj).encode(encoding="utf-8")
+
         if result is None:
             assert False, 'format not support'
         if compress == 'gzip':
@@ -104,7 +106,7 @@ class IO(object):
         if format == 'ubjson':
             return ubjson.loadb(byt)
         if format == 'yaml':
-            return yaml.load(io.BytesIO(byt), Loader=yaml.BaseLoader)
+            return yaml.load(io.BytesIO(byt), Loader=yaml.FullLoader)
         assert False, 'format not support'
 
     @staticmethod

cloudpss/version.py

@@ -1 +1 @@
-__version__ = '4.5.2'
+__version__ = '4.5.3'

{cloudpss-4.5.2.dist-info → cloudpss-4.5.3.dist-info}/METADATA

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

{cloudpss-4.5.2.dist-info → cloudpss-4.5.3.dist-info}/RECORD

@@ -1,6 +1,6 @@
 cloudpss/__init__.py,sha256=1RNmUBhoxYUutZiTS-XJ9yBoNGGh8Mpt1uY6ETlSBDc,825
 cloudpss/verify.py,sha256=KF4Gd59DGvCyIEkRD7rNnekWw22XxJpi3DW6keb6j4c,1498
-cloudpss/version.py,sha256=uuxZmCPYe74VYVKPFVVPfcxz9tTAAZCaW7FA4Q5oETk,22
+cloudpss/version.py,sha256=Qwf2PqCgwNBpHE5DrBEwfOiFsFvEpa01UTldrgQkx9Q,22
 cloudpss/asyncio/__init__.py,sha256=CJGopQl_vz3z3fJsK7NjMX5uzkzfrJrbqKVhyYqlYWc,198
 cloudpss/asyncio/job/__init__.py,sha256=3UIFZYjJTzuckM61o8kim1c3PWt2SSHTL72jrGu5IzI,51
 cloudpss/asyncio/job/job.py,sha256=Bn2BEERw1J8YarFauTzVrGJK7nmaoMsdlrFUqiHRth4,3897
@@ -14,8 +14,8 @@ cloudpss/asyncio/utils/AsyncIterable.py,sha256=AIWYrTnmjsIfOowE3asZlexdHNhpK2gm7
 cloudpss/asyncio/utils/__init__.py,sha256=F-rCvgRAGcV-fFO7o-dsXwooyhcVpElWoBEQM67kO7c,84
 cloudpss/asyncio/utils/httpAsyncRequest.py,sha256=KIck-3uQwGcHMIJ6632_Zo0syc4GnNG2EoUXmQh54ck,2692
 cloudpss/dslab/__init__.py,sha256=UdLDA9OArvLndHtumYAMMHdr5h8S6DrZCYkXIi2Mb4Y,45
-cloudpss/dslab/dataManageModel.py,sha256=7sTRpAGnuSNtFsUb-VEDp5XzOlAZvidypkniHX32wLY,11527
-cloudpss/dslab/dslab.py,sha256=u5xwlsuQiVIEAAuHW6kQ5MFiRjR7Iaxoxd724lHW-gk,8696
+cloudpss/dslab/dataManageModel.py,sha256=NeG2YbIappMxAOCZGfFUcOBwo2Kyhh27kHMFK37re60,12711
+cloudpss/dslab/dslab.py,sha256=K__KohK6w6Alj3WCmLJQ2pr_RPFvvtnce2C6tdLhTIE,9914
 cloudpss/dslab/financialAnalysisModel.py,sha256=t9cZ03yWvLN5ojVeLp-UGgFBIFVU5wbnn5E0UHZA0ws,5062
 cloudpss/dslab/files/__init__.py,sha256=l2g0VadtTiMW39zwCwHPHUC01Kbklb_nFUPVeQ16FwM,58
 cloudpss/dslab/files/curveData.py,sha256=GU_DTTKjVn_ln9Hx0q9CFgfmNtokZi7b4DYSzGeP5dk,4291778
@@ -32,7 +32,7 @@ cloudpss/ieslab/IESLabSimulation.py,sha256=-EJFkhklN9ao-nbfk7Lz6JCHboFCSDcn5R2jr
 cloudpss/ieslab/PlanModel.py,sha256=WHvXWNFgi7fO_M-sL9empRgHR5riCj1jeThBRT-oqEc,14088
 cloudpss/ieslab/__init__.py,sha256=gr1rXYw9vIAGOe60eg7LyMHP7QDXvNf4dJ5GTR_kj1Y,232
 cloudpss/job/TemplateCompiler.py,sha256=MuJDTQ54wRo5bGSvBJBJjXJ7u463dwpRkaLwIwm_hLE,9936
-cloudpss/job/TemplateManager.py,sha256=PYFWcnJMlvXsoqKh_GMMti72o0ajLWYssrOGUtknMwY,1099
+cloudpss/job/TemplateManager.py,sha256=uOvctmE3P17aGWt_26d940FbRUSEs6iovFBb8T5xjd4,1115
 cloudpss/job/__init__.py,sha256=3UIFZYjJTzuckM61o8kim1c3PWt2SSHTL72jrGu5IzI,51
 cloudpss/job/job.py,sha256=ciphBMfRkIK1bvZ1zrbuISojXiixoNwQRlCzfEVWOa8,8240
 cloudpss/job/jobReceiver.py,sha256=PNYxcN33LiXZVyc4tzhPlpWxKnyWO_ElKjJ9wsxsroI,925
@@ -47,12 +47,12 @@ cloudpss/job/result/__init__.py,sha256=6zpp_s3Mcdi__FVfrBNLXw4Ee5ZBNgoZuYPJ8cqbj
 cloudpss/job/result/result.py,sha256=kNAQ0X605pKRVFZ0FGULZn177zoPCrMeXLE7eCAVjFA,4282
 cloudpss/model/__init__.py,sha256=SNq-bfwcQtDHtTNBYppfUEs8wkjfrQfGeywx7igmvOs,151
 cloudpss/model/jobDefinitions.py,sha256=uuTwpqStlg3YDmfxbU2PVi_Tf18opa0kYLCMGaOP-qA,3749
-cloudpss/model/model.py,sha256=gYMBf_jspoRSwb0QgARvJGXVtDlaQvQjp_B9QMYvXwE,27170
+cloudpss/model/model.py,sha256=hS64Tb6JJvLDaCi4mBPUGbXvmzc-nQxlHtnh7OQpreo,27179
 cloudpss/model/revision.py,sha256=IFznBKirwpfqadyCNJWPGL7lTpQxbCmU1fxdI5AvoA4,4002
 cloudpss/model/topology.py,sha256=tKaOACAw9r9SppgxrhK-ZjMsG_jGLiNOzPnlIPLo964,2333
 cloudpss/model/implements/__init__.py,sha256=88L_wF9SSzxsbtqwStWIPH4LxaKq7TVcssHQ62YBnls,67
 cloudpss/model/implements/component.py,sha256=uNSpkZKChdXLiO40Ev4P3oQ1di2Hu4YjcBOb0I8Bf0c,734
-cloudpss/model/implements/diagram.py,sha256=25g40EhqcFsqNeTQYEG2mqxV_oG0B0kb3xT_NvN7ia8,4582
+cloudpss/model/implements/diagram.py,sha256=ILBq7oZVb2ZThmm_HdwGmGX0sZPwetoT4SSVN0xFqzo,6053
 cloudpss/model/implements/implement.py,sha256=Uld96tjXVDbVUNV8xscyy_nZWLHr3iP2DqA6S3p-XJE,954
 cloudpss/project/__init__.py,sha256=fpskY-cJGmMcTg1naVzNPtJaRG1xmSc2CFjDTin64Cw,51
 cloudpss/project/project.py,sha256=uFhOnM8ngo1_ZYz2uArtORKZquYNdOIVLXU_q1MDFI4,17698
@@ -67,14 +67,14 @@ cloudpss/runner/result.py,sha256=GFpd7848gsLRuzhVcWbCwmAjR84Lhik_3pNCjOV8VOY,132
 cloudpss/runner/runner.py,sha256=pfidTchkoVTFUB9pUmZn9ulVDag9DLGo0pIxsD-nRu0,9168
 cloudpss/runner/storage.py,sha256=zFET_zwPIOF2Cnh9sgFiS0HFxV1OmVsU34bGUQ6PpkA,4162
 cloudpss/runner/transform.py,sha256=krOgTZiJSJAb5QSwerAqlbC4Ma0PKi__0WOZlAxw4O8,11613
-cloudpss/utils/IO.py,sha256=sm6p53AFgE1b56Bh0qt_E2TFP5tLr0WQDzIVRlsNgFA,5321
+cloudpss/utils/IO.py,sha256=FsFp3V8I1-P0YiBGmjKwbMalBrVKMHUxTjFZFOtv0CQ,5357
 cloudpss/utils/__init__.py,sha256=jWVHSOqJQWU0fpg2UbWSEQoLCb2Uys-vH5Uqkb0ihNA,326
 cloudpss/utils/dataEncoder.py,sha256=5PUPb844eOGgFnYrMM8bdjdKH_MZz0lk-67uo8TvwEo,885
 cloudpss/utils/graphqlUtil.py,sha256=zGEhRZvy5JMipFKFxjDmbc-HQP3aPZ5noDwi-RTXWSk,280
 cloudpss/utils/httprequests.py,sha256=ZcCwS2KM7y2TwWTo0YRLNJVozih4h0F5ignn-CeBREU,1846
 cloudpss/utils/matlab.py,sha256=SLwVt790BjklJK2XNELt9R2n_1ej9Y8QsTIdFkKXLWE,795
 cloudpss/utils/yamlLoader.py,sha256=bv_vPDK_e0n_vZ5FwpDJ_NJWqMAwfU3AbhkvQIxPCy4,2677
-cloudpss-4.5.2.dist-info/METADATA,sha256=gew6nU4652E8_vPJY3PYXzzBHmtcP1p9NW78BqqMiDE,2401
-cloudpss-4.5.2.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-cloudpss-4.5.2.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
-cloudpss-4.5.2.dist-info/RECORD,,
+cloudpss-4.5.3.dist-info/METADATA,sha256=85B-9dgbPdsSS961DOPKWRoKeYn-8nYA2JJkSJRAJzM,2401
+cloudpss-4.5.3.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+cloudpss-4.5.3.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
+cloudpss-4.5.3.dist-info/RECORD,,