[update] fix import path

python/biopro/api/controller.py

@@ -18,9 +18,10 @@ class ControllerAPI():
     @staticmethod
     def getByMac(mac_address):
         try:
-            ret = requests.get(API_URL + 'api/controller/get_by_mac/' + mac_address, headers= AuthAPI.get_key())
-            if ret.status_code == 200:
-                return ret.json()
+            if mac_address != None:
+                ret = requests.get(API_URL + 'api/controller/get_by_mac/' + mac_address, headers= AuthAPI.get_key())
+                if ret.status_code == 200:
+                    return ret.json()
         except (requests.exceptions.ConnectionError, json.decoder.JSONDecodeError) as e:
             print('get controller fail', e)
         return []

python/biopro/controller.py

@@ -1576,6 +1576,11 @@ class ControlAPI(metaclass=Router):
         should handle this exit code and re-run server process.
         """
         raise NotImplementedError()
+    
+    def run_project(self, project) -> bool:
+        print('create_project', project)
+        self._project_manager.create(project)
+        return False
 
 
 # noinspection PyAbstractClass

python/biopro/device/manager.py

@@ -562,6 +562,7 @@ class DeviceManager(MasterDevice, Synchronized):
 
     @logging_verbose
     def get_device(self, device: Union[int, DeviceInfo]) -> Optional[CompletedDevice]:
+        print('get_device', device)
         """get connected device
 
         :param device: device ID or response info
@@ -574,7 +575,7 @@ class DeviceManager(MasterDevice, Synchronized):
 
         elif isinstance(device, str):
             for slave in self._device:
-                if ':'.join('{:02x}'.format(b) for b in slave.mac_address) == device:
+                if ':'.join('{:02x}'.format(b) for b in slave.mac_address) == device.lower():
                     return slave
 
         elif isinstance(device, DeviceInfo):

python/biopro/devlib/data.py

@@ -889,12 +889,14 @@ class I4V4Z4T4DataDecoder(RecDataDecoder):
         cycle_number = struct.unpack('>H', data[17:19])[0]
         finish_mode_falg = data[19]
 
+        mem_wrong_information = struct.unpack('>i', data[40:40+4])[0]
+
         # print('decode', list(data[20:]))
-        mem_wrong = data[20]
-        mem_retry_cnt = data[21]
-        mem_green_wrong = data[22]
-        mem_green_retry_cnt = data[23]
-        ram_num = data[24]
+        mem_wrong = data[40]
+        mem_retry_cnt = data[41]
+        mem_green_wrong = data[42]
+        mem_green_retry_cnt = data[43]
+        ram_num = data[44]
         broken_flag = data[-1]
 
         if (finish_mode_falg & 0b11110000 == 0b10100000):
@@ -930,6 +932,7 @@ class I4V4Z4T4DataDecoder(RecDataDecoder):
                 #       '|', '{:5}'.format(mem_retry_cnt),
                 #       '|', '{:5}'.format(mem_green_wrong),
                 #       '|', '{:5}'.format(mem_green_retry_cnt),
+                #       '|', '{:5}'.format(mem_wrong_information),
                 #       '|', '{:5}'.format(ram_num),
                 #       '|', '{:5}'.format(broken_flag),
                 #       '@', str(self.device), '|')
@@ -952,8 +955,9 @@ class I4V4Z4T4DataDecoder(RecDataDecoder):
         # ret.append_data(5, mem_retry_cnt)
         # ret.append_data(6, mem_green_wrong)
         # ret.append_data(7, mem_green_retry_cnt)
-        # ret.append_data(8, ram_num)
-        # ret.append_data(9, broken_flag)
+        ret.append_data(4, ram_num)
+        ret.append_data(5, broken_flag)
+        ret.append_data(6, mem_wrong_information)
         # ret.append_data(4, ram_num)
     
         if cycle_number != self._cycle_number:

python/biopro/devlib/library.py

@@ -1082,6 +1082,11 @@ class CompletedDevice(Device):
         :return: parameter V value
         """
         return self._configuration.get_parameter(name, False)
+    
+    def set_multi_parameters(self, parameter):
+        for (name, value) in parameter[0].items():
+            if name != 'target':
+                self.set_parameter(name, value)
 
     def set_parameter(self, name: str, value: Union[int, str]):
         """replace parameter value with *value*

python/biopro/impl/ext_mem.py

@@ -42,7 +42,7 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
         self._spi = HardwareImplSpiInterface(device,
                                              spi_speed=12_000_000)
 
-        self._elite_data_len = 20
+        self._elite_data_len = 40
         self._mem_header_len = 3
         self._mem_tailer_len = 8
         self._single_data_len = self._elite_data_len + self._mem_header_len + self._mem_tailer_len
@@ -215,7 +215,7 @@ class MultiExtMemSpiInterface(LowLevelHardwareInterface):
             # if (data_second[0] != 255 or data_second[1] != 255 or data_second[2] != 255):
             #     self._head_wrong_cnt[device] = self._head_wrong_cnt[device] + 1
             #     if (self._head_wrong_cnt[device] < 10):
-            #         print('data_first[0:3] != [255, 255, 255], device:', device, ',', self._head_wrong_cnt[device], 'times')
+            #         print('data_second[0:3] != [255, 255, 255], device:', device, ',', self._head_wrong_cnt[device], 'times')
             #         print(list(data_second[0:7]))
 
             # if (data_first[3:] == data_second[3:]):

python/biopro/project/action.py

@@ -0,0 +1,65 @@
+
+class Action():
+    def __init__(self, task, action_id, action):
+        self._task = task
+        self._id:str = action_id
+        self._type:str = action['type']
+        self._target:str = action['target']
+        self._condition_list:list[str] = action['condition']
+        self._duration = action.get('duration', None)
+        self._goto = action.get('goto', None)
+        self._cycle = action.get('cycle', None)
+        
+        self._instruction = None
+
+        self.update_instruction()
+    
+    @property
+    def type(self):
+        return self._type
+
+    def update_instruction(self):
+        self._instruction = {
+            "device_instruction": {
+                "header": "call_instruction",
+                "device": self._target,
+                "arguments": {
+                    "instruction": self._type,
+                }
+            },
+            "device_parameter": {
+                "header": "set_multi_parameters",
+                "device": self._target,
+                "arguments": {
+                    "parameter": self._task.get_parameter_set_by_device(self._target),
+                }
+            },
+            "device_recording_file_name": {
+                "header": "update_recording_file_name_info",
+                "device":  self._target,
+                "arguments": {
+                    "content": self._task.file_name,
+                }
+            },
+            "device_parent": {
+                "header": "update_parent_info",
+                "device":  self._target,
+                "arguments": {
+                    "content": self._task.parent
+                }
+            }
+        }
+
+    def get_condition_list(self):
+        return self._condition_list
+
+    def get_instruction(self, value):
+        return self._instruction[value]
+
+    def get_instruction_list(self):
+        instruction_set = {
+            'start': ['device_parent', 'device_recording_file_name', 'device_parameter', 'device_instruction'],
+            'stop': ['device_instruction'],
+        }
+
+        return map(self.get_instruction, instruction_set[self._type])

python/biopro/project/condition.py

@@ -0,0 +1,75 @@
+from datetime import datetime
+from time import time
+
+class Condition():
+    def __init__(self, id, condition):
+        print('condition', id, condition)
+        self._id = id
+        self._type = condition['type']
+        self._comparsion = condition['comparsion']
+        self._value = condition['value']
+    
+    @property
+    def id(self):
+        return self._id
+    @property
+    def type(self):
+        return self._type
+    @property
+    def comparsion(self):
+        return self._comparsion
+    @property
+    def value(self):
+        return self._value
+    
+    def set_comparsion(self, comparsion):
+        self._comparsion = comparsion
+
+    def set_type(self, type):
+        self._type = type    
+    
+    def set_value(self, value):
+        self._value = value
+
+    def compareWith(self, operator:str, x, y) -> bool:
+        cases = {
+            "equal": lambda a, b: a == b,
+            "bigger": lambda a, b: a > b,
+            "smaller": lambda a, b: a < b,
+        }
+
+        # print('x','y',x, y,type(x),type(y))
+        return cases[operator](x, y)
+
+    def match_or_not(self, **kwargs):
+       return self.method_mapping(self.type)()
+       
+    def absolute_time(self, **kwargs):
+        now = time()
+        time_condition = self.datetime_to_timestamp(self.str_to_datetime(self._value))
+
+        return self.compareWith(self.comparsion, int(now), int(time_condition))
+
+    def relative_time(self, **kwargs):
+        now = time()
+    
+    def device(self, **kwargs):
+        print('device')
+    
+    def task_status(self, **kwargs):
+        print('task_status')
+
+    def method_mapping(self, method_name):
+        methods = {
+        "relative_time": self.relative_time,
+        "absolute_time": self.absolute_time,
+        "device": self.device,
+        "task_status": self.task_status,
+        }
+        return methods[method_name]
+
+    def str_to_datetime(self, time_str):
+        return datetime.strptime(time_str,'%Y-%m-%dT%H:%M')
+
+    def datetime_to_timestamp(self, date):
+        return datetime.timestamp(date)

python/biopro/project/project.py

@@ -0,0 +1,78 @@
+from .task import Task
+from .task_manager import TaskManager
+import sys
+import json
+import threading
+import time
+from datetime import datetime
+from collections import deque
+from biopro.device.manager import DeviceManager
+from biopro.text import *
+
+class Project(threading.Thread):
+  def __init__(self, project, device_manager: DeviceManager, mqttThread = None, name="project"):
+    super(Project, self).__init__(name = name)
+    self._project = project
+    self._device_manager = device_manager
+    self._mqtt_thread = mqttThread
+    self._time_interval = 1
+    self._start_time = None
+
+    self._task_manager = TaskManager(self._project['taskList'])
+
+    self._start_time = None
+    
+  @property
+  def desc(self) -> str:
+    return self._project['desc']
+  
+  @property
+  def status(self) -> str:
+    return self._project['status']
+
+  @property
+  def device(self) -> list:
+    return self._project['deviceList']
+
+  @property
+  def task(self) -> list:
+    return self._task_manager.get()
+
+  @property
+  def get_current_task(self) -> str:
+    return self._task_manager.get_current_task()
+
+  def run(self):
+      self._start_time = time.time()
+
+      while True:
+        # current task
+        for task in self._task_manager.get_check_task_list():
+          # [<match_condition>, ...]
+          match_condition_list = task.check_condition('time')
+          # [[<match_action>, ...], ...]
+          match_action_list = task.get_match_action_list(match_condition_list)
+          
+          for action_list in match_action_list:
+            for action in action_list:
+              if action.type == 'start':
+                self._task_manager.set_current_task(task)
+              task.do_action(action)
+              
+          while len(task.instruction_list) > 0:
+            instruction = task.instruction_list.pop(0)
+            if instruction.get('device', None) != None:
+              device = self._device_manager.get_device(self.device[instruction['device']]['connectDevice']['device_address'])
+
+              if device is None:
+                  raise RuntimeError(DEVICE_NOT_FOUND, device)
+                
+              # print(instruction['header'], *instruction['arguments'].values())
+              getattr(device, instruction['header'])(*instruction['arguments'].values()) 
+
+        time.sleep(self._time_interval)
+  def stop(self):
+    return
+
+  def close(self):
+    return

python/biopro/project/project_manager.py

@@ -0,0 +1,33 @@
+from io import StringIO
+from json import loads as json_parse, dumps as _json_stringify
+from typing import Dict, Optional, Any
+import paho.mqtt.client as mqtt
+from .project import Project
+from biopro.device.manager import DeviceManager
+
+def json_stringify(o: Any) -> str:
+    return _json_stringify(o, separators=(',', ':'))
+
+class ProjectManager():
+    def __init__(self, device_manager: DeviceManager, mqtt_thread=None) :
+        self._project_list = []
+        self._mqtt_thread =  mqtt_thread
+        self._device_manager = device_manager
+    
+    def create(self, project):
+      new_project = Project(project, self._device_manager, self._mqtt_thread)
+      self._project_list.append(new_project)
+      return new_project
+    
+    def remove(self, index):
+      self._project_list[index].stop()
+      del self._project_list[index]
+
+    def get(self):
+      return self._project_list
+
+    def run(self, project):
+      project.start()
+
+    def stop(self, project):
+      project.stop()

python/biopro/project/task.py

@@ -0,0 +1,168 @@
+from .condition import Condition
+from .action import Action
+from time import time
+
+class Task:
+  def __init__(self, task):
+    self._task = task
+
+    self._condition_list = []
+    self._action_list = []
+
+    self._start_time = time()
+    self._idle_time = []
+    self._period = None
+    self._next_time = None
+    self._last_time = None
+
+    self._instruction_list = []
+
+    self.setup()
+  
+  def setup(self) -> None:
+    # add condition
+    for key, condition in self._task['condition'].items():
+      new_condition = Condition(key, condition)
+      self._condition_list.append(new_condition)
+    
+    # add action
+    for key, action in self._task['action'].items():
+      new_action = Action(self, key, action)
+      self._action_list.append(new_action)
+
+  @property
+  def id(self) -> str:
+    return self._task['id']
+  
+  @property
+  def file_name(self):
+    return self._task['name']
+
+  @property
+  def parent(self):
+    return self._task.get('parent', {"folder": [2]})
+
+  @property
+  def instruction_list(self):
+    return self._instruction_list
+
+  @property
+  def cycle(self) -> int:
+    return self._task['cycle']
+
+  @property
+  def order(self) -> int:
+    return self._task['order']
+
+  @property
+  def max_cycle(self) -> int:
+    return self._task['max_cycle']
+  
+  @property
+  def devices(self) -> dict:
+    return self._task['devices']
+
+  @property
+  def devices_id(self) -> list:
+    return [device_id for device_id in self.devices]
+  
+  @property
+  def events(self) -> list:
+    return self._task['events']
+
+  @property
+  def triggers(self) -> list:
+    return self._task['triggers']
+  
+  @property
+  def parameter_set(self) -> list:
+    return self._task['parameterSet']
+  
+  @property
+  def instructions(self) -> list:
+    return self._task['instructions']
+
+  @property
+  def conditions(self) -> list:
+    return self._task['conditions']
+  
+  @property
+  def actions(self) -> list:
+    return self._task['actions']
+
+  @property
+  def condition_list(self) -> list:
+    return self._condition_list
+
+  @property
+  def status(self) -> str:
+    return self._task['status']
+  
+  @property
+  def uuid(self) -> str:
+    return self._task['uuid']
+  
+  @property
+  def next(self) -> str:
+    return self._task['next']
+    
+  def get_parameter_set_by_device(self, device):
+     return [parameter_set for parameter_set in self.parameter_set.values() if device == parameter_set['target']]
+
+  def get_parameter(self, name_or_value, device):
+    name_list = []
+    value_list = []
+    for parameter in self.get_parameter_set_by_device(device):
+      for key, value in parameter.items():
+        if key != 'target':
+          name_list.append(key)
+          value_list.append(str(value))
+
+    return '|'.join(name_list) if name_or_value == 'name' else '|'.join(value_list)
+  
+  def run(self):
+    self._status = 'running'
+    self._start_time = time()
+
+  def pause(self):
+    self._status = 'pause'
+
+  def set_cycle(self, cycle):
+    self._cycle = cycle
+
+  def set_status(self, status):
+    self._status = status
+  
+  def start(self):
+    self.set_status('running')
+  
+  def stop(self):
+    if self.status == 'running':
+      self.do_action('stop')
+    self.set_status('idle')
+
+  def done(self):
+    self.set_status('done')
+  
+  def end(self):
+    self.set_status('end')
+
+  def get_match_action_list(self, match_condition_list):
+    return map(lambda condition: [x for x in self._action_list if condition.id in x.get_condition_list()], match_condition_list)
+
+  def do_action(self, action): 
+    # # match_action = [x for x in self._action_list if condition_id in x.get_condition_list()]
+
+    # for action in match_action:
+    for instruction in action.get_instruction_list():
+      self._instruction_list.append(instruction)
+
+  def status_mapping(self, status):
+    statuses = {
+      "start": self.task_start,
+      "done": self.task_done,
+    }
+    return statuses[status]
+
+  def check_condition(self, type):
+    return [condition for condition in self._condition_list if  condition.match_or_not()]

python/biopro/project/task_manager.py

@@ -0,0 +1,56 @@
+from json import loads as json_parse, dumps as _json_stringify
+from typing import Dict, Optional, Any
+from xml.dom.expatbuilder import parseString
+import paho.mqtt.client as mqtt
+from biopro.text import *
+from .task import Task
+
+_RUNTIME_COMPILE = False
+
+def json_stringify(o: Any) -> str:
+    return _json_stringify(o, separators=(',', ':'))
+
+class TaskManager():
+    def __init__(self, task_list):
+      self._current_task = None
+      self._task_list = []
+      self._need_to_check_task_list = []
+
+      for task in task_list:
+        task = Task(task) 
+        self._task_list.append(task)
+      
+      self.set_current_task(self._task_list[0])
+      self._current_task.run()
+    
+    def remove(self, index):
+      pass
+
+    def get_task(self, task_id):
+      return self._task_list[task_id]
+
+    def get_check_task_list(self):
+      return self._need_to_check_task_list
+
+    def get_current_task(self) -> Task:
+      return self._current_task
+
+    def get_next_task(self):
+      return  self._current_task.next
+
+    def set_current_task(self, task):
+      try:
+        if self._current_task != None and self._current_task.id != task.id:
+          self._current_task.stop()
+
+        self._current_task = task
+        self._need_to_check_task_list = []
+        # append current task
+        self._need_to_check_task_list.append(self._current_task)
+
+        # append next task
+        for task_uuid in self._current_task.next:
+          task = next((task for task in self._task_list if task.uuid == task_uuid), None)
+          self._need_to_check_task_list.append(task)
+      except Exception as e:
+        print(e)

python/biopro/server/controller.py

@@ -1335,3 +1335,6 @@ def to_device_info(content: Union[str, ADDRESS, JSON_OBJECT]) -> DeviceResponseI
     return DeviceResponseInfo(None,
                               serial_number=serial,
                               mac_address=address)
+
+def run_project(self, project) -> bool:
+    return False

python/biopro/server/main.py

@@ -30,6 +30,7 @@ from .api import ApiRequests
 from biopro.api.auth import AuthAPI
 from biopro.api.controller import ControllerAPI
 from biopro.api.device import DeviceAPI
+from biopro.project.project_manager import ProjectManager
 ### do not import Websocket mode
 ###from .websocket import WebsocketThread
 
@@ -154,7 +155,8 @@ class ControlServer(SocketServer, ControlServerAPI, CacheAPI, CacheNotifyHandler
         # _api request build
         self._api = ApiRequests()
 
-        
+        self._project_manager = ProjectManager(self.device_manager, self.mqtt_thread)
+
 
     # init method
 
@@ -193,6 +195,11 @@ class ControlServer(SocketServer, ControlServerAPI, CacheAPI, CacheNotifyHandler
     def device_manager(self) -> DeviceManager:
         return self._device_manager
 
+    @property
+    def project_manager(self) -> ProjectManager:
+        return self._project_manager
+
+
     # server setup
 
     def setup(self) -> None:
@@ -307,8 +314,15 @@ class ControlServer(SocketServer, ControlServerAPI, CacheAPI, CacheNotifyHandler
         if len(controller) == 0:
             ControllerAPI.create(hardware_info)
         elif len(controller) > 0:
-            if hardware_info['mac_address'] != controller[0]['mac_address'] or hardware_info['software_version'] != controller[0]['software_version'] or hardware_info['mqtt_id'] != controller[0]['mqtt_id']:
-                ControllerAPI.updateByAttrs('mac_address', hardware_info['mac_address'], {'software_version': hardware_info['software_version'], 'mqtt_id': mqtt_id })
+            if hardware_info['mac_address'] != controller[0]['mac_address'] or hardware_info['software_version'] != controller[0]['software_version'] or hardware_info['mqtt_id'] != controller[0]['mqtt_id'] or  hardware_info['wifi_name'] != controller[0]['wifi_name']:
+                ControllerAPI.updateByAttrs (
+                    'mac_address', hardware_info['mac_address'], {
+                        'software_version': hardware_info['software_version'],
+                        'mqtt_id': mqtt_id,
+                        'name': hardware_info['name'],
+                        'wifi_name': hardware_info['wifi_name']
+                    }
+                )
 
     def _setup_device(self):
         # wait data server
@@ -1312,6 +1326,12 @@ class ControlServer(SocketServer, ControlServerAPI, CacheAPI, CacheNotifyHandler
         # p = self.exp_manager.create_protocol(content, user_name)
         return
 
+    @logging_info
+    def run_project(self, project) -> bool:
+        project = self._project_manager.create(project)
+        self._project_manager.run(project)
+        return False
+
     # @logging_info
     # def exp_pro_options(self, protocol: int) -> List[ExpOption]:
     #     return self.exp_manager.protocol_options(protocol)

python/biopro/server/recording.py

@@ -363,13 +363,13 @@ class RecordingProcess(Process):
                     if (device == 7):
                         print('self._last_cnt[7]:', self._last_cnt[7], ', last_data_cnt:', last_data_cnt)
                         
-                    print('skip RAM, but data is right, solve data', list(raw_data[i]), 'skip Ram', self._skip_ram_cnt, 'times')
-                    print('data:')
-                    print('|', list(raw_data[0]))
-                    print('|', list(raw_data[1]))
-                    print('| ... ... ...')
-                    print('| ... ... ...')
-                    print('|', list(raw_data[colum_total-1]))
+                    print('skip RAM, but data is right, solve data', list(raw_data[i][0:3]), 'skip Ram', self._skip_ram_cnt, 'times')
+                    # print('data:')
+                    # print('|', list(raw_data[0]))
+                    # print('|', list(raw_data[1]))
+                    # print('| ... ... ...')
+                    # print('| ... ... ...')
+                    # print('|', list(raw_data[colum_total-1]))
                     print()
 
                     if (device == 4):
@@ -498,7 +498,7 @@ class RecordingProcess(Process):
         """
         raw_data = []
         index = 0
-        elite_data_len = 20
+        elite_data_len = 40
         mem_header_len = 3
         mem_tailer_len = 8
         single_data_len = elite_data_len + mem_header_len + mem_tailer_len
@@ -542,11 +542,11 @@ class RecordingProcess(Process):
                 print_flag = True
                 print('delete data:', list(raw_data[i]))
 
-        if print_flag:
-            print('delete data context:')
-            for i in range(0, len(data), single_data_len):
-                print(list(data[i:i+single_data_len]))
-            print()
+        # if print_flag:
+        #     print('delete data context:')
+        #     for i in range(0, len(data), single_data_len):
+        #         print(list(data[i:i+single_data_len]))
+        #     print()
 
         return