cloudpss 4.5.1__py3-none-any.whl → 4.5.1a2__py3-none-any.whl

cloudpss/runner/DSLabResult.py

@@ -0,0 +1,92 @@
+import json
+from ..utils.httprequests import request
+
+class DSLabResult(object):
+    _baseUri = "api/dslab/rest/"
+    _kindNameMap = {
+        "利润与利润分配": "getEconomyResult",
+        "财务计划现金": "getFinancialPlanCashFlowResult",
+        "资产负债": "getLiabilityAssetsResult",
+        "投资使用计划与资金筹措": "getInvestPlanDataResult",
+        "借款还本付息计划": "getLoanRepaymentPlanResult",
+        "流动资金估算": "getFlowCashEvaluteResult",
+        "资产折旧与摊销估算": "getFlowCashEvaluteResult",
+        "总成本费用估算表": "getSumCostResult",
+        "项目总投资现金流量": "getSumInvestFlowCashResult",
+        "项目资本金现金流量": "getProjectCashFlowResult",
+        "营业收入、税金、附加和增值税估算": "getIncomeTaxResult",
+    }
+
+    def __init__(self, simulationId, taskId=None, **keywords) -> None:
+        """
+            初始化
+        """
+        self.simulationId = simulationId
+        self.timeId = keywords.get("timeId", 0)
+        self.planId = keywords.get("planId", 0)
+        self.cmdType = keywords.get("cmdType", None)
+
+    def _fetchItemData(self, url, planID):
+        """
+            获取planID对应的优化方案下resultType财务评估结果
+
+            :param planID int 类型，表示优化方案的ID，数值位于0~优化方案数量之间
+            :param resultType enum 类型，表示财务评价结果表格的类型
+
+            :return: dict 类型，为源数据的引用，代表方案对应的财务评价基础参数信息
+        """
+        r = request(
+            "GET", url, params={"simu": self.simulationId, "planId": planID, "time": 0}
+        )
+        data = json.loads(r.text)
+        return data
+
+    def status(self):
+        """
+            获取运行状态
+
+            :return: boolean 类型
+        """
+        result = self.GetOverviewResult()
+        if result is None or type(result) is list:
+            return False
+        return True
+
+    def GetFinancialResult(self, resultType):
+        """
+            获取planID对应的优化方案下resultType财务评估结果
+            :param planID int 类型，表示优化方案的ID，数值位于0~优化方案数量之间
+            :param resultType enum 类型，表示财务评价结果表格的类型
+
+            :return: dict 类型，为源数据的引用，代表方案对应的财务评价基础参数信息
+
+        """
+        assert resultType in self._kindNameMap, "数据类型不存在"
+        kind = self._kindNameMap.get(resultType, resultType)
+        url = f"{self._baseUri}{kind}"
+        list = self._fetchItemData(url, self.planId)
+        dict_result = dict()
+        for val in list:
+            for k, v in val.items():
+                dict_result[k] = v
+        return dict_result["data"]
+
+    def GetOverviewResult(self):
+        """
+            获取当前结果类对应的概览结果
+
+            :return: array类型，代表该方案对应的概览结果
+        """
+        r = request(
+            "GET",
+            "api/dslab/rest/getOverviewResult",
+            params={
+                "simu": self.simulationId,
+                "planId": self.planId,
+                "time": self.timeId,
+            },
+        )
+        result = json.loads(r.text)
+        if len(result) > 0:
+            return result[0]["data"]
+        return None

cloudpss/runner/result.py

@@ -116,7 +116,6 @@ class Result(object):
 
             >>> message= result.getMessagesByType('log')
         """
-
         return self.db.getMessagesByType(type)
 
 

cloudpss/runner/runner.py

@@ -15,7 +15,8 @@ from .IESLabEvaluationResult import IESLabEvaluationResult, IESLabPlanEvaluation
 from .IESLabTypicalDayResult import IESLabTypicalDayResult
 from .storage import Storage
 from ..utils import request
-from typing import TypeVar, Generic
+from typing import  TypeVar,  Generic
+from .DSLabResult import DSLabResult
 import re
 
 RECEIVER = {
@@ -35,6 +36,10 @@ IES_LAB_OPT_RESULT = {
     'function/ieslab/evaluation': IESLabOptEvaluationResult,
 }
 
+DS_LAB_RESULT = {
+    'function/ieslab/evaluation': DSLabResult
+}
+
 RESULT_DB = {
     'function/CloudPSS/emtp': EMTResult,
     'function/CloudPSS/emtps': EMTResult,
@@ -240,7 +245,16 @@ class HttpRunner(Runner[T]):
         if self.__taskId is None:
             return False
         return self.result.status()  # type: ignore
+    
+class DSLabRunner(Runner[T]):
+    def __init__(self, job, simulationId, **kwargs):
+        self.simulationId = simulationId
+        self.job = job
+        result = DS_LAB_RESULT.get(job.get('rid', ''), DSLabResult)
+        self.result: T = result(self.simulationId, **kwargs)
 
+    def status(self):
+        return self.result.status()
 
 class HttpOPTRunner(Runner[T]):
 

cloudpss/utils/httprequests.py

@@ -29,7 +29,7 @@ def request(method, uri, baseUrl=None, params={}, token=None, **kwargs):
         del kwargs['xToken']
     
     r = requests.request(method, url, params=params, headers=headers, **kwargs)
-
+    
     if (uri.startswith('graphql')):
         if 'X-Cloudpss-Version' not in r.headers:
             raise Exception(

cloudpss/version.py

@@ -1 +1 @@
-__version__ = '4.5.1'
+__version__ = '4.5.1-alpha.2'

{cloudpss-4.5.1.dist-info → cloudpss-4.5.1a2.dist-info}/METADATA

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

{cloudpss-4.5.1.dist-info → cloudpss-4.5.1a2.dist-info}/RECORD

@@ -1,6 +1,6 @@
-cloudpss/__init__.py,sha256=1RNmUBhoxYUutZiTS-XJ9yBoNGGh8Mpt1uY6ETlSBDc,825
+cloudpss/__init__.py,sha256=xnA-UjehYOzH6KV7vOXHwdbGEiw6g_OPKzrbZA9Fuc8,858
 cloudpss/verify.py,sha256=KF4Gd59DGvCyIEkRD7rNnekWw22XxJpi3DW6keb6j4c,1498
-cloudpss/version.py,sha256=bhnO42YyuLBZoAN5yif-lNoSFC--RRTJ9r5fQdDewoY,22
+cloudpss/version.py,sha256=0OtZSPuLQXAaAxIqG2XzbOJ2-vy329E4WlxhrvhGIAY,30
 cloudpss/asyncio/__init__.py,sha256=CJGopQl_vz3z3fJsK7NjMX5uzkzfrJrbqKVhyYqlYWc,198
 cloudpss/asyncio/job/__init__.py,sha256=3UIFZYjJTzuckM61o8kim1c3PWt2SSHTL72jrGu5IzI,51
 cloudpss/asyncio/job/job.py,sha256=Bn2BEERw1J8YarFauTzVrGJK7nmaoMsdlrFUqiHRth4,3897
@@ -13,6 +13,13 @@ cloudpss/asyncio/model/topology.py,sha256=jouPmteTxpTV6mFzUGy7CiSEnBrbtCu-1shimJ
 cloudpss/asyncio/utils/AsyncIterable.py,sha256=AIWYrTnmjsIfOowE3asZlexdHNhpK2gm7aucfyyVoQw,781
 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/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
+cloudpss/dslab/files/files.py,sha256=vS0VhAh1lb8oFw51E2rAsb0WpmqM9F9IprxNCAPqH1s,934
 cloudpss/function/__init__.py,sha256=TNzChB-gQF6oB62F423evpUlgcp6s03D4pKKs89Lz4Q,1629
 cloudpss/function/function.py,sha256=llomkfnTmKMiFJYJ2mKnmAEoIjTNVCnjCUUyiJMOV1s,29
 cloudpss/function/functionExecution.py,sha256=4SR2qJbXntOjjSOrUmbjvBqED1nJyhVpI6WZKUFs1lQ,15761
@@ -24,18 +31,20 @@ cloudpss/ieslab/IESLabPlan.py,sha256=rEf1W2pT_J3C8-TFFHVm8Llli9ySSXbBeRpd6Yz9Glk
 cloudpss/ieslab/IESLabSimulation.py,sha256=-EJFkhklN9ao-nbfk7Lz6JCHboFCSDcn5R2jr3_Z7_A,4046
 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/__init__.py,sha256=3UIFZYjJTzuckM61o8kim1c3PWt2SSHTL72jrGu5IzI,51
-cloudpss/job/job.py,sha256=ciphBMfRkIK1bvZ1zrbuISojXiixoNwQRlCzfEVWOa8,8240
+cloudpss/job/job.py,sha256=kI8Yptc19q8A2UocxfG-GF25hhoKPpZTXndIJjQJJAY,8253
 cloudpss/job/jobReceiver.py,sha256=PNYxcN33LiXZVyc4tzhPlpWxKnyWO_ElKjJ9wsxsroI,925
-cloudpss/job/messageStreamReceiver.py,sha256=VvrDewFjiZxMHZJUoMh2_CYC1bmcztY1TrNx0WSsQIU,4133
-cloudpss/job/messageStreamSender.py,sha256=MCgMP6Epgu2md_rhZhHeGv8q8sObF_wHfL3WpANoreM,2371
+cloudpss/job/messageStreamReceiver.py,sha256=JtS-p0ka8eVVyG4I00G_A4Vu_uI-l3TfBrX_Fhojxow,5269
+cloudpss/job/messageStreamSender.py,sha256=QQO6XtoZNLiUJXeSZmim-XFDBrb9i-JAjMPHKXcscZA,2365
 cloudpss/job/result/EMTResult.py,sha256=xC9ws7bH-2nhpF8lqzZLqcOL-IcYS-JeBboEHgX96wk,6941
 cloudpss/job/result/IESLabSimulationResult.py,sha256=a47Ic1vvfHTK_vEokOZxJBnQReqYOWux_aePPic_Hrs,84
 cloudpss/job/result/IESLabTypicalDayResult.py,sha256=0u8FrxDUpujJvCWRk4jRtHzw-WHmvPR38nKj6-iccw4,7827
 cloudpss/job/result/IESResult.py,sha256=TLMTlDuvTUWnsJSUxXt8XTlXZGaVPmxZwia_JOcej88,3852
 cloudpss/job/result/PowerFlowResult.py,sha256=KoImlmsEEZyMriuoE_MSHBQu4k9MSDUuZ8E2SRLndWE,2097
 cloudpss/job/result/__init__.py,sha256=irh05EkRXewQz_khP5Da0h_GoNBE5Biyx_ycoXnI7Is,1502
-cloudpss/job/result/result.py,sha256=kNAQ0X605pKRVFZ0FGULZn177zoPCrMeXLE7eCAVjFA,4282
+cloudpss/job/result/result.py,sha256=mWt4HyrI0y-l97Q8tcAiMyW9lm0timgxaRerLXPnefk,4280
 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
@@ -47,24 +56,25 @@ cloudpss/model/implements/diagram.py,sha256=25g40EhqcFsqNeTQYEG2mqxV_oG0B0kb3xT_
 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
+cloudpss/runner/DSLabResult.py,sha256=xJqKA3e1KSXQmLDe9_T6fG1exdE9j7EjfIfvBMmqiJ8,3422
 cloudpss/runner/IESLabEvaluationResult.py,sha256=rsKbSJ9zsgyMYP-oIWsJlSXGxs7Y-44rj45Fn6NJXMA,5998
 cloudpss/runner/IESLabPlanResult.py,sha256=pbUq2YCPBE01Sy9e9X5Wp8OZ4PJhUkUb-28b5CEzqxc,8874
 cloudpss/runner/IESLabTypicalDayResult.py,sha256=-9D0TRsXEYJIgGKYFPZHjR7URyPypN7jfPc1lohFJ0c,8175
 cloudpss/runner/MessageStreamReceiver.py,sha256=dT-rKslQbRt3bMTGXupa1YrocHl2zTWOCHlsXcbgfhs,2812
 cloudpss/runner/__init__.py,sha256=FxiYYmssbZgRjieySzi43yPiWEF6eNos2UsoFQeD2H8,341
 cloudpss/runner/receiver.py,sha256=QU0RsbCt0EK7sCLHzfj8_QQsuPNfqXxpZi5JKm6roxA,4162
-cloudpss/runner/result.py,sha256=GFpd7848gsLRuzhVcWbCwmAjR84Lhik_3pNCjOV8VOY,13291
-cloudpss/runner/runner.py,sha256=pfidTchkoVTFUB9pUmZn9ulVDag9DLGo0pIxsD-nRu0,9168
+cloudpss/runner/result.py,sha256=Q8RcfUnvilxPo6yvtjH6dXePaCqrBjQCljur3rem2pU,13290
+cloudpss/runner/runner.py,sha256=DPMiG_M-baWUAX7o9vL7p_Zr-r9nnTky5OYjig_yenU,9613
 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/__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/httprequests.py,sha256=KYE8iIqaBEN6gTdxFgUyvdKf3kbSizxxgmNN8_1BQjQ,1850
 cloudpss/utils/matlab.py,sha256=SLwVt790BjklJK2XNELt9R2n_1ej9Y8QsTIdFkKXLWE,795
 cloudpss/utils/yamlLoader.py,sha256=bv_vPDK_e0n_vZ5FwpDJ_NJWqMAwfU3AbhkvQIxPCy4,2677
-cloudpss-4.5.1.dist-info/METADATA,sha256=LE9nga6LMgH0zl1EsB5KJuN9B8F0sMuw0Qhx2SUhC5A,2401
-cloudpss-4.5.1.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-cloudpss-4.5.1.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
-cloudpss-4.5.1.dist-info/RECORD,,
+cloudpss-4.5.1a2.dist-info/METADATA,sha256=RFRgpfFLYphKIXyV03BWk06DMy109DiiHj1KEPyIaBI,2403
+cloudpss-4.5.1a2.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+cloudpss-4.5.1a2.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
+cloudpss-4.5.1a2.dist-info/RECORD,,