cloudpss 4.1.1b8__py3-none-any.whl → 4.1.1b9__py3-none-any.whl

cloudpss/model/revision.py

@@ -1,12 +1,11 @@
-import asyncio
-from cloudpss.utils.httpAsyncRequest import graphql_fetch
+from cloudpss.job.job import Job
 from .topology import ModelTopology
 from .implements import ModelImplement
-from ..utils import request, graphql_request
-from ..runner import Runner
+from ..utils import  graphql_request
 
 
 class ModelRevision(object):
+    
     """
         表示一个项目的版本数据
 
@@ -23,6 +22,12 @@ class ModelRevision(object):
 
 
     """
+    
+    __createModelRevisionQuery = """
+                    mutation($a:CreateModelRevisionInput!){createModelRevision(input:$a){
+                            hash
+                    }}
+                """
 
     def __init__(self, revision: dict = {}):
         """
@@ -56,21 +61,27 @@ class ModelRevision(object):
         """
 
         return self.implements
-
-    async def run(self, job, config, name=None, rid='', policy=None, **kwargs):
+    
+    def run(self, job, config, name=None, policy=None,stop_on_entry=None,rid=None, **kwargs):
         """
-            运行某个指定版本的项目
+            运行当前版本
 
             :params job:  调用仿真时使用的计算方案，为空时使用项目的第一个计算方案
             :params config:  调用仿真时使用的参数方案，为空时使用项目的第一个参数方案
             :params name:  任务名称，为空时使用项目的参数方案名称和计算方案名称
             :params rid:  项目rid，可为空
 
-            :return: 返回一个ModelRevision
+            :return: 返回一个运行实例
 
             >>> revision.run(revision,job,config,'')
         """
-        return await ModelRevision.createAsync(self)
+        revision= ModelRevision.create(self)
+        if stop_on_entry is not None:
+            job['args']['stop_on_entry'] = stop_on_entry
+        return Job.create(
+            revision["hash"], job, config, name, rid, policy, **kwargs
+        )
+    
 
     @staticmethod
     def create(revision, parentHash=None):
@@ -85,36 +96,19 @@ class ModelRevision(object):
             {hash:'4043acbddb9ce0c6174be65573c0380415bc48186c74a459f88865313743230c'}
         """
 
-        return  asyncio.run(ModelRevision.createAsync(revision, parentHash))
-        
-    @staticmethod
-    async def createAsync(revision, parentHash=None):
-        """
-            创建一个新版本
-
-            :params: revision 版本数据
-
-            :return: 项目版本hash
-
-            >>> ModelRevision.create(model.revision)
-            {hash:'4043acbddb9ce0c6174be65573c0380415bc48186c74a459f88865313743230c'}
-        """
-
-        query = """
-                    mutation($a:CreateModelRevisionInput!){createModelRevision(input:$a){
-                            hash
-                    }}
-                """
         r = revision.toJSON()
-        del r['hash']
+        if 'hash' in r:
+            del r['hash']
         variables = {'a': {**r, 'parent': parentHash}}
-
-        r = await graphql_fetch(query, variables)
+        r = graphql_request(ModelRevision.__createModelRevisionQuery, variables)
         if 'errors' in r:
             raise Exception(r['errors'])
+        
         return r['data']['createModelRevision']
+        
+    
 
-    async def fetchTopology(self, implementType, config, maximumDepth):
+    def fetchTopology(self, implementType, config, maximumDepth):
         """
             获取当前项目版本的拓扑数据
 
@@ -131,6 +125,7 @@ class ModelRevision(object):
         """
 
         if self.hash is not None:
-            return await ModelTopology.fetch(self.hash, implementType, config,
+            return ModelTopology.fetch(self.hash, implementType, config,
                                        maximumDepth)
         return None
+

cloudpss/model/topology.py

@@ -1,7 +1,6 @@
 import asyncio
 import json
 
-from cloudpss.utils.httpAsyncRequest import graphql_fetch
 from ..utils import request, graphql_request
 
 
@@ -19,6 +18,13 @@ class ModelTopology():
 
 
     """
+    __modelTopologyQuery = """
+            query($a:ModelTopologyInput!){
+            modelTopology(input:$a){
+                components
+                mappings
+            }}
+        """
     __All__ = ['ModelTopology']
 
     def __init__(self, topology: dict = {}):
@@ -48,10 +54,6 @@ class ModelTopology():
         
     @staticmethod
     def fetch(hash, implementType, config, maximumDepth=None):
-       return asyncio.run(ModelTopology.fetchAsync(hash, implementType, config, maximumDepth))
-        
-    @staticmethod
-    async def fetchAsync(hash, implementType, config, maximumDepth=None):
         """
             获取拓扑
 
@@ -66,14 +68,6 @@ class ModelTopology():
 
         """
         args = {} if config is None else config['args']
-        query = """
-            query($a:ModelTopologyInput!){
-            modelTopology(input:$a){
-                components
-                mappings
-            }}
-        """
-
         variables = {
             "a": {
                 'hash': hash,
@@ -82,8 +76,12 @@ class ModelTopology():
                 'maximumDepth': maximumDepth
             }
         }
-        data = await graphql_fetch(query, variables)
+        data = graphql_request(ModelTopology.__modelTopologyQuery, variables)
         if 'errors' in data:
             raise Exception(data['errors'][0]['message'])
 
         return ModelTopology(data['data']['modelTopology'])
+        
+    
+
+

cloudpss/runner/MessageStreamReceiver.py

@@ -157,6 +157,8 @@ class MessageStreamReceiver(object):
         if "when" not in msg:
             msg['when']= datetime.datetime.now()
         self.db.storeMessage(msg)
+        if(msg['type']=='terminate'):
+            self.close(self.ws)
 
     def on_error(self, ws, error):
         msg = {

cloudpss/utils/httprequests.py

@@ -33,12 +33,13 @@ def request(method, uri, baseUrl=None, params={}, token=None, **kwargs):
                             r.headers['X-Cloudpss-Version'] +
                             '.X.X）不兼容，请更换服务器地址或更换SDK版本(pip 使用 pip install -U cloudpss 命令更新, conda 使用 conda update cloudpss 命令更新)。')
 
-    if r.ok:
-        return r
-    logging.debug(r.text)
-    if r.text =="":
-        r.raise_for_status()
+    # if r.ok:
+    #     return r
+    # logging.debug(r.text)
+    # if r.text =="":
+    r.raise_for_status()
     if "statusCode" in r.text:
         t = json.loads(r.text)
         raise  Exception(str(t['statusCode']) + " "+t['message'])
+    return r
     

cloudpss/version.py

@@ -1 +1 @@
-__version__ = '4.1.1-beta.8'
+__version__ = '4.1.1-beta.9'

{cloudpss-4.1.1b8.dist-info → cloudpss-4.1.1b9.dist-info}/METADATA

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

{cloudpss-4.1.1b8.dist-info → cloudpss-4.1.1b9.dist-info}/RECORD

@@ -1,47 +1,55 @@
 cloudpss/__init__.py,sha256=EkdgEdD_kYmiXM8cGHX5sZwBnyo-cbNYx70qpUsThgI,835
 cloudpss/verify.py,sha256=KF4Gd59DGvCyIEkRD7rNnekWw22XxJpi3DW6keb6j4c,1498
-cloudpss/version.py,sha256=mogZeFwsT4HuCNqNb9b_s8HBY_IVBp1ICK-qzBLMisw,28
+cloudpss/version.py,sha256=fG8qYs4NCFq_sO9Emm5U6GtkXwVKnIaGvwQWkCb68X4,29
+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
+cloudpss/asyncio/job/messageStreamReceiver.py,sha256=LIEBmum2IRgeME8dO460B7MyF9esQIFFAo7bSrhZI5o,3864
+cloudpss/asyncio/job/messageStreamSender.py,sha256=rrSWnvveG6cP0hmGGKOwSvJsXWhVE0k1u1Z2VlPZQGo,1594
+cloudpss/asyncio/model/__init__.py,sha256=SNq-bfwcQtDHtTNBYppfUEs8wkjfrQfGeywx7igmvOs,151
+cloudpss/asyncio/model/model.py,sha256=vso4en-pnV2kpzNiQ9d-LyqHyM0H6MUbC5vFdvzi_aw,8627
+cloudpss/asyncio/model/revision.py,sha256=pcKNErIzyftq4_1CCQxArx6OeCuNMGInJHH97EBQ1lA,1568
+cloudpss/asyncio/model/topology.py,sha256=jouPmteTxpTV6mFzUGy7CiSEnBrbtCu-1shimJvC2FA,1192
+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=oErLt0OQkCySLj0bqVGFRQ1Y8MyQSHG5pQDwNDOrKbc,8856
+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=YnuBl9dLoVYlPUrfse8_O-4uIAG0QrCIyQdDP2zaQt4,14645
+cloudpss/function/functionExecution.py,sha256=o5S6EK6v2lXH4CY18dl2xSNgAYywpAGAToEIPk-q6Ms,14894
 cloudpss/function/job.py,sha256=LdzaTyjvBcMZIyLstSZnt79d2eREljx2HnNoilDp03A,13162
-cloudpss/ieslab/DataManageModel.py,sha256=YMpwp04GmkaK1gCnzp5tNAoPwkVfa9AkJPviqNOat7s,19445
+cloudpss/ieslab/DataManageModel.py,sha256=G4FzLcEE5st9j6v679q3NxtcEfgYk2qUJt_OTSEc_b0,21921
 cloudpss/ieslab/EvaluationModel.py,sha256=SD7VB81wZnebGQWpx-eTQMQxe6ekFUFycQxz6RyYwOI,6721
-cloudpss/ieslab/IESLabPlan.py,sha256=vWRExT0AE5VbR1DaQSINE65sbg0F6cXC7meXNT6Ap6Q,4940
-cloudpss/ieslab/IESLabSimulation.py,sha256=IzbcPYWihatXLNduojH9r-guaqnyiWF8sivSjrrZoLY,3090
-cloudpss/ieslab/PlanModel.py,sha256=Dk5ZS_8IASqzMlLeN_gIDk76Gm_ybXjGY4pULBsWvEw,4790
+cloudpss/ieslab/IESLabPlan.py,sha256=fL7uiVJNOkx5HYu6XX0HPrtrOCs455ff7NE1UgJ3vG4,8329
+cloudpss/ieslab/IESLabSimulation.py,sha256=-EJFkhklN9ao-nbfk7Lz6JCHboFCSDcn5R2jr3_Z7_A,4046
+cloudpss/ieslab/PlanModel.py,sha256=Z_7pME2GHhBMYk9bXu8hKjP_NpM_SUAUr3-I2o_7DPo,4883
 cloudpss/ieslab/__init__.py,sha256=kiyUaGRgtwqs0EI2dBBqLVK5V65u1PcY7YTFJX1T0yw,186
 cloudpss/job/__init__.py,sha256=3UIFZYjJTzuckM61o8kim1c3PWt2SSHTL72jrGu5IzI,51
-cloudpss/job/job.py,sha256=1CKhsB4zKCstdZ7PSep9K-M0yGptRN1ULZ_8M7z3HDs,8600
-cloudpss/job/jobMachine.py,sha256=wtJ7X9Cu-4KGpYvxLbvCVWv5Ku0CvsgmfThK8knLfoI,268
-cloudpss/job/jobPolicy.py,sha256=k5Ur9LYvTnWNgI9yqeCjs5E499DSOrYbYgywU8-zpC4,4083
-cloudpss/job/jobQueue.py,sha256=31Q7NCjb_51d1JOokVyxIfP1r6S_A-ObySJKwt8MxR8,416
-cloudpss/job/jobReceiver.py,sha256=kX59JLky86AXwgCWw0abfKu-yDWQ97YAV-sOObF5Kgk,740
-cloudpss/job/jobTres.py,sha256=1wwdvwxpYKOfsZ1R95Wkhyg_QYMzqzKoaLJLdB-bD88,148
-cloudpss/job/messageStreamReceiver.py,sha256=CxoGNUsRtvRDWUxaGU5c64jAB3FjvX2DPP7IZYr7dFk,6048
-cloudpss/job/messageStreamSender.py,sha256=Sl4e1jCtxb62wZKm0tgwdWsg8sjOrYPRXXVz8eIO1bc,3797
-cloudpss/job/view/EMTView.py,sha256=U-AF8OuKKJ9c1Q2yXJaNK6LNy_ZHpNi8tR2rn5KaocY,6838
+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
+cloudpss/job/view/EMTView.py,sha256=x7vNedo-RyH8Ukm5YaQSec6BPcskqopwGGyVDMVxV8U,6933
 cloudpss/job/view/IESLabSimulationView.py,sha256=_hD-fdEwC6U8hQYbXliNMEii0WxiteglQZuLOSQmMOM,76
-cloudpss/job/view/IESLabTypicalDayView.py,sha256=Za57f9TYcBxYeKo8fnEcOjl517v1LMDN0ua537fxcjc,1168
+cloudpss/job/view/IESLabTypicalDayView.py,sha256=SosMQ4D0Rom0FgPjYr5s-PPMpz49iyVNoK0K7iEyxrg,7817
 cloudpss/job/view/IESView.py,sha256=yaSczWTjkEV6d6TPLkWjCq0ldN0JO-3sVurAnQR89Mo,3842
 cloudpss/job/view/PowerFlowView.py,sha256=xg-KX37ENxYtEV7CRUszXfsyDmTsOKCh7agSg5K6EWQ,2089
 cloudpss/job/view/__init__.py,sha256=j_X6aFeY-wa6_0r1EixE0rrvGz_67m4fIqOLmUbkxqY,1466
-cloudpss/job/view/view.py,sha256=VJBy56BZ1avhF7gKHWbcW-ohT9my_VW48NqND_c0gSw,3453
+cloudpss/job/view/view.py,sha256=JEv3uWw2DTKNmtdvviztH4Y5Hp2ucFXPNrGOkFv8byU,4280
 cloudpss/model/__init__.py,sha256=SNq-bfwcQtDHtTNBYppfUEs8wkjfrQfGeywx7igmvOs,151
-cloudpss/model/jobDefinitions.py,sha256=XqjaaWOLU7zlVHM7TQJbZ3rNBWfBY7eT-5aE6EAatcQ,3770
-cloudpss/model/model.py,sha256=PnbjGHz4bql9kXYUc9UA7H2h3fC5LDPLj4P-xxQY_nE,26562
-cloudpss/model/revision.py,sha256=bVF-nux2WdJkBCji5LIyo3Wcngla9YbFG8oyp4HATXs,4183
-cloudpss/model/topology.py,sha256=W24pAQV9lJNOsx7QgRuf0O7KQxwurIgbE08DemfpDcM,2516
+cloudpss/model/jobDefinitions.py,sha256=uuTwpqStlg3YDmfxbU2PVi_Tf18opa0kYLCMGaOP-qA,3749
+cloudpss/model/model.py,sha256=k4TMC-l2XgXBxUhNB3aD2bCJS6RG7LWWNVypCSC0JcA,25540
+cloudpss/model/revision.py,sha256=KXJ2SEQwqqrOlhXD9F4bvxjKJKmu3dqIICBKUsi0klQ,3966
+cloudpss/model/topology.py,sha256=nTFq76CPmbkTgglI2Z-SlaJpymRkCXwehD_qE2K7f4I,2313
 cloudpss/model/implements/__init__.py,sha256=88L_wF9SSzxsbtqwStWIPH4LxaKq7TVcssHQ62YBnls,67
 cloudpss/model/implements/component.py,sha256=uNSpkZKChdXLiO40Ev4P3oQ1di2Hu4YjcBOb0I8Bf0c,734
-cloudpss/model/implements/diagram.py,sha256=N5RrrywmxOmc2KvP0nC-NiECT1tEhgJZPtiNCfvYPuc,1063
+cloudpss/model/implements/diagram.py,sha256=25g40EhqcFsqNeTQYEG2mqxV_oG0B0kb3xT_NvN7ia8,4582
 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
@@ -49,23 +57,21 @@ cloudpss/runner/DSLabResult.py,sha256=xJqKA3e1KSXQmLDe9_T6fG1exdE9j7EjfIfvBMmqiJ
 cloudpss/runner/IESLabEvaluationResult.py,sha256=uFNLiN5kzlzSGlLIq3ybuRwB-ufYytflVrXV5g7voOU,5841
 cloudpss/runner/IESLabPlanResult.py,sha256=dCyTbMtITy9XDjE42knrpJrvaH7dvFgfQMZbx9hybRs,6862
 cloudpss/runner/IESLabTypicalDayResult.py,sha256=3egAzmv32sr4wKaVgLxsM75ScSb08F4-iLEbuPkoi_c,8001
-cloudpss/runner/MessageStreamReceiver.py,sha256=MBc1HLU_3SOBKvi8rlEiEqhUSiBsQRzMVhEmS4MCKj8,5883
+cloudpss/runner/MessageStreamReceiver.py,sha256=w3Ur7rB7V4LJKBF28lra6EFwvCvJ3A75PRTCgnT6ZBo,5953
 cloudpss/runner/__init__.py,sha256=FxiYYmssbZgRjieySzi43yPiWEF6eNos2UsoFQeD2H8,341
 cloudpss/runner/receiver.py,sha256=QU0RsbCt0EK7sCLHzfj8_QQsuPNfqXxpZi5JKm6roxA,4162
 cloudpss/runner/result.py,sha256=MkoTQly7FjKj9mde3bnv4vBDfGJ2U4eK-HhxxdwmemE,13125
 cloudpss/runner/runner.py,sha256=DQOvHkdaI7lqcDdW2eEBY4UZPsgg__6vYFT8bUtm8Js,7820
 cloudpss/runner/storage.py,sha256=zFET_zwPIOF2Cnh9sgFiS0HFxV1OmVsU34bGUQ6PpkA,4162
 cloudpss/runner/transform.py,sha256=krOgTZiJSJAb5QSwerAqlbC4Ma0PKi__0WOZlAxw4O8,11613
-cloudpss/utils/AsyncIterable.py,sha256=AIWYrTnmjsIfOowE3asZlexdHNhpK2gm7aucfyyVoQw,781
 cloudpss/utils/IO.py,sha256=Uh1NOlBn15Jl5_aWS2QRO2-QsKlFT9o8DPtP8-8Z2PA,5314
 cloudpss/utils/__init__.py,sha256=jWVHSOqJQWU0fpg2UbWSEQoLCb2Uys-vH5Uqkb0ihNA,326
 cloudpss/utils/dataEncoder.py,sha256=5PUPb844eOGgFnYrMM8bdjdKH_MZz0lk-67uo8TvwEo,885
 cloudpss/utils/graphqlUtil.py,sha256=swl6XT1UmUQHdHjMWw3M0i8meEmVKNQvX0SHsbgg8TU,255
-cloudpss/utils/httpAsyncRequest.py,sha256=jMV1yMpx6jkAoh93Syn9vedmmt2IR86F8_-0xqf9SGU,2689
-cloudpss/utils/httprequests.py,sha256=1VtGuQAybeHAcpQfsXBPRPaNHiJfvoexmUuGmfKqoTY,1733
+cloudpss/utils/httprequests.py,sha256=dNKq7Zi89OhP_tsf7B_uAYK8CpO_RJ8NusHoTx-tSY0,1750
 cloudpss/utils/matlab.py,sha256=SLwVt790BjklJK2XNELt9R2n_1ej9Y8QsTIdFkKXLWE,795
 cloudpss/utils/yamlLoader.py,sha256=bv_vPDK_e0n_vZ5FwpDJ_NJWqMAwfU3AbhkvQIxPCy4,2677
-cloudpss-4.1.1b8.dist-info/METADATA,sha256=wWJJG-Ze24wFUIvTk7BMhoxRIkh1sxnjMqzxND3TpuU,2393
-cloudpss-4.1.1b8.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-cloudpss-4.1.1b8.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
-cloudpss-4.1.1b8.dist-info/RECORD,,
+cloudpss-4.1.1b9.dist-info/METADATA,sha256=swtqIRBS9T-dra4Mf2gYaQek4QQq6AnWHEKWzBfgahI,2393
+cloudpss-4.1.1b9.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+cloudpss-4.1.1b9.dist-info/top_level.txt,sha256=wS9qPU4-aWM9ouzMOx34Nlq-GkdQKpr9vBskwut1BD8,9
+cloudpss-4.1.1b9.dist-info/RECORD,,

cloudpss/job/jobMachine.py

@@ -1,11 +0,0 @@
-from cloudpss.job.jobTres import JobTres
-
-
-class JobMachine(object):
-    '''job machine'''
-
-    def __init__(self, id, name, tres, valid=None):
-        self.id = id
-        self.name = name
-        self.tres = JobTres(**tres)  # type: ignore
-        self.valid = valid

cloudpss/job/jobPolicy.py

@@ -1,129 +0,0 @@
-from cloudpss.job.jobQueue import JobQueue
-from cloudpss.job.jobTres import JobTres
-from cloudpss.utils.graphqlUtil import graphql_request
-
-
-class JobPolicy(object):
-
-    def __init__(self, id, name, users, functions, tres, minPriority,
-                 maxPriority, maxDuration, createTime, updateTime, visibility,
-                 queue):
-        self.id = id
-        self.name = name
-        self.users = users
-        self.functions = functions
-        print(tres)
-        self.tres = []
-        for tre in tres:
-            self.tres.append(JobTres(**tre))  # type: ignore
-        self.minPriority = minPriority
-        self.maxPriority = maxPriority
-        self.maxDuration = maxDuration
-        self.createTime = createTime
-        self.updateTime = updateTime
-        self.visibility = visibility
-        self.queue = JobQueue(**queue)  # type: ignore
-
-    @staticmethod
-    def fetch(id):
-        query = '''query($input:JobPolicyInput!)
-            {
-                jobPolicy(input:$input)
-                {
-                    id 
-                    name 
-                    users 
-                    functions 
-                    tres {
-                        cpu
-                        ecpu
-                        mem
-                    } 
-                    minPriority 
-                    maxPriority 
-                    maxDuration 
-                    createTime 
-                    updateTime 
-                    visibility 
-                    queue {
-                        id
-                        name
-                        scheduler
-                        machines {
-                            id
-                            name
-                            tres {
-                                cpu
-                                ecpu
-                                mem
-                            }
-                            valid
-                        }
-                        createTime
-                        updateTime
-                        load
-                    }
-                }
-                
-            }'''
-        variables = {'input': {'id': id}}
-        r = graphql_request(query, variables)
-        print (r)
-        if 'errors' in r:
-            raise Exception(r['errors'])
-        return JobPolicy(**r['data']['jobPolicy'])
-
-    @staticmethod
-    def fetchMany(input):
-        query = '''query($input:JobPoliciesInput!)
-            {
-                jobPolicies(input:$input)
-                {
-                    items {
-                        id 
-                        name 
-                        users 
-                        functions 
-                        tres {
-                            cpu
-                            ecpu
-                            mem
-                        } 
-                        minPriority 
-                        maxPriority 
-                        maxDuration 
-                        createTime 
-                        updateTime 
-                        visibility 
-                        queue {
-                            id
-                            name
-                            scheduler
-                            machines {
-                                id
-                                name
-                                tres {
-                                    cpu
-                                    ecpu
-                                    mem
-                                }
-                                valid
-                            }
-                            createTime
-                            updateTime
-                            load
-                        }
-                    }
-                    cursor
-                    count
-                    total
-                }
-            }'''
-        variables = {'input': input}
-        r = graphql_request(query, variables)
-        if 'errors' in r:
-            raise Exception(r['errors'])
-        policies = []
-        for policy in r['data']['jobPolicies']['items']:
-            policies.append(JobPolicy(**policy))
-        return policies

cloudpss/job/jobQueue.py

@@ -1,14 +0,0 @@
-from cloudpss.job.jobMachine import JobMachine
-
-
-class JobQueue(object):
-
-    def __init__(self, id, name, scheduler, machines, createTime, updateTime,
-                 load):
-        self.id = id
-        self.name = name
-        self.scheduler = scheduler
-        self.machines = [JobMachine(**m) for m in machines]
-        self.createTime = createTime
-        self.updateTime = updateTime
-        self.load = load

cloudpss/job/jobTres.py

@@ -1,6 +0,0 @@
-class JobTres(object):
-    '''tres'''
-    def __init__(self, cpu, mem, ecpu):
-        self.cpu = cpu
-        self.mem = mem
-        self.ecpu = ecpu