Merge branch 'develop'

CHANGELOG.md

@@ -5,9 +5,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
 ### Added
+- 
 ### Changed
+- updated dockerfiles to reduce images size
+- updated command actions in myems-api
 ### Fixed
+-
 ### Removed
+-
 
 ## [v4.12.0] - 2024-12-21
 ### Added

myems-admin/Dockerfile

@@ -1,6 +1,6 @@
 FROM nginx:latest
 
-RUN apt update && apt install -y nano telnet
+# RUN apt update && apt install -y nano telnet
 
 # remove the default config
 RUN rm /etc/nginx/conf.d/default.conf && \

myems-aggregation/Dockerfile

@@ -1,6 +1,6 @@
 FROM python:3.10-slim
 
-RUN apt update && apt install -y nano telnet
+# RUN apt update && apt install -y nano telnet
 
 WORKDIR /app
 COPY . /app

myems-api/Dockerfile

@@ -1,6 +1,6 @@
 FROM python:3.10-slim
 
-RUN apt update && apt install -y nano telnet
+# RUN apt update && apt install -y nano telnet
 
 # todo: share upload folder with admin container on Docker
 

myems-api/core/command.py

@@ -79,7 +79,7 @@ def on_post(req, resp):
                 len(str.strip(new_values['data']['topic'])) == 0:
             raise falcon.HTTPError(status=falcon.HTTP_400, title='API.BAD_REQUEST',
                                    description='API.INVALID_TOPIC')
-        topic = str.lower(str.strip(new_values['data']['topic']))
+        topic = str.strip(new_values['data']['topic'])
 
         if 'payload' not in new_values['data'].keys() or \
                 not isinstance(new_values['data']['payload'], str) or \
@@ -331,7 +331,7 @@ def on_put(req, resp, id_):
                 len(str.strip(new_values['data']['topic'])) == 0:
             raise falcon.HTTPError(status=falcon.HTTP_400, title='API.BAD_REQUEST',
                                    description='API.INVALID_TOPIC')
-        topic = str.lower(str.strip(new_values['data']['topic']))
+        topic = str.strip(new_values['data']['topic'])
 
         if 'payload' not in new_values['data'].keys() or \
                 not isinstance(new_values['data']['payload'], str) or \
@@ -439,8 +439,6 @@ def on_put(req, resp, id_):
                  " WHERE id = %s ")
         cursor.execute(query, (id_,))
         row = cursor.fetchone()
-        cursor.close()
-        cnx.close()
 
         if row is None:
             raise falcon.HTTPError(status=falcon.HTTP_404, title='API.NOT_FOUND',
@@ -453,6 +451,16 @@ def on_put(req, resp, id_):
                    "payload": row[4],
                    "set_value": set_value if set_value is not None else row[5]}
 
+        update_row = (" UPDATE tbl_commands "
+                      " SET set_value = %s "
+                      " WHERE id = %s ")
+        cursor.execute(update_row, (set_value,
+                                    id_,))
+        cnx.commit()
+
+        cursor.close()
+        cnx.close()
+
         mqc = None
         try:
             mqc = mqtt.Client(callback_api_version=mqtt.CallbackAPIVersion.VERSION2,
@@ -565,7 +573,7 @@ def on_post(req, resp):
                 len(str.strip(new_values['topic'])) == 0:
             raise falcon.HTTPError(status=falcon.HTTP_400, title='API.BAD_REQUEST',
                                    description='API.INVALID_TOPIC')
-        topic = str.lower(str.strip(new_values['topic']))
+        topic = str.strip(new_values['topic'])
 
         if 'payload' not in new_values.keys() or \
                 not isinstance(new_values['payload'], str) or \

myems-cleaning/Dockerfile

@@ -1,6 +1,6 @@
 FROM python:3.10-slim
 
-RUN apt update && apt install -y nano telnet
+# RUN apt update && apt install -y nano telnet
 
 WORKDIR /app
 COPY . /app

myems-normalization/Dockerfile

@@ -1,6 +1,6 @@
 FROM python:3.10-slim
 
-RUN apt update && apt install -y nano telnet
+# RUN apt update && apt install -y nano telnet
 
 WORKDIR /app
 COPY . /app

myems-web/Dockerfile

@@ -16,7 +16,7 @@ RUN npm run build
 
 FROM nginx:latest AS production-stage
 
-RUN apt update && apt install -y nano telnet
+# RUN apt update && apt install -y nano telnet
 
 # remove the default config
 RUN rm /etc/nginx/conf.d/default.conf && rm /etc/nginx/nginx.conf