cloudpss 4.0.12__py3-none-any.whl → 4.0.14__py3-none-any.whl

cloudpss/dslab/files/files.py

@@ -0,0 +1,27 @@
+from .curveData import 基准出力曲线, 基准出力曲线2, 基准出力曲线3, 负荷曲线, 策略曲线, 运行策略曲线
+
+extra_paths = {
+    '光伏': 基准出力曲线,
+    '光伏曲线': 基准出力曲线,
+    '风机': 基准出力曲线,
+    '风机曲线': 基准出力曲线,
+    '燃气': 基准出力曲线2,
+    '燃气曲线': 基准出力曲线,
+    '水电': 基准出力曲线2,
+    '水电曲线': 基准出力曲线,
+    '火电': 基准出力曲线2,
+    '火电曲线': 基准出力曲线,
+    '生物质发电': 基准出力曲线2,
+    '生物质发电曲线': 基准出力曲线,
+    '垃圾电厂': 基准出力曲线2,
+    '垃圾电厂曲线': 基准出力曲线,
+    '负荷分类':  负荷曲线,
+    '负荷用户':  负荷曲线,
+    '储能运行策略': 运行策略曲线,
+}
+
+def getCurveData(kind):
+    if kind in extra_paths:
+        return extra_paths[kind]
+    else :
+        return []

cloudpss/dslab/financialAnalysisModel.py

@@ -0,0 +1,137 @@
+import time
+from cloudpss.runner.runner import Runner, HttpRunner, DSLabRunner
+from cloudpss.runner.DSLabResult import DSLabResult
+from ..utils import request
+import json
+
+class DSLabFinancialAnalysisModel(object):
+    _baseUri = 'api/dslab/rest/pe/'
+
+    _kindNameMap = {
+        "投资组成": "investmentbanchandproportion",
+        "资金来源": "capitalsource",
+        "资产形式": "assetformation",
+        "生产成本": "productioncost",
+        "流动资金及财务费用": "workingcapitalandfinancialexpenses",
+        "税率及附加": "projectcalculation",
+    }
+
+    # 财务评价基础参数接口默认值
+    _financialParasDefaultValues = {
+        "资产形式": {
+            "fixedAssetsRatio": "95",
+            "residualRrate": "5",
+            "depreciationPeriod": "15",
+            "reimbursementPeriod": "5"
+        },
+        "生产成本": {
+            'annualSalary': "8",
+            'capacity': "4",
+            'insuranceRate': "0.25",
+            'materialsExpenses': "5.0",
+            'otherExpenses': "1.0",
+            'welfareFactor': "0"
+        },
+        "流动资金及财务费用": {
+            "annualAPCirculationTimes": "12",
+            "annualARCirculationTimes": "12",
+            "annualCashCirculationTimes": "12",
+            "annualStockCirculationTimes": "12",
+            "interestRateAndWorkingCapital": "4",
+            "workingCapitalLoanRatio": "70"
+        },
+        "税率及附加": {
+            "aleatoricAccumulationFundRate": "0",
+            "basicDiscountRate": "8",
+            "cityMaintenanceConstructionTaxTate": "5",
+            "corporateIncomeTaxRate": "25",
+            "educationFeePlus": "5",
+            "electricityVATRate": "18",
+            "fuelBoughtVATRate": "10",
+            "hotColdVATRate": "12",
+            "legalAccumulationFundRate": "10",
+            "localEducationPlus": "2",
+            "materialBoughtVATRate": "17",
+            "steamSaleVATRate": "12"
+        }
+    }
+
+    def __init__(self, simulationId):
+        '''
+            初始化
+        '''
+        self.simulationId = simulationId
+
+    def _saveItemData(self, url, data):
+        '''
+            保存url链接对应的优化方案下财务评估模块的基础信息
+            :param url string类型，表示优化方案的接口链接
+
+            :return: dict 类型，代表方案对应的财务评价基础参数信息
+        '''
+        r = request('POST', url, None, data=json.dumps(data))
+        return json.loads(r.text)
+
+    def _fetchItemData(self, url, planID):
+        '''
+            获取planID对应的优化方案下财务评估模块的基础信息
+            :param planID int类型，表示优化方案的ID，数值位于0~优化方案数量之间
+
+            :return: dict 类型，为源数据的引用，代表方案对应的财务评价基础参数信息
+        '''
+        r = request('GET',
+                    url,
+                    params={
+                        "planId": planID,
+                        "simu": self.simulationId
+                    })
+        return json.loads(r.text)
+    
+    def run(self, planID) -> Runner[DSLabResult]:
+        '''
+            运行财务评价概览计算
+
+            :param planID int类型，表示优化方案的ID，数值位于0~优化方案数量之间
+
+            :return: Runner[DSLabResult]
+        '''
+        url = 'api/dslab/rest/saveDataToclickhouse'
+        try:
+            r = request('GET',
+                        url,
+                        params={
+                            "planId": planID,
+                            "simu": self.simulationId,
+                            "CMD_TYPE": 'financialEvaluation'
+                        })
+            data = json.loads(r.text)
+            return DSLabRunner({'rid': 'function/ieslab/evaluation'},
+                self.simulationId,
+                planId=planID,
+                cmdType='financialEvaluation')
+        except:
+            raise Exception('财务评价概览计算失败')
+
+    def GetFinancialParams(self, planID):
+        '''
+            获取planID对应的优化方案下财务评估模块的基础信息
+            :param planID int类型，表示优化方案的ID，数值位于0~优化方案数量之间
+
+            :return: dict 类型，为源数据的引用，代表方案对应的财务评价基础参数信息
+        '''
+        dict_result = dict()
+        for k, v in self._kindNameMap.items():
+            kind = self._kindNameMap.get(k, k)
+            url = f"{self._baseUri}{kind}"
+            list_data  = self._fetchItemData(url, planID)
+            if not list_data :
+                data = {
+                    "simu": self.simulationId,
+                    "planId": planID,
+                }
+                if k in self._financialParasDefaultValues:
+                    data.update(self._financialParasDefaultValues[k])
+                    dict_result[v]  = self._saveItemData(url, data)
+            else:
+                dict_result[v] = list_data
+        return dict_result

cloudpss/function/functionExecution.py

@@ -99,6 +99,26 @@ class FunctionExecution(object):
         self._args = val
 
     @staticmethod
+    def __listObj2Array(data):
+        arr=[]
+        for item in data:
+            if type(item) is list:
+                arr.append(FunctionExecution.__listObj2Array(item))
+            elif type(item) is dict and ('ɵid' in item or '?id' in item ):
+                a = list(range(len(item)-1))
+                for k, v in item.items():
+                    if k == 'ɵid' or k == '?id':
+                        continue
+                    k = int(k)
+                    if type(v) is list:
+                        a[k] = FunctionExecution.__listObj2Array(v)
+                    else:
+                        a[k] = v
+                arr.append(a)       
+            else:
+                arr.append(item)
+        return arr
+    @staticmethod
     def __loadArgs():
         """加载当前任务参数
 
@@ -110,9 +130,12 @@ class FunctionExecution(object):
             if k.startswith('CLOUDPSS_JOB_ARG-'):
                 s = k.split('-')
                 key = bytes.decode(bytes.fromhex(s[1]))
-                # print(key, v, flush=True)
-
-                args[key] = json.loads(v)
+                data = json.loads(v)
+                
+                if type(data) is list:
+                    data = FunctionExecution.__listObj2Array(data)
+                
+                args[key] = data
         return args
 
     def feedDog(self):

cloudpss/job/job.py

@@ -41,11 +41,6 @@ class Job(Generic[T]):
                 machine {
                     id
                     name
-                    tres {
-                        cpu
-                        ecpu
-                        mem
-                    }
                 }
                 input
                 output
@@ -247,12 +242,15 @@ class Job(Generic[T]):
         return self._result
    
     
-    def view(self, viewType:F)->F:
+    def view(self, viewType:F=None)->F:
         """
         获取当前运行实例的输出
         """
         receiver =  self.read()
         sender =  self.write()
+        if viewType is None:
+            viewType = getViewClass(self.context[0])
+        
         return viewType(receiver, sender)
 
     

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/version.py

@@ -1 +1 @@
-__version__ = '4.0.12'
+__version__ = '4.0.14'

{cloudpss-4.0.12.dist-info → cloudpss-4.0.14.dist-info}/METADATA

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

{cloudpss-4.0.12.dist-info → cloudpss-4.0.14.dist-info}/RECORD

@@ -1,6 +1,6 @@
 cloudpss/__init__.py,sha256=Ov8K45KxSsPalPErvTRUb2GvPdJ3myucFqx7s37_YZo,777
 cloudpss/verify.py,sha256=KF4Gd59DGvCyIEkRD7rNnekWw22XxJpi3DW6keb6j4c,1498
-cloudpss/version.py,sha256=Si_A7Ukxe5n--C2TBuLF5Ujz61-wK8KqAmpUzUtCP0E,22
+cloudpss/version.py,sha256=5S75AXvg8NRRISE7_5LIay82jswRl2Ar-p6fDKgzZto,22
 cloudpss/asyncio/__init__.py,sha256=CJGopQl_vz3z3fJsK7NjMX5uzkzfrJrbqKVhyYqlYWc,198
 cloudpss/asyncio/job/__init__.py,sha256=3UIFZYjJTzuckM61o8kim1c3PWt2SSHTL72jrGu5IzI,51
 cloudpss/asyncio/job/job.py,sha256=ExA-8JVOWWW5neVvNazPk4i3Z-q8xqYBL4qXU1m3rgM,3891
@@ -13,9 +13,16 @@ 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=K-tRlNE9use-i1MzwgBAdVr0w4i03WHHEzjFOme095Q,13511
+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=GcyhRlgYjRnJrreKOtERExbCp6XDedUlT0L7k-uqyZM,14640
+cloudpss/function/functionExecution.py,sha256=ZHHKC5cz2Rp8dZan_MGGCAOXMp0fdngnUeq1FQ3M0CQ,15507
 cloudpss/function/job.py,sha256=LdzaTyjvBcMZIyLstSZnt79d2eREljx2HnNoilDp03A,13162
 cloudpss/ieslab/DataManageModel.py,sha256=YMpwp04GmkaK1gCnzp5tNAoPwkVfa9AkJPviqNOat7s,19445
 cloudpss/ieslab/EvaluationModel.py,sha256=SD7VB81wZnebGQWpx-eTQMQxe6ekFUFycQxz6RyYwOI,6721
@@ -24,7 +31,7 @@ cloudpss/ieslab/IESLabSimulation.py,sha256=sd27IZ2NIGqUQWWVsobUOOY_7b1QzVbUMeSmF
 cloudpss/ieslab/PlanModel.py,sha256=Dk5ZS_8IASqzMlLeN_gIDk76Gm_ybXjGY4pULBsWvEw,4790
 cloudpss/ieslab/__init__.py,sha256=kiyUaGRgtwqs0EI2dBBqLVK5V65u1PcY7YTFJX1T0yw,186
 cloudpss/job/__init__.py,sha256=3UIFZYjJTzuckM61o8kim1c3PWt2SSHTL72jrGu5IzI,51
-cloudpss/job/job.py,sha256=jLgOXg37R_BvdEthf434y7TZTgcCuwEqblwAj5D3a04,7968
+cloudpss/job/job.py,sha256=lBOLbks-5Du8PPYNl2vqvZyufKdrsKZgXfjKKixLONA,7930
 cloudpss/job/jobReceiver.py,sha256=b52Q7eQjVXi1C8xP2koix6N0GdQy_ar0YJ33KyPfsSA,919
 cloudpss/job/messageStreamReceiver.py,sha256=VvrDewFjiZxMHZJUoMh2_CYC1bmcztY1TrNx0WSsQIU,4133
 cloudpss/job/messageStreamSender.py,sha256=MCgMP6Epgu2md_rhZhHeGv8q8sObF_wHfL3WpANoreM,2371
@@ -46,6 +53,7 @@ cloudpss/model/implements/diagram.py,sha256=N5RrrywmxOmc2KvP0nC-NiECT1tEhgJZPtiN
 cloudpss/model/implements/implement.py,sha256=Uld96tjXVDbVUNV8xscyy_nZWLHr3iP2DqA6S3p-XJE,954
 cloudpss/project/__init__.py,sha256=fpskY-cJGmMcTg1naVzNPtJaRG1xmSc2CFjDTin64Cw,51
 cloudpss/project/project.py,sha256=sGvJEd9yEB5NARRa64gwF96hK69gQSmwX8lQANLhBos,17700
+cloudpss/runner/DSLabResult.py,sha256=xJqKA3e1KSXQmLDe9_T6fG1exdE9j7EjfIfvBMmqiJ8,3422
 cloudpss/runner/IESLabEvaluationResult.py,sha256=uFNLiN5kzlzSGlLIq3ybuRwB-ufYytflVrXV5g7voOU,5841
 cloudpss/runner/IESLabPlanResult.py,sha256=dCyTbMtITy9XDjE42knrpJrvaH7dvFgfQMZbx9hybRs,6862
 cloudpss/runner/IESLabTypicalDayResult.py,sha256=3egAzmv32sr4wKaVgLxsM75ScSb08F4-iLEbuPkoi_c,8001
@@ -63,7 +71,7 @@ cloudpss/utils/graphqlUtil.py,sha256=swl6XT1UmUQHdHjMWw3M0i8meEmVKNQvX0SHsbgg8TU
 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.12.dist-info/METADATA,sha256=Oda-HTp6UN6kZE_oCcPVYNX0XPVzEvn0s4Z3QGBIc2c,2369
-cloudpss-4.0.12.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-cloudpss-4.0.12.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
-cloudpss-4.0.12.dist-info/RECORD,,
+cloudpss-4.0.14.dist-info/METADATA,sha256=a1Nvm-X3XfXKppgQ1uCd_Y2UvHQ8Z89U1zs1cZhV78o,2369
+cloudpss-4.0.14.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+cloudpss-4.0.14.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
+cloudpss-4.0.14.dist-info/RECORD,,