cloudpss 4.0.2a1__py3-none-any.whl → 4.1.1a2__py3-none-any.whl

cloudpss/__init__.py

@@ -6,13 +6,13 @@ from .model import Model, ModelRevision, ModelTopology
 from .project import Project
 from .utils import MatlabDataEncoder, DateTimeEncode
 from . import function
-
+from .job import Job
 from .function import FunctionExecution
 from .version import __version__
 __all__ = [
     'setToken', 'Model', 'ModelRevision', 'ModelTopology', 'Runner', 'Result',
     'PowerFlowResult', 'EMTResult', 'MatlabDataEncoder', 'DateTimeEncode',
-    'function', 'Project', 'currentJob', 'IESLabSimulation', 'IESLabPlan','__version__'
+    'function', 'Project', 'currentJob', 'IESLabSimulation', 'IESLabPlan','__version__','Job'
 ]
 
 

cloudpss/function/functionExecution.py

@@ -163,7 +163,7 @@ class FunctionExecution(object):
         sys.exit(code)
 
     def print(self, data):
-        print(json.dumps(data, cls=MatlabDataEncoder), flush=True)
+        print(json.dumps(data, cls=MatlabDataEncoder)+'\n', flush=True)
 
     def log(self, content, level='info', html=False, key=None):
         '''

cloudpss/ieslab/IESLabPlan.py

@@ -130,90 +130,3 @@ class IESLabPlan(object):
             :return: Boolean
         '''
         return self.planModel.kill()
-    
-    def createProjectGroup(self, name):
-        '''
-            创建项目组
-
-            :params name: 项目组名称
-
-            :return: 返回一个创建的项目组
-        '''
-
-    @staticmethod
-    def createProjectGroup(group_name, desc=None, createById=None):
-        '''
-            创建项目组
-
-            :params group_name: String 项目组名称 
-            :params desc: String 项目组描述 可选参数
-            :params createById Int 父项目组id  可选参数，如果是从已有项目组导入的项目组，必填此项
-
-            :return: Int 返回创建的项目组id
-        '''
-        try:
-            if createById is None: 
-                isImport = 0
-            else:
-                isImport = 1
-            payload = {
-                'group_name': group_name,
-                'desc': desc,
-                'isImport': isImport,
-                'createById': createById,
-            }
-            r = request(
-                'POST', 'api/ieslab-plan/rest/projectgroup/', data=json.dumps(payload))
-            project = json.loads(r.text)
-            return project.get('id', None)
-        except Exception as e:
-            raise Exception('创建项目组失败')
-
-    @staticmethod  
-    def createProject(name, project_group, start_date, end_date, construction_cycle, desc=None, createById=None):
-        '''
-            创建项目
-
-            :params name: String 项目名称 
-            :params project_group: Int 父项目组id
-            :param start_date: Int 项目开始年限，范围在[1500,3000]之间
-            :param end_date: Int 项目结束年限，范围在项目开始时间之后且不超过五十年
-            :param construction_cycle: Int 项目建设周期(年), 必须小于等于 项目结束年限 - 项目开始年限
-            :params desc: String 项目描述, 可选参数
-            :params createById Int 父项目id, 可选参数, 如果是从已有项目导入的项目，必填此项
-
-            :return: Int 返回创建的项目id
-        '''
-        try:
-            if start_date < 1500 or start_date > 3000:
-                raise Exception('项目开始年限错误，范围在[1500,3000]之间')
-            if end_date < start_date or end_date > start_date + 50:
-                raise Exception('项目结束年限错误，范围在项目开始时间之后且不超过五十年')
-            if construction_cycle > end_date - start_date:
-                raise Exception('项目建设周期错误，必须小于等于 项目结束年限 - 项目开始年限')
-            if createById is None: 
-                payload = {
-                    'name': name,
-                    'project_group': project_group,
-                    'start_date': start_date,
-                    'end_date': end_date,
-                    'construction_cycle': construction_cycle,
-                    'desc': desc
-                }
-            else:
-                payload = {
-                    'name': name,
-                    'project_group': project_group,
-                    'start_date': start_date,
-                    'end_date': end_date,
-                    'construction_cycle': construction_cycle,
-                    'desc': desc,
-                    'createById': createById
-                }
-            r = request(
-                'POST', 'api/ieslab-plan/rest/simu/', data=json.dumps(payload))
-            project = json.loads(r.text)
-            return project.get('id', None)
-        except Exception as e:
-            raise Exception('创建项目失败')
-

cloudpss/ieslab/IESLabSimulation.py

@@ -30,6 +30,7 @@ class IESLabSimulation(object):
             r = request(
                 'GET', 'api/ieslab-simulation/rest/simu/{0}/'.format(simulationId))
             project = json.loads(r.text)
+            print(project)
             return IESLabSimulation(project)
         except:
             raise Exception('未查询到当前算例')
@@ -48,67 +49,6 @@ class IESLabSimulation(object):
             job = self.model.jobs[currentJob]
 
         job['args']['simulationId'] = self.id
+        print(job)
         return self.model.run(job, name=name)
-    
-    @staticmethod
-    def createProjectGroup(group_name, desc=None, createById=None):
-        '''
-            创建项目组
-
-            :params group_name: String 项目组名称 
-            :params desc: String 项目组描述 可选参数
-            :params createById Int 父项目组id  可选参数，如果是从已有项目组导入的项目组，必填此项
-
-            :return: Int 返回创建的项目组id
-        '''
-        try:
-            if createById is None: 
-                isImport = 0
-            else:
-                isImport = 1
-            payload = {
-                'group_name': group_name,
-                'desc': desc,
-                'isImport': isImport,
-                'createById': createById,
-            }
-            r = request(
-                'POST', 'api/ieslab-simulation/rest/projectgroup/', data=json.dumps(payload))
-            project = json.loads(r.text)
-            return project.get('id', None)
-        except Exception as e:
-            raise Exception('创建项目组失败')
-
-    @staticmethod 
-    def createProject(name, project_group, desc=None, createById=None):
-        '''
-            创建项目
-
-            :params name: String 项目名称 
-            :params project_group: Int 父项目组id,
-            :params desc: String 项目描述, 可选参数
-            :params createById Int 父项目id, 可选参数, 如果是从已有项目导入的项目，必填此项
-
-            :return: Int 返回创建的项目id
-        '''
-        try:
-            if createById is None: 
-                payload = {
-                    'name': name,
-                    'project_group': project_group,
-                    'desc': desc
-                }
-            else:
-                payload = {
-                    'name': name,
-                    'project_group': project_group,
-                    'desc': desc,
-                    'createById': createById
-                }
-            r = request(
-                'POST', 'api/ieslab-simulation/rest/simu/', data=json.dumps(payload))
-            project = json.loads(r.text)
-            return project.get('id', None)
-        except Exception as e:
-            raise Exception('创建项目失败')
 

cloudpss/job/job.py

@@ -1,6 +1,10 @@
+import asyncio
 import random
 import re
 import time
+from cloudpss.utils.AsyncIterable import CustomAsyncIterable
+
+from cloudpss.utils.httpAsyncRequest import graphql_fetch
 from .view import getViewClass
 
 from cloudpss.utils.IO import IO
@@ -12,20 +16,33 @@ from .jobMachine import JobMachine
 from .messageStreamSender import MessageStreamSender
 
 
-
 class Job(object):
     """docstring for Job"""
 
-    def __init__(self, id, args, createTime, startTime, endTime, status,
-                 context, user, priority, policy, machine, input, output,
-                 position):
+    def __init__(
+        self,
+        id,
+        args,
+        createTime,
+        startTime,
+        endTime,
+        status,
+        context,
+        user,
+        priority,
+        policy,
+        machine,
+        input,
+        output,
+        position,
+    ):
         super(Job, self).__init__()
         self.id = id
         self.args = args
         self.createTime = createTime
         self.startTime = startTime
         self.endTime = endTime
-        self.status = status
+        self.job_status = status #这里的status字段与原本的status()冲突
         self.context = context
         self.user = user
         self.priority = priority
@@ -36,15 +53,16 @@ class Job(object):
         self.position = position
         self.__receiver = None
         self.__sender = None
+        self._result = None
 
     @staticmethod
-    def fetch(id):
+    async def fetch(id):
         """
         获取job信息
         """
         if id is None:
-            raise Exception('id is None')
-        query = '''query($_a:JobInput!){
+            raise Exception("id is None")
+        query = """query($_a:JobInput!){
             job(input:$_a){
                 id
                 args
@@ -79,165 +97,103 @@ class Job(object):
                 output
                 position
             }
-        }'''
+        }"""
         variables = {"_a": {"id": id}}
-        r = graphql_request(query, variables)
-        if 'errors' in r:
-            raise Exception(r['errors'])
-        return Job(**r['data']['job'])
+
+        r = await graphql_fetch(query, variables)
+        if "errors" in r:
+            raise Exception(r["errors"])
+        return Job(**r["data"]["job"])
 
     @staticmethod
-    def fetchMany(input):
+    def fetchMany(*args):
         """
         批量获取任务信息
         """
-        if input is None:
-            raise Exception('input is None')
-        query = '''query($_a:JobsInput!){
-            jobs(input:$_a){
-                item {
-                    id
-                    args
-                    createTime
-                    startTime
-                    endTime
-                    status
-                    context
-                    user
-                    priority
-                    policy  {
-                        id 
-                        name 
-                        users 
-                        functions 
-                        tres {
-                            cpu
-                            ecpu
-                            mem
-                        } 
-                        minPriority 
-                        maxPriority 
-                        maxDuration 
-                        createTime 
-                        updateTime 
-                        visibility 
-                        queue
-                    }
-                    machine {
-                        id
-                        name
-                        tres {
-                            cpu
-                            ecpu
-                            mem
-                        }
-                        valid
-                    }
-                    input
-                    output
-                    position
-                } 
-                cursor 
-                count 
-                total
-                }
-            }'''
-        variables = {"_a": input}
-        r = graphql_request(query, variables)
-        if 'errors' in r:
-            raise Exception(r['errors'])
-        jobs = []
-        for job in r['data']['jobs']['item']:
-            jobs.append(Job(**job))
+        jobs = CustomAsyncIterable(Job.fetch,*args)
         return jobs
+    
 
     @staticmethod
-    def create(revisionHash,
-               job,
-               config,
-               name=None,
-               rid='',
-               policy=None,
-               **kwargs):
-        '''
-            创建一个运行任务
+    async def create(revisionHash, job, config, name=None, rid="", policy=None, **kwargs):
+        """
+        创建一个运行任务
 
-            :params: revision 项目版本号
-            :params: job 调用仿真时使用的计算方案，为空时使用项目的第一个计算方案
-            :params: config 调用仿真时使用的参数方案，为空时使用项目的第一个参数方案
-            :params: name 任务名称，为空时使用项目的参数方案名称和计算方案名称
-            :params: rid 项目rid，可为空
+        :params: revision 项目版本号
+        :params: job 调用仿真时使用的计算方案，为空时使用项目的第一个计算方案
+        :params: config 调用仿真时使用的参数方案，为空时使用项目的第一个参数方案
+        :params: name 任务名称，为空时使用项目的参数方案名称和计算方案名称
+        :params: rid 项目rid，可为空
 
-            :return: 返回一个运行实例
+        :return: 返回一个运行实例
 
-            >>> runner = Runner.runRevision(revision,job,config,'')
-        '''
+        >>> runner = Runner.runRevision(revision,job,config,'')
+        """
 
-        #处理policy字段
+        # 处理policy字段
         if policy is None:
             policy = {}
-            if policy.get('tres', None) is None:
-                policy['tres'] = {}
-            policy['queue'] = job['args'].get('@queue', 1)
-            policy['priority'] = job['args'].get('@priority', 0)
-            tres = {'cpu': 1, 'ecpu': 0, 'mem': 0}
-            tresStr = job['args'].get('@tres', '')
-            for t in re.split('\s+', tresStr):
-                if t == '':
+            if policy.get("tres", None) is None:
+                policy["tres"] = {}
+            policy["queue"] = job["args"].get("@queue", 1)
+            policy["priority"] = job["args"].get("@priority", 0)
+            tres = {"cpu": 1, "ecpu": 0, "mem": 0}
+            tresStr = job["args"].get("@tres", "")
+            for t in re.split("\s+", tresStr):
+                if t == "":
                     continue
-                k, v = t.split('=')
-                tres[k] = float(v)  #type: ignore
-            policy['tres'] = tres
+                k, v = t.split("=")
+                tres[k] = float(v)  # type: ignore
+            policy["tres"] = tres
 
-        query = '''mutation($input:CreateJobInput!){job:createJob(input:$input){id input output status position}}'''
-        function = job['rid'].replace('job-definition/cloudpss/',
-                                      'function/CloudPSS/')
+        query = """mutation($input:CreateJobInput!){job:createJob(input:$input){id input output status position}}"""
+        function = job["rid"].replace("job-definition/cloudpss/", "function/CloudPSS/")
         variables = {
-            'input': {
+            "input": {
                 "args": {
-                    **job['args'], '_ModelRevision': revisionHash,
-                    '_ModelArgs': config['args']
+                    **job["args"],
+                    "_ModelRevision": revisionHash,
+                    "_ModelArgs": config["args"],
                 },
                 "context": [
                     function,
                     rid,
-                    f"model/@sdk/{str(int(time.time() * random.random()))}"
+                    f"model/@sdk/{str(int(time.time() * random.random()))}",
                 ],
-                "policy":
-                policy,
+                "policy": policy,
             }
         }
-        r = graphql_request(query, variables)
-        if 'errors' in r:
-            raise Exception(r['errors'])
-        id = r['data']['job']['id']
-        return Job.fetch(id)
+        r = await graphql_fetch(query, variables)
+        if "errors" in r:
+            raise Exception(r["errors"])
+        id = r["data"]["job"]["id"]
+        return await Job.fetch(id)
 
     @staticmethod
-    def abort(id, timeout):
+    async def abort(id, timeout):
         """
         结束当前运行的算例
 
         """
-        query = '''mutation ($input: AbortJobInput!) {
+        query = """mutation ($input: AbortJobInput!) {
             job: abortJob(input: $input) {
                 id
                 status
             }
         }
-        '''
-        variables = {'input': {'id': id, 'timeout': timeout}}
-        graphql_request(query, variables)
+        """
+        variables = {"input": {"id": id, "timeout": timeout}}
+        await graphql_fetch(query, variables)
 
     @staticmethod
-    def load(file, format='yaml'):
+    def load(file, format="yaml"):
         return IO.load(file, format)
 
     @staticmethod
-    def dump(job, file, format='yaml', compress='gzip'):
+    def dump(job, file, format="yaml", compress="gzip"):
         return IO.dump(job, file, format, compress)
 
-    def read(self, receiver=None, dev=False, **kwargs):
+    async def read(self, receiver=None, dev=False, **kwargs):
         """
         使用接收器获取当前运行实例的输出
         """
@@ -245,33 +201,40 @@ class Job(object):
             self.__sender = receiver
         if self.__receiver is None:
             self.__receiver = MessageStreamReceiver(self, dev)
-        self.__receiver.connect(**kwargs)
+        await self.__receiver.connect(**kwargs)
         return self.__receiver
 
-    def write(self,sender=None, dev=False, **kwargs)->MessageStreamSender:
+    async def write(self, sender=None, dev=False, **kwargs) -> MessageStreamSender:
         """
-            使用发送器为当前运行实例输入
+        使用发送器为当前运行实例输入
         """
-        
+
         if sender is not None:
             self.__sender = sender
         if self.__sender is None:
-            self.__sender =MessageStreamSender(self,dev)
-        self.__sender.connect(**kwargs)
+            self.__sender = MessageStreamSender(self, dev)
+        await self.__sender.connect(**kwargs)
         return self.__sender
     
+    def status(self):
+        if self.__receiver is not None:
+            return self.__receiver.status
+        return 0
+
     @property
     def result(self):
         """
         获取当前运行实例的输出
         """
-        viewType = getViewClass(self.context[0])
-        return self.view(viewType)
+        if self._result is None:
+            viewType = getViewClass(self.context[0])
+            self._result = asyncio.run(self.view(viewType))
+        return self._result
 
-    def view(self, viewType):
+    async def view(self, viewType):
         """
         获取当前运行实例的输出
         """
-        receiver = self.read()
-        sender=self.write()
-        return viewType(receiver,sender)
+        receiver = await self.read()
+        sender = await self.write()
+        return viewType(receiver, sender)