cloudpss 4.0.1__py3-none-any.whl → 4.0.2__py3-none-any.whl

cloudpss/dslab/dataManageModel.py

@@ -182,16 +182,16 @@ class DataManageModel(object):
                     })
         return json.loads(r.text)
     
-    def AddDataItem(self, kind, data):
+    def AddDataItem(self, kind, data, extra=None):
         '''
             向kind类型的数据库中添加内容为data的数据项
             :params: kind str类型，数据的种类标识，包含：光伏、风机、燃气、水电、常规小火电、生物质发电、垃圾电厂、传输线、变压器、开关、负荷分类、负荷用户、储能配置、上网电价、输配电价、常数电价、阶梯电价、分时电价、分时阶梯电价
             :params: data dict类型，表示添加的数据内容，其数据结构应满足对应数据项的结构要求
+            :params extra list类型，表示添加的基准出力曲线、负荷曲线、策略曲线数据
     
             :return: list<dict>类型，返回该种类下所有数据项的列表
         '''
         assert (kind in self._kindUrlMap), "数据类型不存在"
-        extra = data.get('extra')
         if extra is None or not extra:
             extra = getCurveData(kind)
             r = {
@@ -255,6 +255,17 @@ class DataManageModel(object):
         assert (kind in self._kindUrlMap), "数据类型不存在"
         url = f"{self._baseUri}rest/{kind}"
         return self._fetchItemData(url)
+    
+    def GetItemExtra(self, kind, uuid):
+        '''
+            获取kind类型对应数据项的基准出力曲线、负荷曲线、策略曲线数据
+            :params: kind str类型，数据的类型
+            :params: uuid str类型，数据的unique id
+        '''
+        assert (kind in self._kindUrlMap), "数据类型不存在"
+        url = f"{self._baseUri}rest/id/{uuid}"
+        data = self._fetchItemData(url)
+        return data.get('extra', None).get('data', None)
 
 class DSLabDataManageModel(DataManageModel):
     _baseUri = 'api/ies/'

cloudpss/dslab/dslab.py

@@ -143,3 +143,68 @@ class DSLab(object):
             raise Exception("不是储能规划方案内核运行生成算法的计算方案")
         return self.run(job=job, name=name)
 
+    @staticmethod
+    def createProjectGroup(name, description=None, createById=None):
+        '''
+            创建项目组
+
+            :params name: String 项目组名称 
+            :params description: String 项目组描述 可选参数
+            :params createById Int 父项目组id  可选参数，如果是从已有项目组导入的项目组，必填此项
+
+            :return: Int 返回创建的项目组id
+        '''
+        try:
+            if createById is None: 
+                isImport = 0
+            else:
+                isImport = 1
+            payload = {
+                'name': name,
+                'description': description,
+                'isImport': isImport,
+                'createById': createById,
+            }
+            r = request(
+                'POST', 'api/ies/rest/group', data=json.dumps(payload))
+            if r.ok:
+                r = request('GET', 'api/ies/rest/group')
+                groupList = json.loads(r.text)
+                id = groupList[len(groupList) -1].get('id', None)
+                return id
+        except Exception as e:
+            raise Exception('创建项目组失败')
+        
+    @staticmethod
+    def createProject(name, gid, description=None, initialTerm=None, build=None, operate=None, yearsInOperation=None):
+        '''
+            创建项目
+
+            :params name: String 项目名称 
+            :params gid: Int 父项目组id,
+            :params description: String 项目描述, 可选参数
+            :params initialTerm: String 项目起始年限，可选参数
+            :params build: String 项目建设期（年），可选参数
+            :params operate: String 项目生命周期（年），可选参数
+            :params yearsInOperation: String 已投运年限，可选参数
+
+            :return: Int 返回创建的项目id
+        '''
+        try:
+            payload = {
+                'name': name,
+                'gid': gid,
+                'description': description,
+                'config': {
+                    'initialTerm': initialTerm,
+                    'build': build,
+                    'operate': operate,
+                    'yearsInOperation': yearsInOperation,
+                }
+            }
+            r = request(
+                'POST', 'api/ies/rest/simulation', data=json.dumps(payload))
+            project = json.loads(r.text)
+            return project.get('resource', None)
+        except Exception as e:
+            raise Exception('创建项目失败')

cloudpss/utils/httprequests.py

@@ -24,7 +24,7 @@ def request(method, uri, baseUrl=None, params={}, token=None, **kwargs):
             raise Exception(
                 '当前SDK版本（ver 3.X.X）与服务器版本（3.0.0 以下）不兼容，请更换服务器地址或更换SDK版本。')
         os.environ['X_CLOUDPSS_VERSION'] = r.headers['X-Cloudpss-Version']
-        if float(r.headers['X-Cloudpss-Version']) > 4:
+        if float(r.headers['X-Cloudpss-Version']) >= 5:
             raise Exception('当前SDK版本（ver '+__version__ +'）与服务器版本（ver ' +
                             r.headers['X-Cloudpss-Version'] +
                             '.X.X）不兼容，请更换服务器地址或更换SDK版本(pip 使用 pip install -U cloudpss 命令更新, conda 使用 conda update cloudpss 命令更新)。')

cloudpss/version.py

@@ -1 +1 @@
-__version__ = '4.0.1'
+__version__ = '4.0.2'

{cloudpss-4.0.1.dist-info → cloudpss-4.0.2.dist-info}/METADATA

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

{cloudpss-4.0.1.dist-info → cloudpss-4.0.2.dist-info}/RECORD

@@ -1,10 +1,10 @@
 cloudpss/__init__.py,sha256=Ov8K45KxSsPalPErvTRUb2GvPdJ3myucFqx7s37_YZo,777
 cloudpss/verify.py,sha256=KF4Gd59DGvCyIEkRD7rNnekWw22XxJpi3DW6keb6j4c,1498
-cloudpss/version.py,sha256=EBi3Woxxoz9GwvhSOnwW7hQYSm6B8W0mjvampQQcixc,21
+cloudpss/version.py,sha256=X2FSVyXfKfCh487cbRC3bWEH0TAFIoyQIus2dzhKa3U,21
 cloudpss/dslab/DSLabFinancialResult.py,sha256=7_ho5Xzm9ufcMXo1wCjxJe4VQxqod-6jpvVF3XjlXcw,3612
 cloudpss/dslab/__init__.py,sha256=rm3bUFSet3KZYrkKo6pfMBNfjvR3U1rwnTnEA5sE87Q,44
-cloudpss/dslab/dataManageModel.py,sha256=F710Kt4wamUB1hrUXjICixiwyE9BWysNy1J3uYgWxwE,10131
-cloudpss/dslab/dslab.py,sha256=3Po00COxYxQ40Y_IJigXoodxwuC3IQo98CtlYsfhxaY,6332
+cloudpss/dslab/dataManageModel.py,sha256=_a_LiZvnOup71ehgRlI5Rzu1tMO9zSF5AVBlAWcRh90,10710
+cloudpss/dslab/dslab.py,sha256=XqbciGqDd22d5u983ysQQpizHBwFzuVBeGcGdIr8Ksc,8848
 cloudpss/dslab/financialAnalysisModel.py,sha256=o-s6rR74UIjj5V9oB9fjdyo3Q3ogtY3QPhxSXbiBHXk,5058
 cloudpss/dslab/files/__init__.py,sha256=l2g0VadtTiMW39zwCwHPHUC01Kbklb_nFUPVeQ16FwM,58
 cloudpss/dslab/files/curveData.py,sha256=InlQ_6ZfVkFdhK65PldvIbw_X7Pys2ci4jexZ0flL6c,4291324
@@ -61,10 +61,10 @@ cloudpss/utils/IO.py,sha256=Uh1NOlBn15Jl5_aWS2QRO2-QsKlFT9o8DPtP8-8Z2PA,5314
 cloudpss/utils/__init__.py,sha256=NU5ZAeXH733nJKooH_1cdT9ntPEYRG4Kk3PA7P6bK_s,291
 cloudpss/utils/dataEncoder.py,sha256=5PUPb844eOGgFnYrMM8bdjdKH_MZz0lk-67uo8TvwEo,885
 cloudpss/utils/graphqlUtil.py,sha256=swl6XT1UmUQHdHjMWw3M0i8meEmVKNQvX0SHsbgg8TU,255
-cloudpss/utils/httprequests.py,sha256=sIf2ZDYwHtjm9D_zBzdTDqWy8KReQajOV_BS8Wd6m7w,1642
+cloudpss/utils/httprequests.py,sha256=-RYi1Dc4QDqqupuw0x-lq74dFvCqPrZfCJKgrdolEpk,1643
 cloudpss/utils/matlab.py,sha256=SLwVt790BjklJK2XNELt9R2n_1ej9Y8QsTIdFkKXLWE,795
 cloudpss/utils/yamlLoader.py,sha256=KRlRkHFltOjqxa_sesdBLf1W5J7XTgvubszsSw-XR0U,2885
-cloudpss-4.0.1.dist-info/METADATA,sha256=wo7z67aHflrgxYeMtNLJPEMyEB2dPIXUq_Msf6L-q1Q,2318
-cloudpss-4.0.1.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-cloudpss-4.0.1.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
-cloudpss-4.0.1.dist-info/RECORD,,
+cloudpss-4.0.2.dist-info/METADATA,sha256=B5ede-aq6jNV-jXKAtp_qF_KDrz-Z2ZekA90onhHEVA,2318
+cloudpss-4.0.2.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+cloudpss-4.0.2.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
+cloudpss-4.0.2.dist-info/RECORD,,