porting to v2

CHANGELOG.md

@@ -0,0 +1,46 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## 2023-04-20
+
+### Added
+
+- 讓使用者自定要使用V1版本還是V2版本 (#eac7f6f)
+- 新增常數`IOTTALK_VERSION` (#0a21efd)
+
+## 2023-04-18
+
+### Changed
+
+- tablename的命名方式，改成只刪除-O，不刪後面的數字 (#14b45a9)
+
+## 2023-04-12
+
+### Changed
+
+- IoTtalk-v2可使用的dashboard(dynamic) (#a2fe8a6)
+
+## 2023-04-10
+
+### Added
+
+- IoTtalk-v2可使用的dashboard(static)(#9ab73b1) 
+
+### Changed
+
+- rename `app0330.py` to `app.py` (#e145710)
+
+## Rule
+每一個軟體的版本必須：
+* 標明日期（要用上面說過的規範）
+* 標明分類（採用英文）。規範如下：  
+* 'Added' 添加的新功能  
+* 'Changed' 功能變更  
+* 'Deprecated' 不建議使用，未來會刪掉  
+* 'Removed' 之前不建議使用的功能，這次真的刪掉了  
+* 'Fixed' 修正的 bug  
+* 'Security' 修正了安全相關的 bug

app/api.py

@@ -527,7 +527,8 @@ def api_sensor():
         if sensor_record > 0:
             return 'The sensor name "{}" or df_name "{}" already exists'.format(name, df_name), 404
 
-        db.inject_new_model(re.sub(r'-O[\d]*$', '', df_name))
+        #db.inject_new_model(re.sub(r'-O[\d]*$', '', df_name))
+        db.inject_new_model(re.sub(r'-O', '', df_name))
 
         new_sensor = db.models.sensor(df_name=df_name,
                                       name=request.json.get('name'),
@@ -563,7 +564,8 @@ def api_sensor():
         if sensor_record > 0:
             return 'The sensor name "{}" or df_name "{}" already exists'.format(name, df_name), 404
 
-        db.inject_new_model(re.sub(r'-O[\d]*$', '', df_name))
+        #db.inject_new_model(re.sub(r'-O[\d]*$', '', df_name))
+        db.inject_new_model(re.sub(r'-O', '', df_name))
 
         (g.session
           .query(db.models.sensor)

app/templates/base/css.html

@@ -11,4 +11,4 @@
 <!--[if lt IE 9]>
 <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
 <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-<![endif]-->
+<![endif]-->

config.py

@@ -18,7 +18,12 @@
 
 # IoTtalk server's 'IP' or 'DomainName' only, without any protocol 'http://' or 'https://'.
 # ex: '8.8.8.8' or 'google.com',
+# if you want to use IoTtalk V1 :
 CSM_HOST = '127.0.0.1:9999'
+IOTTALK_VERSION = 1
+# if you want to use IoTtalk V2 :
+#CSM_HOST = 'https://iottalk2.tw/csm'
+#IOTTALK_VERSION = 2
 
 # For the demo page without login
 # The data format is '<Field Name>':'<token>', examples are shown as follows.

da/sa.py

@@ -0,0 +1,103 @@
+import time
+import logging
+import re
+from datetime import datetime
+from db import db
+from iottalkpy.dai import module_to_sa
+from config import CSM_HOST as host
+
+log = logging.getLogger("\033[1;35m[DA]: \033[0m")
+
+
+def on_register(dan):
+    print('register successfully')
+
+
+class SaClass:
+    def __init__(self, host, field, field_id, profile={}, odf_list=[],
+                 alert_range={}, device_addr=None, **kwargs):
+        self.host = host
+        self.field = field
+        self.field_id = field_id
+        self.profile = profile
+        self.odf_list = odf_list
+        self.alert_range = alert_range
+        self.device_addr = device_addr
+        self.device_name = field.name + '_DataServer'
+        self.api_url = host   # get from config CSM_HOST
+        self.device_model = 'DataServer'
+        self.push_interval = 10
+        self.interval = {'Dummy_Sensor': 3, }
+        self.kwargs = kwargs
+
+        for k, v in kwargs.items():
+            setattr(self, k, v)
+
+        for odf in odf_list:
+            odf = re.sub(r'-', r'_', odf)
+            setattr(self, odf, lambda data, odf=odf: self.run(data, odf))
+
+    def run(self, data: list, odf):
+        try:
+            session = db.get_session()
+            if data:
+                value = float(data[0])
+                odf_class = getattr(db.models, re.sub(r"[-_]O", "", odf))
+                new_record = odf_class(timestamp=datetime.now(),
+                                       field=self.field_id,
+                                       value=value)
+                session.add(new_record)
+                session.commit()
+
+        except KeyboardInterrupt:
+            log.info(self.field, ': exit')
+        except Exception as e:
+            log.error('[ERROR]:', str(e))
+            if str(e).find('mac_addr not found:') != -1:
+                log.error('Reg_addr is not found. Try to re-register...')
+            else:
+                log.error('Connection failed due to unknow reasons.')
+                time.sleep(1)
+        finally:
+            session.close()
+
+
+def main():
+    db.connect()
+    processes = []
+
+    session = db.get_session()
+
+    for field in (session.query(db.models.field).all()):
+        profile = {'d_name': field.name + '_DataServer',
+                   'dm_name': 'DataServer',
+                   'odf_list': [],
+                   'is_sim': False}
+        alert_range = {}
+        query_df = (session.query(db.models.field_sensor)
+                           .select_from(db.models.field_sensor)
+                           .join(db.models.sensor)
+                           .filter(db.models.field_sensor.field == field.id)
+                           .all())
+        for df in query_df:
+            profile['odf_list'].append(df.df_name)
+            alert_range[df.df_name] = {'min': df.alert_min,
+                                       'max': df.alert_max}
+        sa = SaClass(host, field, field.id,
+                     profile=profile,
+                     odf_list=profile['odf_list'],
+                     aler_range=alert_range)
+
+        process = module_to_sa(sa)
+        process.daemon = True
+        process.start()
+        processes.append(process)
+
+    session.close()
+
+    for process in processes:
+        process.join()
+
+
+if __name__ == "__main__":
+    main()

requirements.txt

@@ -29,3 +29,5 @@ pymysql~=0.10.1
 tzlocal~=2.1
 
 MarkupSafe==2.0.1
+
+iottalk-py==2.3.1

server.py

@@ -47,7 +47,10 @@ def _start_server():
 
 
 def _start_da():
-    from da.DAI import main as da
+    if config.IOTTALK_VERSION == 1:
+    	from da.DAI import main as da
+    elif config.IOTTALK_VERSION == 2:
+    	from da.app import main as da
     da()