From 1b9e7ddd714b570057f80851312b37b94c9c0ab4 Mon Sep 17 00:00:00 2001
From: Sughiya-AlSaid <162094061+Sughiya-AlSaid@users.noreply.github.com>
Date: Wed, 1 May 2024 10:12:37 +0400
Subject: [PATCH 1/8] Package Measurement Conversion API 46

---
 .gitignore                                    |   2 +
 .../Utilities/__init__.py                     |   0
 .../Utilities/db.py                           |  38 +++++++++
 .../__init__.py                               |   0
 .../controller/measurement_controller.py      |  49 +++++++++++
 Package_Measurement_Conversion_API/readme.md  |  76 ++++++++++++++++++
 .../requirements.txt                          |   3 +
 .../services/__init__.py                      |   0
 .../services/converter.py                     |  65 +++++++++++++++
 .../services/test/__init__.py                 |   0
 .../services/test/test_converter.py           |  25 ++++++
 conversion_history.db                         | Bin 0 -> 8192 bytes
 main_app.py                                   |  15 ++++
 13 files changed, 273 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 Package_Measurement_Conversion_API/Utilities/__init__.py
 create mode 100644 Package_Measurement_Conversion_API/Utilities/db.py
 create mode 100644 Package_Measurement_Conversion_API/__init__.py
 create mode 100644 Package_Measurement_Conversion_API/controller/measurement_controller.py
 create mode 100644 Package_Measurement_Conversion_API/readme.md
 create mode 100644 Package_Measurement_Conversion_API/requirements.txt
 create mode 100644 Package_Measurement_Conversion_API/services/__init__.py
 create mode 100644 Package_Measurement_Conversion_API/services/converter.py
 create mode 100644 Package_Measurement_Conversion_API/services/test/__init__.py
 create mode 100644 Package_Measurement_Conversion_API/services/test/test_converter.py
 create mode 100644 conversion_history.db
 create mode 100644 main_app.py

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2483976
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.idea/
+__pycache__/
diff --git a/Package_Measurement_Conversion_API/Utilities/__init__.py b/Package_Measurement_Conversion_API/Utilities/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/Package_Measurement_Conversion_API/Utilities/db.py b/Package_Measurement_Conversion_API/Utilities/db.py
new file mode 100644
index 0000000..8e8ac2a
--- /dev/null
+++ b/Package_Measurement_Conversion_API/Utilities/db.py
@@ -0,0 +1,38 @@
+import sqlite3
+
+
+class MeasurementsDB(object):
+    def __init__(self, name_db='conversion_history.db'):
+        self.name_db = name_db
+        self.conn = sqlite3.connect(self.name_db, check_same_thread=False)
+        self.cursor = self.conn.cursor()
+        self.create_table()
+
+    def create_table(self):
+        # Create the table that will store the conversion history
+        self.cursor.execute('''
+            CREATE TABLE IF NOT EXISTS conversion_history (
+                id INTEGER PRIMARY KEY,
+                input TEXT,
+                output TEXT,
+                timestamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+            )
+        ''')
+        self.conn.commit()
+
+    def save_table(self, input_str, output_str):
+        # Save the conversion history in the table
+        output_str = str(output_str)
+        self.cursor.execute('INSERT INTO conversion_history (input, output) VALUES (?, ?)', (input_str, output_str))
+        self.conn.commit()
+
+    def display_table(self):
+        # Display the conversion history from the table
+        conversion_history = []
+        self.cursor.execute("SELECT input, output FROM conversion_history ORDER BY timestamp DESC")
+        rows = self.cursor.fetchall()
+        for row in rows:
+            data = {'input': row[0], 'output': row[1]}
+            conversion_history.append(data)
+        # conversion_history = [{'input': row[0], 'output': row[1]} for row in rows]
+        return conversion_history
diff --git a/Package_Measurement_Conversion_API/__init__.py b/Package_Measurement_Conversion_API/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/Package_Measurement_Conversion_API/controller/measurement_controller.py b/Package_Measurement_Conversion_API/controller/measurement_controller.py
new file mode 100644
index 0000000..1756c02
--- /dev/null
+++ b/Package_Measurement_Conversion_API/controller/measurement_controller.py
@@ -0,0 +1,49 @@
+import cherrypy
+import logging
+
+from Package_Measurement_Conversion_API.services.converter import Measurements
+from Package_Measurement_Conversion_API.Utilities.db import MeasurementsDB
+db_manager = MeasurementsDB("conversion_history.db")
+Measure = Measurements()
+
+# Configure logging
+logging.basicConfig(level=logging.DEBUG)  # Set logging level to DEBUG
+
+
+class MeasurementService(object):
+
+    @cherrypy.expose
+    @cherrypy.tools.json_out()
+    # This function will display the conversion input and output history
+    def get_data_from_db(self):
+        # Fetch data from the database
+        # query = "SELECT * FROM conversion_history"
+        table = db_manager.display_table()
+        print(table)
+        return table
+
+    @cherrypy.expose
+    @cherrypy.tools.json_out()
+    # This function will display the converted alphabet input into list of numbers
+    def convert_measurements(self, input_string):
+        logging.debug(f"Received input: {input_string}")
+        try:
+            # Ensure input_string is a string
+            if not isinstance(input_string, str):
+                raise ValueError("Input must be a string.")
+
+            converted_data = Measure.convert_measurements(input_string)
+            return converted_data  # Returning JSON response
+        except Exception as e:
+            logging.exception("Error in convert_measurements:")
+            return {"error": str(e)}  # Return error message as JSON
+
+    @cherrypy.expose
+    @cherrypy.tools.json_out()
+    # This function will display the results of the list of numbers
+    def conversion_results(self, input_string):
+        # converted_data = Measure.convert_measurements(input_string)
+        output_str = Measure.measurement_results(input_str=input_string)
+        db_manager.save_table(input_str=input_string, output_str=output_str)
+        # print(results)
+        return output_str
diff --git a/Package_Measurement_Conversion_API/readme.md b/Package_Measurement_Conversion_API/readme.md
new file mode 100644
index 0000000..ba3bc0e
--- /dev/null
+++ b/Package_Measurement_Conversion_API/readme.md
@@ -0,0 +1,76 @@
+# Package Measurement Conversion API
+
+This API is designed to convert measurement input strings into a list of total values of measured inflows for each package. The input strings follow a specific encoding format, where each package consists of a number indicating the count of values measured in each measurement cycle, followed by the measured values encoded using alphabetical characters.
+
+## Pre-requisites
+
+- Python 3.x
+- CherryPy
+- SQLite
+
+## Installation
+
+### 1. Clone the repository: 
+
+    https://github.com/Sughiya-AlSaid/PackageMeasurementConversionAPI
+
+
+### 2. Navigate to the project directory:
+
+    cd Package_Measurement_Conversion_API
+
+### 3. Install the required dependencies:
+   
+      pip install -r requirements.txt
+
+## Running the Application
+
+### 1. Start the server application:
+
+      python main_app.py [port_number]
+
+Replace `[port_number]` with the desired port number. If no port number is provided, the application will run on the default port.
+
+### 2. The server will start, and you should see log messages indicating the application's status.
+
+## API Usage
+### 1. To view the converted alphabet input string into the corresponding list of numbers in JSON format.
+
+The API provides a GET endpoint `/convert_measurements` that accepts a query parameter `input` containing the measurement input string.
+
+### Example requests:
+
+    GET /convert_measurements?input="aa"
+
+    GET /convert_measurements?input="abbcc"
+
+    GET /convert_measurements?input="dz_a_aazzaaa"
+
+### 2. To view the list of total values of the parsed string and return the result in JSON format.
+
+The API provides a GET endpoint `/conversion_results` that accepts a query parameter `input` containing the measurement input string.
+
+### Example requests:
+
+    GET /conversion_results?input="aa"
+
+    GET /conversion_results?input="abbcc"
+
+    GET /conversion_results?input="dz_a_aazzaaa"
+### To retrieve the stored request history, use the following endpoint:
+
+    GET /get_data_from_db
+
+This endpoint will return the persisted history of all requests made to the conversion endpoint.
+
+## Testing
+
+The application follows the principles of Test-Driven Development (TDD). Unit tests are provided in the `test/` directory. To run the tests, execute the following command:
+
+    python -m unittest Package_Measurement_Conversion_API/test/test_converter.py
+
+## Contributing
+Contributing to this project is **prohibited**.
+
+## Acknowledgements
+This project was done by **Sughiya Al Said**
\ No newline at end of file
diff --git a/Package_Measurement_Conversion_API/requirements.txt b/Package_Measurement_Conversion_API/requirements.txt
new file mode 100644
index 0000000..2a13a41
--- /dev/null
+++ b/Package_Measurement_Conversion_API/requirements.txt
@@ -0,0 +1,3 @@
+CherryPy==18.6.0
+SQLAlchemy==1.4.31
+pytest==7.1.2
diff --git a/Package_Measurement_Conversion_API/services/__init__.py b/Package_Measurement_Conversion_API/services/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/Package_Measurement_Conversion_API/services/converter.py b/Package_Measurement_Conversion_API/services/converter.py
new file mode 100644
index 0000000..5d4b588
--- /dev/null
+++ b/Package_Measurement_Conversion_API/services/converter.py
@@ -0,0 +1,65 @@
+class Measurements(object):
+    def __init__(self):
+        pass
+
+    def convert_measurements(self, input_string):
+        # Initialize the results list and the current sum.
+        results = []
+        current_sum = 0
+
+        # Keep track of the count for each input
+        input_count = 0
+
+        # Loop through each character in the input string.
+        for char in input_string:
+            if char == '_':
+                # When facing an underscore, append the current sum to results then reset it to 0.
+                results.append(current_sum)
+                current_sum = 0
+                input_count = 0
+            elif 'a' <= char <= 'z':
+                # Convert the alphabet to their number value (a=1, b=2, etc..).
+                input_count += 1
+                current_sum += ord(char) - ord('a') + 1
+
+            if input_count > 0 and current_sum > 0:
+                # append the sum to the result list if input_count and current sum have a value
+                results.append(current_sum)
+                current_sum = 0
+                input_count = 0
+
+        return results
+
+    def measurement_results(self, input_str):
+        # Convert the input str from the url into a list of numbers then start the count
+
+        list_of_num = self.convert_measurements(input_str)
+        result_input_list = []
+        is_a_step = True  # First character/number = step one.
+        step_count_remaining = 0  # Set the count as soon as the number is encountered.
+        curr_input_sum = 0  # continue adding the values until remaining step count != 0
+
+        for curr_num in list_of_num:
+            if is_a_step:
+                if curr_num == 26:  # Check if current character is Z count
+                    step_count_remaining += curr_num
+                elif curr_num == 0:  # Check if current Character is underscore
+                    result_input_list.append(0)
+                    break
+                else:
+                    step_count_remaining += curr_num
+                    is_a_step = False
+            elif step_count_remaining > 0:
+                if curr_num == 26:
+                    curr_input_sum += curr_num
+                else:
+                    curr_input_sum += curr_num
+                    step_count_remaining -= 1
+
+            if step_count_remaining == 0:  # append the measurement result then reset the count before exiting
+                result_input_list.append(curr_input_sum)
+                curr_input_sum = 0
+                step_count_remaining = 0
+                is_a_step = True
+
+        return result_input_list
diff --git a/Package_Measurement_Conversion_API/services/test/__init__.py b/Package_Measurement_Conversion_API/services/test/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/Package_Measurement_Conversion_API/services/test/test_converter.py b/Package_Measurement_Conversion_API/services/test/test_converter.py
new file mode 100644
index 0000000..75777e7
--- /dev/null
+++ b/Package_Measurement_Conversion_API/services/test/test_converter.py
@@ -0,0 +1,25 @@
+import unittest
+from Package_Measurement_Conversion_API.services.converter import Measurements
+
+
+class TestPackageConverter(unittest.TestCase):
+    # Testing both Valid and Invalid inputs
+
+    def setUp(self):
+        self.converter = Measurements()
+
+    def test_conversion(self):
+        self.assertEqual(self.converter.measurement_results("aa"), [1])
+        self.assertEqual(self.converter.measurement_results("__"), [0])
+        self.assertEqual(self.converter.measurement_results("a_"), [0])
+        self.assertEqual(self.converter.measurement_results('abbcc'), [2, 6])
+        self.assertEqual(self.converter.measurement_results('abcdabcdab'), [2, 7, 7])
+        self.assertEqual(self.converter.measurement_results('abcdabcdab_'), [2, 7, 7, 0])
+        self.assertEqual(self.converter.measurement_results('dz_a_aazzaaa'), [28, 53, 1])
+        self.assertEqual(self.converter.measurement_results('zdaaaaaaaabaaaaaaaabaaaaaaaabbaa'), [34])
+        self.assertEqual(self.converter.measurement_results('za_a_a_a_a_a_a_a_a_a_a_a_a_azaaa'), [40, 1])
+        self.assertEqual(self.converter.measurement_results('zza_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_'), [26])
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/conversion_history.db b/conversion_history.db
new file mode 100644
index 0000000000000000000000000000000000000000..696d7b5e492349ba89139e3b6545e35b0cc05d28
GIT binary patch
literal 8192
zcmeH~PiqrF6u@U=*J{n~wx*>Njf~92Vk$E`yK6F+xYkvINvYc{v;<i;F~vZWlw>Pd
z4<a7@5`F=}t0zx>0l_cfS@0%K3Kh0%vXDzJ@9hrz=lz&B^V@gXooDrK+`$KfVK0g?
zM~g^N&;yJSLMw9Q<TwjO-prjn$m{qyD^}3G{ufPBiv9=569No?0WbgtzyKHk17H9Q
zfB`T72Ef1t7<l(qnO|j0dA}Y<t;0@x(0|n#j=F<>__8~S2gBFtH@QvUa{~_t?!&r=
z(|LSn0iTQR3tZa@yeFQIxBXhf_4n~pZ@-l0`bWnx4!pe}of{m-laq0`*BQl8?+6FA
zhPM;AjcxqMd+hGk1H8HG``%U%{>voFu8;rCm-F9{@zwZfyfOBSvQf}~=|A+(`Um|$
zclDdvZ|%GGNjuc;=6^~M0t|owFaQR?02lxRU;qq&0Wffp2FS9CR@ZpcYPH)<vxJ@J
zCN-@MYHv`6sUsK@%&rzx)VRS<qHyAI5=Bwdq9x4I6VOWa`s@?PMbL6}Y1RpBVOxS%
z$l|npo<g)jjOh@s2$K^%36&EYwgta0s6(`D$Rzn}h>~j=kX*Y%7BV4LAy=~@r+7t0
zO9dW=O?rM`wrqyt{G_zWgl&?`$r8zKvW0{!c1u-Jp}@xtlWZ3GouoVS_MFVG@lfVd
k{Ui}bm=?J-t&W6bDO${(uJwOqn4r9>%-T|xFdbphzeTVY+yDRo

literal 0
HcmV?d00001

diff --git a/main_app.py b/main_app.py
new file mode 100644
index 0000000..7235791
--- /dev/null
+++ b/main_app.py
@@ -0,0 +1,15 @@
+import cherrypy
+
+from Package_Measurement_Conversion_API.controller.measurement_controller import MeasurementService
+
+
+if __name__ == '__main__':
+    config = {
+        '/': {
+            'tools.sessions.on': True,
+            'tools.response_headers.on': True,
+            'tools.response_headers.headers': [('Content-Type', 'application/json')],
+        }
+    }
+    cherrypy.config.update({'server.socket_port': 8080})
+    cherrypy.quickstart(MeasurementService(), '/', config)

From c47fc8b112f22bb175a24bc052493a5a96d7327f Mon Sep 17 00:00:00 2001
From: Sughiya-AlSaid <162094061+Sughiya-AlSaid@users.noreply.github.com>
Date: Wed, 1 May 2024 10:28:56 +0400
Subject: [PATCH 2/8] Package Measurement Conversion API 46 update read me

---
 Package_Measurement_Conversion_API/readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Package_Measurement_Conversion_API/readme.md b/Package_Measurement_Conversion_API/readme.md
index ba3bc0e..782b36d 100644
--- a/Package_Measurement_Conversion_API/readme.md
+++ b/Package_Measurement_Conversion_API/readme.md
@@ -67,7 +67,7 @@ This endpoint will return the persisted history of all requests made to the conv
 
 The application follows the principles of Test-Driven Development (TDD). Unit tests are provided in the `test/` directory. To run the tests, execute the following command:
 
-    python -m unittest Package_Measurement_Conversion_API/test/test_converter.py
+    python -m unittest Package_Measurement_Conversion_API/services/test/test_converter.py
 
 ## Contributing
 Contributing to this project is **prohibited**.

From ee71c7ef689c17269c0f0aed05a715fd091aeaa9 Mon Sep 17 00:00:00 2001
From: Sughiya-AlSaid <162094061+Sughiya-AlSaid@users.noreply.github.com>
Date: Wed, 1 May 2024 10:53:12 +0400
Subject: [PATCH 3/8] Package Measurement Conversion API 46 update paths

---
 .../Logging/error_log.log                     |  28 ++++++++++++++++++
 .../Utilities/db.py                           |   1 +
 .../controller/measurement_controller.py      |   3 +-
 conversion_history.db                         | Bin 8192 -> 8192 bytes
 4 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 Package_Measurement_Conversion_API/Logging/error_log.log

diff --git a/Package_Measurement_Conversion_API/Logging/error_log.log b/Package_Measurement_Conversion_API/Logging/error_log.log
new file mode 100644
index 0000000..6bfb91e
--- /dev/null
+++ b/Package_Measurement_Conversion_API/Logging/error_log.log
@@ -0,0 +1,28 @@
+2024-05-01 10:45:50,257:INFO:[01/May/2024:10:45:50] ENGINE Listening for SIGTERM.
+2024-05-01 10:45:50,257:INFO:[01/May/2024:10:45:50] ENGINE Bus STARTING
+2024-05-01 10:45:50,257:INFO:[01/May/2024:10:45:50] ENGINE Started monitor thread 'Autoreloader'.
+2024-05-01 10:45:50,491:INFO:[01/May/2024:10:45:50] ENGINE Serving on http://127.0.0.1:8080
+2024-05-01 10:45:50,491:INFO:[01/May/2024:10:45:50] ENGINE Bus STARTED
+2024-05-01 10:45:55,758:INFO:127.0.0.1 - - [01/May/2024:10:45:55] "GET /conversion_results?input_string=abbcc HTTP/1.1" 200 6 "" "PostmanRuntime/7.37.3"
+2024-05-01 10:46:10,457:INFO:[01/May/2024:10:46:10] ENGINE Keyboard Interrupt: shutting down bus
+2024-05-01 10:46:10,464:INFO:[01/May/2024:10:46:10] ENGINE Bus STOPPING
+2024-05-01 10:46:10,607:INFO:[01/May/2024:10:46:10] ENGINE HTTP Server cherrypy._cpwsgi_server.CPWSGIServer(('127.0.0.1', 8080)) shut down
+2024-05-01 10:46:10,607:INFO:[01/May/2024:10:46:10] ENGINE Stopped thread 'Autoreloader'.
+2024-05-01 10:46:10,607:INFO:[01/May/2024:10:46:10] ENGINE Bus STOPPED
+2024-05-01 10:46:10,607:INFO:[01/May/2024:10:46:10] ENGINE Bus EXITING
+2024-05-01 10:46:10,607:INFO:[01/May/2024:10:46:10] ENGINE Bus EXITED
+2024-05-01 10:46:10,607:INFO:[01/May/2024:10:46:10] ENGINE Waiting for child threads to terminate...
+2024-05-01 10:48:21,501:INFO:[01/May/2024:10:48:21] ENGINE Listening for SIGTERM.
+2024-05-01 10:48:21,501:INFO:[01/May/2024:10:48:21] ENGINE Bus STARTING
+2024-05-01 10:48:21,502:INFO:[01/May/2024:10:48:21] ENGINE Started monitor thread 'Autoreloader'.
+2024-05-01 10:48:21,736:INFO:[01/May/2024:10:48:21] ENGINE Serving on http://127.0.0.1:8080
+2024-05-01 10:48:21,736:INFO:[01/May/2024:10:48:21] ENGINE Bus STARTED
+2024-05-01 10:48:26,933:INFO:127.0.0.1 - - [01/May/2024:10:48:26] "GET /conversion_results?input_string=abbcc HTTP/1.1" 200 6 "" "PostmanRuntime/7.37.3"
+2024-05-01 10:52:19,637:INFO:[01/May/2024:10:52:19] ENGINE Keyboard Interrupt: shutting down bus
+2024-05-01 10:52:19,637:INFO:[01/May/2024:10:52:19] ENGINE Bus STOPPING
+2024-05-01 10:52:19,820:INFO:[01/May/2024:10:52:19] ENGINE HTTP Server cherrypy._cpwsgi_server.CPWSGIServer(('127.0.0.1', 8080)) shut down
+2024-05-01 10:52:19,820:INFO:[01/May/2024:10:52:19] ENGINE Stopped thread 'Autoreloader'.
+2024-05-01 10:52:19,820:INFO:[01/May/2024:10:52:19] ENGINE Bus STOPPED
+2024-05-01 10:52:19,821:INFO:[01/May/2024:10:52:19] ENGINE Bus EXITING
+2024-05-01 10:52:19,821:INFO:[01/May/2024:10:52:19] ENGINE Bus EXITED
+2024-05-01 10:52:19,821:INFO:[01/May/2024:10:52:19] ENGINE Waiting for child threads to terminate...
diff --git a/Package_Measurement_Conversion_API/Utilities/db.py b/Package_Measurement_Conversion_API/Utilities/db.py
index 8e8ac2a..b4e4297 100644
--- a/Package_Measurement_Conversion_API/Utilities/db.py
+++ b/Package_Measurement_Conversion_API/Utilities/db.py
@@ -9,6 +9,7 @@ def __init__(self, name_db='conversion_history.db'):
         self.create_table()
 
     def create_table(self):
+
         # Create the table that will store the conversion history
         self.cursor.execute('''
             CREATE TABLE IF NOT EXISTS conversion_history (
diff --git a/Package_Measurement_Conversion_API/controller/measurement_controller.py b/Package_Measurement_Conversion_API/controller/measurement_controller.py
index 1756c02..e144697 100644
--- a/Package_Measurement_Conversion_API/controller/measurement_controller.py
+++ b/Package_Measurement_Conversion_API/controller/measurement_controller.py
@@ -7,7 +7,8 @@
 Measure = Measurements()
 
 # Configure logging
-logging.basicConfig(level=logging.DEBUG)  # Set logging level to DEBUG
+logging.basicConfig(filename='Package_Measurement_Conversion_API\Logging\error_log.log', level=logging.CRITICAL,
+                        format='%(asctime)s:%(levelname)s:%(message)s')
 
 
 class MeasurementService(object):
diff --git a/conversion_history.db b/conversion_history.db
index 696d7b5e492349ba89139e3b6545e35b0cc05d28..aa127646162986e254ab088407614043a0d14014 100644
GIT binary patch
delta 63
zcmZp0XmFSy&B#1a#+i|MW5N=C4krF>4E(qGw{0x!<=faG%gCh6G<m(O45yiuiG`Js
QnKC1Y#}4F~TA7*x06PW{z5oCK

literal 8192
zcmeH~PiqrF6u@U=*J{n~wx*>Njf~92Vk$E`yK6F+xYkvINvYc{v;<i;F~vZWlw>Pd
z4<a7@5`F=}t0zx>0l_cfS@0%K3Kh0%vXDzJ@9hrz=lz&B^V@gXooDrK+`$KfVK0g?
zM~g^N&;yJSLMw9Q<TwjO-prjn$m{qyD^}3G{ufPBiv9=569No?0WbgtzyKHk17H9Q
zfB`T72Ef1t7<l(qnO|j0dA}Y<t;0@x(0|n#j=F<>__8~S2gBFtH@QvUa{~_t?!&r=
z(|LSn0iTQR3tZa@yeFQIxBXhf_4n~pZ@-l0`bWnx4!pe}of{m-laq0`*BQl8?+6FA
zhPM;AjcxqMd+hGk1H8HG``%U%{>voFu8;rCm-F9{@zwZfyfOBSvQf}~=|A+(`Um|$
zclDdvZ|%GGNjuc;=6^~M0t|owFaQR?02lxRU;qq&0Wffp2FS9CR@ZpcYPH)<vxJ@J
zCN-@MYHv`6sUsK@%&rzx)VRS<qHyAI5=Bwdq9x4I6VOWa`s@?PMbL6}Y1RpBVOxS%
z$l|npo<g)jjOh@s2$K^%36&EYwgta0s6(`D$Rzn}h>~j=kX*Y%7BV4LAy=~@r+7t0
zO9dW=O?rM`wrqyt{G_zWgl&?`$r8zKvW0{!c1u-Jp}@xtlWZ3GouoVS_MFVG@lfVd
k{Ui}bm=?J-t&W6bDO${(uJwOqn4r9>%-T|xFdbphzeTVY+yDRo


From 1903640451307c1d5f140b56226cd3ba5ec66433 Mon Sep 17 00:00:00 2001
From: Sughiya-AlSaid <162094061+Sughiya-AlSaid@users.noreply.github.com>
Date: Thu, 2 May 2024 08:58:08 +0400
Subject: [PATCH 4/8] Package Measurement Conversion API 46 update output

---
 .../Logging/error_log.log                     |  20 ++++
 .../controller/conversion_history.db          | Bin 0 -> 8192 bytes
 .../controller/measurement_controller.py      |  96 ++++++++++++++----
 conversion_history.db                         | Bin 8192 -> 8192 bytes
 4 files changed, 96 insertions(+), 20 deletions(-)
 create mode 100644 Package_Measurement_Conversion_API/controller/conversion_history.db

diff --git a/Package_Measurement_Conversion_API/Logging/error_log.log b/Package_Measurement_Conversion_API/Logging/error_log.log
index 6bfb91e..fc32144 100644
--- a/Package_Measurement_Conversion_API/Logging/error_log.log
+++ b/Package_Measurement_Conversion_API/Logging/error_log.log
@@ -26,3 +26,23 @@
 2024-05-01 10:52:19,821:INFO:[01/May/2024:10:52:19] ENGINE Bus EXITING
 2024-05-01 10:52:19,821:INFO:[01/May/2024:10:52:19] ENGINE Bus EXITED
 2024-05-01 10:52:19,821:INFO:[01/May/2024:10:52:19] ENGINE Waiting for child threads to terminate...
+2024-05-02 08:56:40,484:INFO:[02/May/2024:08:56:40] ENGINE Listening for SIGTERM.
+2024-05-02 08:56:40,485:INFO:[02/May/2024:08:56:40] ENGINE Bus STARTING
+2024-05-02 08:56:40,486:INFO:[02/May/2024:08:56:40] ENGINE Started monitor thread 'Autoreloader'.
+2024-05-02 08:56:40,705:INFO:[02/May/2024:08:56:40] ENGINE Serving on http://127.0.0.1:8080
+2024-05-02 08:56:40,705:INFO:[02/May/2024:08:56:40] ENGINE Bus STARTED
+2024-05-02 08:56:46,358:INFO:127.0.0.1 - - [02/May/2024:08:56:46] "GET /conversion_results?input_string=abbcc HTTP/1.1" 200 105 "" "PostmanRuntime/7.37.3"
+2024-05-02 08:57:00,053:INFO:[02/May/2024:08:57:00] ENGINE Keyboard Interrupt: shutting down bus
+2024-05-02 08:57:00,053:INFO:[02/May/2024:08:57:00] ENGINE Bus STOPPING
+2024-05-02 08:57:00,207:INFO:[02/May/2024:08:57:00] ENGINE HTTP Server cherrypy._cpwsgi_server.CPWSGIServer(('127.0.0.1', 8080)) shut down
+2024-05-02 08:57:00,208:INFO:[02/May/2024:08:57:00] ENGINE Stopped thread 'Autoreloader'.
+2024-05-02 08:57:00,208:INFO:[02/May/2024:08:57:00] ENGINE Bus STOPPED
+2024-05-02 08:57:00,208:INFO:[02/May/2024:08:57:00] ENGINE Bus EXITING
+2024-05-02 08:57:00,208:INFO:[02/May/2024:08:57:00] ENGINE Bus EXITED
+2024-05-02 08:57:00,208:INFO:[02/May/2024:08:57:00] ENGINE Waiting for child threads to terminate...
+2024-05-02 08:57:29,296:INFO:[02/May/2024:08:57:29] ENGINE Listening for SIGTERM.
+2024-05-02 08:57:29,296:INFO:[02/May/2024:08:57:29] ENGINE Bus STARTING
+2024-05-02 08:57:29,298:INFO:[02/May/2024:08:57:29] ENGINE Started monitor thread 'Autoreloader'.
+2024-05-02 08:57:29,524:INFO:[02/May/2024:08:57:29] ENGINE Serving on http://127.0.0.1:8080
+2024-05-02 08:57:29,524:INFO:[02/May/2024:08:57:29] ENGINE Bus STARTED
+2024-05-02 08:57:32,810:INFO:127.0.0.1 - - [02/May/2024:08:57:32] "GET /conversion_results?input_string=abbcc HTTP/1.1" 200 54 "" "PostmanRuntime/7.37.3"
diff --git a/Package_Measurement_Conversion_API/controller/conversion_history.db b/Package_Measurement_Conversion_API/controller/conversion_history.db
new file mode 100644
index 0000000000000000000000000000000000000000..82fd855586b10bf9f39f0dafc2dc6969ea63a542
GIT binary patch
literal 8192
zcmeI#!Ab)$5C-6+2!deo=5>x1L@0d$V;yC2x72hB_Ec6~G2m{>ZYp>Z@u_?{F?*<>
zi+B{||49gw83=s0%q~+G3cB-knFkuFJ*BleCQ?f2xO;JL($-s>BA#viTeLc=-ge`Z
z?!T+J5C}j30uX=z1Rwwb2tWV=5P-lR2)sP&?fv0UzYaov{ZQQa>anOB=d0ztYl5$z
zx;MSCWg|>tPEw|BpAL5DTih)r6XA2VG_^@)?1C<MaoC-!R_j2*SJLhIb@;g%Tv;?B
zFIOZ<#xpV5lur4~%u}K9+*+Q<^0V{h*+Kg^kDq=70uX=z1Rwwb2tWV=5P$##AOL}X
GEbsv|8&25(

literal 0
HcmV?d00001

diff --git a/Package_Measurement_Conversion_API/controller/measurement_controller.py b/Package_Measurement_Conversion_API/controller/measurement_controller.py
index e144697..d1ac7a0 100644
--- a/Package_Measurement_Conversion_API/controller/measurement_controller.py
+++ b/Package_Measurement_Conversion_API/controller/measurement_controller.py
@@ -1,50 +1,106 @@
+# import cherrypy
+# import logging
+#
+# from Package_Measurement_Conversion_API.services.converter import Measurements
+# from Package_Measurement_Conversion_API.Utilities.db import MeasurementsDB
+# db_manager = MeasurementsDB("conversion_history.db")
+# Measure = Measurements()
+#
+# # Configure logging
+# logging.basicConfig(filename='Package_Measurement_Conversion_API\Logging\error_log.log', level=logging.CRITICAL,
+#                         format='%(asctime)s:%(levelname)s:%(message)s')
+#
+#
+# class MeasurementService(object):
+#
+#     @cherrypy.expose
+#     @cherrypy.tools.json_out()
+#     # This function will display the conversion input and output history
+#     def get_data_from_db(self):
+#         # Fetch data from the database
+#         # query = "SELECT * FROM conversion_history"
+#         table = db_manager.display_table()
+#         print(table)
+#         return table
+#
+#     @cherrypy.expose
+#     @cherrypy.tools.json_out()
+#     # This function will display the converted alphabet input into list of numbers
+#     def convert_measurements(self, input_string):
+#         logging.debug(f"Received input: {input_string}")
+#         try:
+#             # Ensure input_string is a string
+#             if not isinstance(input_string, str):
+#                 raise ValueError("Input must be a string.")
+#
+#             converted_data = Measure.convert_measurements(input_string)
+#             return converted_data  # Returning JSON response
+#         except Exception as e:
+#             logging.exception("Error in convert_measurements:")
+#             return {"error": str(e)}  # Return error message as JSON
+#
+#     @cherrypy.expose
+#     @cherrypy.tools.json_out()
+#     # This function will display the results of the list of numbers
+#     def conversion_results(self, input_string):
+#         # converted_data = Measure.convert_measurements(input_string)
+#         output_str = Measure.measurement_results(input_str=input_string)
+#         db_manager.save_table(input_str=input_string, output_str=output_str)
+#         # print(results)
+#         return output_str
+
 import cherrypy
 import logging
-
 from Package_Measurement_Conversion_API.services.converter import Measurements
 from Package_Measurement_Conversion_API.Utilities.db import MeasurementsDB
+
+# Initialize database manager and measurement conversion service
 db_manager = MeasurementsDB("conversion_history.db")
 Measure = Measurements()
 
 # Configure logging
-logging.basicConfig(filename='Package_Measurement_Conversion_API\Logging\error_log.log', level=logging.CRITICAL,
-                        format='%(asctime)s:%(levelname)s:%(message)s')
+logging.basicConfig(filename='Package_Measurement_Conversion_API\logging\error_log.log',
+                    level=logging.CRITICAL, format='%(asctime)s:%(levelname)s:%(message)s')
 
 
 class MeasurementService(object):
 
     @cherrypy.expose
     @cherrypy.tools.json_out()
-    # This function will display the conversion input and output history
     def get_data_from_db(self):
-        # Fetch data from the database
-        # query = "SELECT * FROM conversion_history"
-        table = db_manager.display_table()
-        print(table)
-        return table
+        """Fetch conversion history from the database."""
+        try:
+            table = db_manager.display_table()
+            return {"status": "success", "err_msg": "", "result": table}
+        except Exception as e:
+            logging.error(f"Failed to retrieve data: {str(e)}")
+            return {"status": "fail", "err_msg": str(e), "result": []}
 
     @cherrypy.expose
     @cherrypy.tools.json_out()
-    # This function will display the converted alphabet input into list of numbers
     def convert_measurements(self, input_string):
-        logging.debug(f"Received input: {input_string}")
+        """Convert input string to numbers based on specific logic."""
         try:
-            # Ensure input_string is a string
             if not isinstance(input_string, str):
                 raise ValueError("Input must be a string.")
 
             converted_data = Measure.convert_measurements(input_string)
-            return converted_data  # Returning JSON response
+            if not converted_data:
+                raise ValueError("Conversion resulted in empty data.")
+            return {"status": "success", "err_msg": "", "result": converted_data}
         except Exception as e:
             logging.exception("Error in convert_measurements:")
-            return {"error": str(e)}  # Return error message as JSON
+            return {"status": "fail", "err_msg": str(e), "result": []}
 
     @cherrypy.expose
     @cherrypy.tools.json_out()
-    # This function will display the results of the list of numbers
     def conversion_results(self, input_string):
-        # converted_data = Measure.convert_measurements(input_string)
-        output_str = Measure.measurement_results(input_str=input_string)
-        db_manager.save_table(input_str=input_string, output_str=output_str)
-        # print(results)
-        return output_str
+        """Process converted data to compute final results and save them to the database."""
+        try:
+            results = Measure.measurement_results(input_string)
+            db_manager.save_table(input_string, results)  # Assuming the function name is save_conversion
+            return {"status": "success", "err_msg": "", "result": results}
+        except Exception as e:
+            logging.error(f"Failed to process conversion results: {str(e)}")
+            return {"status": "fail", "err_msg": str(e), "result": []}
+
diff --git a/conversion_history.db b/conversion_history.db
index aa127646162986e254ab088407614043a0d14014..95229e89fe0fdb852375906bd6b12735e2181b0a 100644
GIT binary patch
delta 61
zcmZp0XmFSy&B!uQ#+i|2W5N=CE@u9T4E(qGxA9NhEGW>-&!o&e`L4VqkCB3biIu6j
Qm9ddB6Hq{Y@^yJl0RQ0-r~m)}

delta 45
zcmZp0XmFSy&B#1a#+i|MW5N=C4krF>4E(qGw`~>_XyBjNpv9!jH2JQ){N(HMngA+e
B4T}H(


From 81854b24821c5534c4700ae9d1a8706e6121783c Mon Sep 17 00:00:00 2001
From: Sughiya-AlSaid <162094061+Sughiya-AlSaid@users.noreply.github.com>
Date: Thu, 2 May 2024 08:59:32 +0400
Subject: [PATCH 5/8] Package Measurement Conversion API 46 update output 1

---
 .../Logging/error_log.log                     |  8 +++
 .../controller/measurement_controller.py      | 51 -------------------
 2 files changed, 8 insertions(+), 51 deletions(-)

diff --git a/Package_Measurement_Conversion_API/Logging/error_log.log b/Package_Measurement_Conversion_API/Logging/error_log.log
index fc32144..867054f 100644
--- a/Package_Measurement_Conversion_API/Logging/error_log.log
+++ b/Package_Measurement_Conversion_API/Logging/error_log.log
@@ -46,3 +46,11 @@
 2024-05-02 08:57:29,524:INFO:[02/May/2024:08:57:29] ENGINE Serving on http://127.0.0.1:8080
 2024-05-02 08:57:29,524:INFO:[02/May/2024:08:57:29] ENGINE Bus STARTED
 2024-05-02 08:57:32,810:INFO:127.0.0.1 - - [02/May/2024:08:57:32] "GET /conversion_results?input_string=abbcc HTTP/1.1" 200 54 "" "PostmanRuntime/7.37.3"
+2024-05-02 08:59:15,892:INFO:[02/May/2024:08:59:15] ENGINE Keyboard Interrupt: shutting down bus
+2024-05-02 08:59:15,892:INFO:[02/May/2024:08:59:15] ENGINE Bus STOPPING
+2024-05-02 08:59:16,029:INFO:[02/May/2024:08:59:16] ENGINE HTTP Server cherrypy._cpwsgi_server.CPWSGIServer(('127.0.0.1', 8080)) shut down
+2024-05-02 08:59:16,029:INFO:[02/May/2024:08:59:16] ENGINE Stopped thread 'Autoreloader'.
+2024-05-02 08:59:16,029:INFO:[02/May/2024:08:59:16] ENGINE Bus STOPPED
+2024-05-02 08:59:16,029:INFO:[02/May/2024:08:59:16] ENGINE Bus EXITING
+2024-05-02 08:59:16,029:INFO:[02/May/2024:08:59:16] ENGINE Bus EXITED
+2024-05-02 08:59:16,029:INFO:[02/May/2024:08:59:16] ENGINE Waiting for child threads to terminate...
diff --git a/Package_Measurement_Conversion_API/controller/measurement_controller.py b/Package_Measurement_Conversion_API/controller/measurement_controller.py
index d1ac7a0..9198d12 100644
--- a/Package_Measurement_Conversion_API/controller/measurement_controller.py
+++ b/Package_Measurement_Conversion_API/controller/measurement_controller.py
@@ -1,54 +1,3 @@
-# import cherrypy
-# import logging
-#
-# from Package_Measurement_Conversion_API.services.converter import Measurements
-# from Package_Measurement_Conversion_API.Utilities.db import MeasurementsDB
-# db_manager = MeasurementsDB("conversion_history.db")
-# Measure = Measurements()
-#
-# # Configure logging
-# logging.basicConfig(filename='Package_Measurement_Conversion_API\Logging\error_log.log', level=logging.CRITICAL,
-#                         format='%(asctime)s:%(levelname)s:%(message)s')
-#
-#
-# class MeasurementService(object):
-#
-#     @cherrypy.expose
-#     @cherrypy.tools.json_out()
-#     # This function will display the conversion input and output history
-#     def get_data_from_db(self):
-#         # Fetch data from the database
-#         # query = "SELECT * FROM conversion_history"
-#         table = db_manager.display_table()
-#         print(table)
-#         return table
-#
-#     @cherrypy.expose
-#     @cherrypy.tools.json_out()
-#     # This function will display the converted alphabet input into list of numbers
-#     def convert_measurements(self, input_string):
-#         logging.debug(f"Received input: {input_string}")
-#         try:
-#             # Ensure input_string is a string
-#             if not isinstance(input_string, str):
-#                 raise ValueError("Input must be a string.")
-#
-#             converted_data = Measure.convert_measurements(input_string)
-#             return converted_data  # Returning JSON response
-#         except Exception as e:
-#             logging.exception("Error in convert_measurements:")
-#             return {"error": str(e)}  # Return error message as JSON
-#
-#     @cherrypy.expose
-#     @cherrypy.tools.json_out()
-#     # This function will display the results of the list of numbers
-#     def conversion_results(self, input_string):
-#         # converted_data = Measure.convert_measurements(input_string)
-#         output_str = Measure.measurement_results(input_str=input_string)
-#         db_manager.save_table(input_str=input_string, output_str=output_str)
-#         # print(results)
-#         return output_str
-
 import cherrypy
 import logging
 from Package_Measurement_Conversion_API.services.converter import Measurements

From 4837360553589bcd041f4b39922956152386a986 Mon Sep 17 00:00:00 2001
From: Sughiya-AlSaid <162094061+Sughiya-AlSaid@users.noreply.github.com>
Date: Thu, 2 May 2024 09:00:39 +0400
Subject: [PATCH 6/8] Package Measurement Conversion API 46 update output 1

---
 .../controller/measurement_controller.py                         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Package_Measurement_Conversion_API/controller/measurement_controller.py b/Package_Measurement_Conversion_API/controller/measurement_controller.py
index 9198d12..ed95907 100644
--- a/Package_Measurement_Conversion_API/controller/measurement_controller.py
+++ b/Package_Measurement_Conversion_API/controller/measurement_controller.py
@@ -1,5 +1,6 @@
 import cherrypy
 import logging
+
 from Package_Measurement_Conversion_API.services.converter import Measurements
 from Package_Measurement_Conversion_API.Utilities.db import MeasurementsDB
 

From c8226bb5c5950442b9a3e97114f1196cb9f75fdb Mon Sep 17 00:00:00 2001
From: Sughiya-AlSaid <162094061+Sughiya-AlSaid@users.noreply.github.com>
Date: Thu, 2 May 2024 09:49:37 +0400
Subject: [PATCH 7/8] Package Measurement Conversion API 46 update logic

---
 .../Logging/error_log.log                     |  29 ++++++++++++++++++
 .../controller/measurement_controller.py      |   1 -
 .../services/converter.py                     |   5 ++-
 conversion_history.db                         | Bin 8192 -> 8192 bytes
 4 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/Package_Measurement_Conversion_API/Logging/error_log.log b/Package_Measurement_Conversion_API/Logging/error_log.log
index 867054f..a730019 100644
--- a/Package_Measurement_Conversion_API/Logging/error_log.log
+++ b/Package_Measurement_Conversion_API/Logging/error_log.log
@@ -54,3 +54,32 @@
 2024-05-02 08:59:16,029:INFO:[02/May/2024:08:59:16] ENGINE Bus EXITING
 2024-05-02 08:59:16,029:INFO:[02/May/2024:08:59:16] ENGINE Bus EXITED
 2024-05-02 08:59:16,029:INFO:[02/May/2024:08:59:16] ENGINE Waiting for child threads to terminate...
+2024-05-02 09:15:13,242:INFO:[02/May/2024:09:15:13] ENGINE Listening for SIGTERM.
+2024-05-02 09:15:13,242:INFO:[02/May/2024:09:15:13] ENGINE Bus STARTING
+2024-05-02 09:15:13,244:INFO:[02/May/2024:09:15:13] ENGINE Started monitor thread 'Autoreloader'.
+2024-05-02 09:15:13,458:INFO:[02/May/2024:09:15:13] ENGINE Serving on http://127.0.0.1:8080
+2024-05-02 09:15:13,459:INFO:[02/May/2024:09:15:13] ENGINE Bus STARTED
+2024-05-02 09:15:21,563:INFO:127.0.0.1 - - [02/May/2024:09:15:21] "GET /conversion_results?input_string=aaa HTTP/1.1" 200 51 "" "PostmanRuntime/7.37.3"
+2024-05-02 09:15:32,386:INFO:127.0.0.1 - - [02/May/2024:09:15:32] "GET /conversion_results?input_string=ccc HTTP/1.1" 200 50 "" "PostmanRuntime/7.37.3"
+2024-05-02 09:15:38,316:INFO:[02/May/2024:09:15:38] ENGINE Keyboard Interrupt: shutting down bus
+2024-05-02 09:15:38,316:INFO:[02/May/2024:09:15:38] ENGINE Bus STOPPING
+2024-05-02 09:15:38,442:INFO:[02/May/2024:09:15:38] ENGINE HTTP Server cherrypy._cpwsgi_server.CPWSGIServer(('127.0.0.1', 8080)) shut down
+2024-05-02 09:15:38,442:INFO:[02/May/2024:09:15:38] ENGINE Stopped thread 'Autoreloader'.
+2024-05-02 09:15:38,442:INFO:[02/May/2024:09:15:38] ENGINE Bus STOPPED
+2024-05-02 09:15:38,442:INFO:[02/May/2024:09:15:38] ENGINE Bus EXITING
+2024-05-02 09:15:38,442:INFO:[02/May/2024:09:15:38] ENGINE Bus EXITED
+2024-05-02 09:15:38,442:INFO:[02/May/2024:09:15:38] ENGINE Waiting for child threads to terminate...
+2024-05-02 09:16:27,257:INFO:[02/May/2024:09:16:27] ENGINE Listening for SIGTERM.
+2024-05-02 09:16:27,257:INFO:[02/May/2024:09:16:27] ENGINE Bus STARTING
+2024-05-02 09:16:27,257:INFO:[02/May/2024:09:16:27] ENGINE Started monitor thread 'Autoreloader'.
+2024-05-02 09:16:27,472:INFO:[02/May/2024:09:16:27] ENGINE Serving on http://127.0.0.1:8080
+2024-05-02 09:16:27,472:INFO:[02/May/2024:09:16:27] ENGINE Bus STARTED
+2024-05-02 09:16:35,576:INFO:127.0.0.1 - - [02/May/2024:09:16:35] "GET /conversion_results?input_string=aaa HTTP/1.1" 200 51 "" "PostmanRuntime/7.37.3"
+2024-05-02 09:21:06,348:INFO:[02/May/2024:09:21:06] ENGINE Keyboard Interrupt: shutting down bus
+2024-05-02 09:21:06,348:INFO:[02/May/2024:09:21:06] ENGINE Bus STOPPING
+2024-05-02 09:21:06,487:INFO:[02/May/2024:09:21:06] ENGINE HTTP Server cherrypy._cpwsgi_server.CPWSGIServer(('127.0.0.1', 8080)) shut down
+2024-05-02 09:21:06,487:INFO:[02/May/2024:09:21:06] ENGINE Stopped thread 'Autoreloader'.
+2024-05-02 09:21:06,487:INFO:[02/May/2024:09:21:06] ENGINE Bus STOPPED
+2024-05-02 09:21:06,487:INFO:[02/May/2024:09:21:06] ENGINE Bus EXITING
+2024-05-02 09:21:06,487:INFO:[02/May/2024:09:21:06] ENGINE Bus EXITED
+2024-05-02 09:21:06,487:INFO:[02/May/2024:09:21:06] ENGINE Waiting for child threads to terminate...
diff --git a/Package_Measurement_Conversion_API/controller/measurement_controller.py b/Package_Measurement_Conversion_API/controller/measurement_controller.py
index ed95907..30c4324 100644
--- a/Package_Measurement_Conversion_API/controller/measurement_controller.py
+++ b/Package_Measurement_Conversion_API/controller/measurement_controller.py
@@ -53,4 +53,3 @@ def conversion_results(self, input_string):
         except Exception as e:
             logging.error(f"Failed to process conversion results: {str(e)}")
             return {"status": "fail", "err_msg": str(e), "result": []}
-
diff --git a/Package_Measurement_Conversion_API/services/converter.py b/Package_Measurement_Conversion_API/services/converter.py
index 5d4b588..74337df 100644
--- a/Package_Measurement_Conversion_API/services/converter.py
+++ b/Package_Measurement_Conversion_API/services/converter.py
@@ -38,8 +38,9 @@ def measurement_results(self, input_str):
         is_a_step = True  # First character/number = step one.
         step_count_remaining = 0  # Set the count as soon as the number is encountered.
         curr_input_sum = 0  # continue adding the values until remaining step count != 0
-
+        i = 0
         for curr_num in list_of_num:
+            i += 1
             if is_a_step:
                 if curr_num == 26:  # Check if current character is Z count
                     step_count_remaining += curr_num
@@ -61,5 +62,7 @@ def measurement_results(self, input_str):
                 curr_input_sum = 0
                 step_count_remaining = 0
                 is_a_step = True
+            elif step_count_remaining > (len(list_of_num) - 1) - i:
+                result_input_list = []
 
         return result_input_list
diff --git a/conversion_history.db b/conversion_history.db
index 95229e89fe0fdb852375906bd6b12735e2181b0a..382a81c1195c82d0f6cec577ce8c9d7ed02f93b7 100644
GIT binary patch
delta 139
zcmZp0XmFSy&B#7c#+i|QW5N=C0XBXk2L9Xp+xRE)7xD-38*LU8kmHY+V`F6y7B)^y
zOpG>+H8L<V(KRsDH84^zFtsu?vobc7Wd+I$8Yd?wN25!dS{WP3vEbHjYGq_Nd7^wi
E0C-CtOaK4?

delta 40
wcmZp0XmFSy&B!uQ#+i|2W5N=CE@u9T4E(qGxA9NhtSBJJKe3@`@<jQ30O<D&9{>OV


From fe848c077c4cb1b2e43164afb61f71baea7103eb Mon Sep 17 00:00:00 2001
From: Sughiya-AlSaid <162094061+Sughiya-AlSaid@users.noreply.github.com>
Date: Thu, 2 May 2024 10:05:21 +0400
Subject: [PATCH 8/8] Package Measurement Conversion API 46 update logic 1

---
 .../Logging/error_log.log                     | 167 ++++++++++++++++++
 .../services/converter.py                     |   8 +-
 conversion_history.db                         | Bin 8192 -> 8192 bytes
 main_app.py                                   |   1 +
 4 files changed, 172 insertions(+), 4 deletions(-)

diff --git a/Package_Measurement_Conversion_API/Logging/error_log.log b/Package_Measurement_Conversion_API/Logging/error_log.log
index a730019..d6730a7 100644
--- a/Package_Measurement_Conversion_API/Logging/error_log.log
+++ b/Package_Measurement_Conversion_API/Logging/error_log.log
@@ -83,3 +83,170 @@
 2024-05-02 09:21:06,487:INFO:[02/May/2024:09:21:06] ENGINE Bus EXITING
 2024-05-02 09:21:06,487:INFO:[02/May/2024:09:21:06] ENGINE Bus EXITED
 2024-05-02 09:21:06,487:INFO:[02/May/2024:09:21:06] ENGINE Waiting for child threads to terminate...
+2024-05-02 09:52:03,005:INFO:[02/May/2024:09:52:03] ENGINE Listening for SIGTERM.
+2024-05-02 09:52:03,005:INFO:[02/May/2024:09:52:03] ENGINE Bus STARTING
+2024-05-02 09:52:03,005:INFO:[02/May/2024:09:52:03] ENGINE Started monitor thread 'Autoreloader'.
+2024-05-02 09:52:03,232:INFO:[02/May/2024:09:52:03] ENGINE Serving on http://127.0.0.1:8080
+2024-05-02 09:52:03,232:INFO:[02/May/2024:09:52:03] ENGINE Bus STARTED
+2024-05-02 09:52:52,484:INFO:127.0.0.1 - - [02/May/2024:09:52:52] "GET /conversion_results?input_string=aaa HTTP/1.1" 200 50 "" "PostmanRuntime/7.37.3"
+2024-05-02 09:52:55,695:INFO:127.0.0.1 - - [02/May/2024:09:52:55] "GET /conversion_results?input_string=aa HTTP/1.1" 200 51 "" "PostmanRuntime/7.37.3"
+2024-05-02 09:55:18,666:INFO:[02/May/2024:09:55:18] ENGINE Keyboard Interrupt: shutting down bus
+2024-05-02 09:55:18,666:INFO:[02/May/2024:09:55:18] ENGINE Bus STOPPING
+2024-05-02 09:55:18,786:INFO:[02/May/2024:09:55:18] ENGINE HTTP Server cherrypy._cpwsgi_server.CPWSGIServer(('127.0.0.1', 8080)) shut down
+2024-05-02 09:55:18,786:INFO:[02/May/2024:09:55:18] ENGINE Stopped thread 'Autoreloader'.
+2024-05-02 09:55:18,786:INFO:[02/May/2024:09:55:18] ENGINE Bus STOPPED
+2024-05-02 09:55:18,786:INFO:[02/May/2024:09:55:18] ENGINE Bus EXITING
+2024-05-02 09:55:18,786:INFO:[02/May/2024:09:55:18] ENGINE Bus EXITED
+2024-05-02 09:55:18,786:INFO:[02/May/2024:09:55:18] ENGINE Waiting for child threads to terminate...
+2024-05-02 09:55:19,770:INFO:[02/May/2024:09:55:19] ENGINE Listening for SIGTERM.
+2024-05-02 09:55:19,770:INFO:[02/May/2024:09:55:19] ENGINE Bus STARTING
+2024-05-02 09:55:19,771:INFO:[02/May/2024:09:55:19] ENGINE Started monitor thread 'Autoreloader'.
+2024-05-02 09:55:19,991:INFO:[02/May/2024:09:55:19] ENGINE Serving on http://0.0.0.0:8080
+2024-05-02 09:55:19,991:INFO:[02/May/2024:09:55:19] ENGINE Bus STARTED
+2024-05-02 09:55:23,093:INFO:192.168.137.1 - - [02/May/2024:09:55:23] "GET / HTTP/1.1" 404 1518 "" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36"
+2024-05-02 09:55:23,277:INFO:192.168.137.1 - - [02/May/2024:09:55:23] "GET /favicon.ico HTTP/1.1" 200 1406 "http://192.168.137.86:8080/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36"
+2024-05-02 09:55:51,855:INFO:192.168.137.1 - - [02/May/2024:09:55:51] "GET /conversion_results?input_string=aa HTTP/1.1" 200 51 "" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36"
+2024-05-02 09:56:50,085:INFO:192.168.137.1 - - [02/May/2024:09:56:50] "GET /conversion_results?input_string=aa HTTP/1.1" 200 51 "" "python-requests/2.31.0"
+2024-05-02 09:56:50,102:INFO:192.168.137.1 - - [02/May/2024:09:56:50] "GET /conversion_results?input_string=abbcc HTTP/1.1" 200 51 "" "python-requests/2.31.0"
+2024-05-02 09:56:50,116:INFO:192.168.137.1 - - [02/May/2024:09:56:50] "GET /conversion_results?input_string=dz_a_aazzaaa HTTP/1.1" 200 51 "" "python-requests/2.31.0"
+2024-05-02 09:56:50,132:INFO:192.168.137.1 - - [02/May/2024:09:56:50] "GET /conversion_results?input_string=a_ HTTP/1.1" 200 51 "" "python-requests/2.31.0"
+2024-05-02 09:56:50,145:INFO:192.168.137.1 - - [02/May/2024:09:56:50] "GET /conversion_results?input_string=abcdabcdab HTTP/1.1" 200 51 "" "python-requests/2.31.0"
+2024-05-02 09:56:50,156:INFO:192.168.137.1 - - [02/May/2024:09:56:50] "GET /conversion_results?input_string=abcdabcdab_ HTTP/1.1" 200 60 "" "python-requests/2.31.0"
+2024-05-02 09:56:50,168:INFO:192.168.137.1 - - [02/May/2024:09:56:50] "GET /conversion_results?input_string=zdaaaaaaaabaaaaaaaabaaaaaaaabbaa HTTP/1.1" 200 52 "" "python-requests/2.31.0"
+2024-05-02 09:56:50,178:INFO:192.168.137.1 - - [02/May/2024:09:56:50] "GET /conversion_results?input_string=zza_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_ HTTP/1.1" 200 52 "" "python-requests/2.31.0"
+2024-05-02 09:56:50,230:INFO:192.168.137.1 - - [02/May/2024:09:56:50] "GET /conversion_results?input_string=za_a_a_a_a_a_a_a_a_a_a_a_a_azaaa HTTP/1.1" 200 51 "" "python-requests/2.31.0"
+2024-05-02 09:56:50,312:INFO:192.168.137.1 - - [02/May/2024:09:56:50] "GET /conversion_results?input_string=_ HTTP/1.1" 200 51 "" "python-requests/2.31.0"
+2024-05-02 09:56:50,325:INFO:192.168.137.1 - - [02/May/2024:09:56:50] "GET /conversion_results?input_string=_ad HTTP/1.1" 200 51 "" "python-requests/2.31.0"
+2024-05-02 09:56:50,344:INFO:192.168.137.1 - - [02/May/2024:09:56:50] "GET /conversion_results?input_string=a_ HTTP/1.1" 200 51 "" "python-requests/2.31.0"
+2024-05-02 09:56:50,380:INFO:192.168.137.1 - - [02/May/2024:09:56:50] "GET /conversion_results?input_string=_zzzb HTTP/1.1" 200 51 "" "python-requests/2.31.0"
+2024-05-02 09:56:50,392:INFO:192.168.137.1 - - [02/May/2024:09:56:50] "GET /conversion_results?input_string=__ HTTP/1.1" 200 51 "" "python-requests/2.31.0"
+2024-05-02 09:56:50,406:INFO:192.168.137.1 - - [02/May/2024:09:56:50] "GET /conversion_results?input_string=+++ HTTP/1.1" 200 50 "" "python-requests/2.31.0"
+2024-05-02 09:56:50,443:INFO:192.168.137.1 - - [02/May/2024:09:56:50] "GET /conversion_results?input_string=%40%40%40 HTTP/1.1" 200 50 "" "python-requests/2.31.0"
+2024-05-02 09:56:50,493:INFO:192.168.137.1 - - [02/May/2024:09:56:50] "GET /conversion_results?input_string=1234 HTTP/1.1" 200 50 "" "python-requests/2.31.0"
+2024-05-02 09:56:50,514:INFO:192.168.137.1 - - [02/May/2024:09:56:50] "GET /conversion_results?input_string=aaa HTTP/1.1" 200 50 "" "python-requests/2.31.0"
+2024-05-02 09:56:50,526:INFO:192.168.137.1 - - [02/May/2024:09:56:50] "GET /conversion_results?input_string=ccc HTTP/1.1" 200 50 "" "python-requests/2.31.0"
+2024-05-02 09:58:34,143:INFO:192.168.137.86 - - [02/May/2024:09:58:34] "GET /conversion_results?input_string=bbcc HTTP/1.1" 200 50 "" "PostmanRuntime/7.37.3"
+2024-05-02 09:58:37,152:INFO:192.168.137.86 - - [02/May/2024:09:58:37] "GET /conversion_results?input_string=abbcc HTTP/1.1" 200 51 "" "PostmanRuntime/7.37.3"
+2024-05-02 09:59:12,668:INFO:[02/May/2024:09:59:12] ENGINE Restarting because C:\Users\71538\Documents\PackageMeasurementConversionAPI\Package_Measurement_Conversion_API\services\converter.py changed.
+2024-05-02 09:59:12,669:INFO:[02/May/2024:09:59:12] ENGINE Stopped thread 'Autoreloader'.
+2024-05-02 09:59:12,669:INFO:[02/May/2024:09:59:12] ENGINE Bus STOPPING
+2024-05-02 09:59:12,810:INFO:[02/May/2024:09:59:12] ENGINE HTTP Server cherrypy._cpwsgi_server.CPWSGIServer(('0.0.0.0', 8080)) shut down
+2024-05-02 09:59:12,810:INFO:[02/May/2024:09:59:12] ENGINE Bus STOPPED
+2024-05-02 09:59:12,811:INFO:[02/May/2024:09:59:12] ENGINE Bus EXITING
+2024-05-02 09:59:12,811:INFO:[02/May/2024:09:59:12] ENGINE Bus EXITED
+2024-05-02 09:59:12,899:INFO:[02/May/2024:09:59:12] ENGINE Waiting for child threads to terminate...
+2024-05-02 09:59:12,899:INFO:[02/May/2024:09:59:12] ENGINE Re-spawning C:\Users\71538\AppData\Local\Programs\Python\Python312\python.exe C:\Users\71538\Documents\PackageMeasurementConversionAPI\main_app.py
+2024-05-02 09:59:13,383:INFO:[02/May/2024:09:59:13] ENGINE Listening for SIGTERM.
+2024-05-02 09:59:13,405:INFO:[02/May/2024:09:59:13] ENGINE Bus STARTING
+2024-05-02 09:59:13,405:INFO:[02/May/2024:09:59:13] ENGINE Started monitor thread 'Autoreloader'.
+2024-05-02 09:59:13,638:INFO:[02/May/2024:09:59:13] ENGINE Serving on http://0.0.0.0:8080
+2024-05-02 09:59:13,638:INFO:[02/May/2024:09:59:13] ENGINE Bus STARTED
+2024-05-02 09:59:17,768:INFO:[02/May/2024:09:59:17] ENGINE Listening for SIGTERM.
+2024-05-02 09:59:17,768:INFO:[02/May/2024:09:59:17] ENGINE Bus STARTING
+2024-05-02 09:59:17,769:INFO:[02/May/2024:09:59:17] ENGINE Started monitor thread 'Autoreloader'.
+2024-05-02 09:59:18,956:ERROR:[02/May/2024:09:59:18] ENGINE Error in 'start' listener <bound method Server.start of <cherrypy._cpserver.Server object at 0x00000299264F1370>>
+Traceback (most recent call last):
+  File "C:\Users\71538\AppData\Roaming\Python\Python312\site-packages\portend.py", line 122, in free
+    Checker(timeout=0.1).assert_free(host, port)
+  File "C:\Users\71538\AppData\Roaming\Python\Python312\site-packages\portend.py", line 71, in assert_free
+    list(itertools.starmap(self._connect, info))
+  File "C:\Users\71538\AppData\Roaming\Python\Python312\site-packages\portend.py", line 87, in _connect
+    raise PortNotFree(tmpl.format(**locals()))
+portend.PortNotFree: Port 8080 is in use on 127.0.0.1.
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File "C:\Users\71538\AppData\Roaming\Python\Python312\site-packages\cherrypy\process\wspbus.py", line 230, in publish
+    output.append(listener(*args, **kwargs))
+                  ^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "C:\Users\71538\AppData\Roaming\Python\Python312\site-packages\cherrypy\_cpserver.py", line 180, in start
+    super(Server, self).start()
+  File "C:\Users\71538\AppData\Roaming\Python\Python312\site-packages\cherrypy\process\servers.py", line 177, in start
+    portend.free(*self.bind_addr, timeout=Timeouts.free)
+  File "C:\Users\71538\AppData\Roaming\Python\Python312\site-packages\portend.py", line 126, in free
+    raise Timeout("Port {port} not free on {host}.".format(**locals()))
+portend.Timeout: Port 8080 not free on 0.0.0.0.
+
+2024-05-02 09:59:18,957:ERROR:[02/May/2024:09:59:18] ENGINE Shutting down due to error in start listener:
+Traceback (most recent call last):
+  File "C:\Users\71538\AppData\Roaming\Python\Python312\site-packages\cherrypy\process\wspbus.py", line 268, in start
+    self.publish('start')
+  File "C:\Users\71538\AppData\Roaming\Python\Python312\site-packages\cherrypy\process\wspbus.py", line 248, in publish
+    raise exc
+cherrypy.process.wspbus.ChannelFailures: Timeout('Port 8080 not free on 0.0.0.0.')
+
+2024-05-02 09:59:18,957:INFO:[02/May/2024:09:59:18] ENGINE Bus STOPPING
+2024-05-02 09:59:18,957:INFO:[02/May/2024:09:59:18] ENGINE HTTP Server cherrypy._cpwsgi_server.CPWSGIServer(('0.0.0.0', 8080)) already shut down
+2024-05-02 09:59:18,957:INFO:[02/May/2024:09:59:18] ENGINE Stopped thread 'Autoreloader'.
+2024-05-02 09:59:18,957:INFO:[02/May/2024:09:59:18] ENGINE Bus STOPPED
+2024-05-02 09:59:18,957:INFO:[02/May/2024:09:59:18] ENGINE Bus EXITING
+2024-05-02 09:59:18,957:INFO:[02/May/2024:09:59:18] ENGINE Bus EXITED
+2024-05-02 09:59:20,486:INFO:192.168.137.86 - - [02/May/2024:09:59:20] "GET /conversion_results?input_string=abbcc HTTP/1.1" 200 54 "" "PostmanRuntime/7.37.3"
+2024-05-02 09:59:48,401:INFO:192.168.137.86 - - [02/May/2024:09:59:48] "GET /conversion_results?input_string=dz_a_aazzaaa HTTP/1.1" 200 59 "" "PostmanRuntime/7.37.3"
+2024-05-02 10:00:10,299:INFO:192.168.137.86 - - [02/May/2024:10:00:10] "GET /conversion_results?input_string=abcdabcdab HTTP/1.1" 200 57 "" "PostmanRuntime/7.37.3"
+2024-05-02 10:00:30,686:INFO:192.168.137.86 - - [02/May/2024:10:00:30] "GET /conversion_results?input_string= HTTP/1.1" 200 50 "" "PostmanRuntime/7.37.3"
+2024-05-02 10:00:33,663:INFO:192.168.137.86 - - [02/May/2024:10:00:33] "GET /conversion_results?input_string=__ HTTP/1.1" 200 51 "" "PostmanRuntime/7.37.3"
+2024-05-02 10:00:48,954:INFO:192.168.137.86 - - [02/May/2024:10:00:48] "GET /conversion_results?input_string=@@@ HTTP/1.1" 200 50 "" "PostmanRuntime/7.37.3"
+2024-05-02 10:01:02,267:INFO:192.168.137.86 - - [02/May/2024:10:01:02] "GET /conversion_results?input_string=1234 HTTP/1.1" 200 50 "" "PostmanRuntime/7.37.3"
+2024-05-02 10:01:22,988:INFO:[02/May/2024:10:01:22] ENGINE Listening for SIGTERM.
+2024-05-02 10:01:22,988:INFO:[02/May/2024:10:01:22] ENGINE Bus STARTING
+2024-05-02 10:01:22,988:INFO:[02/May/2024:10:01:22] ENGINE Started monitor thread 'Autoreloader'.
+2024-05-02 10:01:24,011:ERROR:[02/May/2024:10:01:24] ENGINE Error in 'start' listener <bound method Server.start of <cherrypy._cpserver.Server object at 0x000001A9A6105970>>
+Traceback (most recent call last):
+  File "C:\Users\71538\AppData\Roaming\Python\Python312\site-packages\portend.py", line 122, in free
+    Checker(timeout=0.1).assert_free(host, port)
+  File "C:\Users\71538\AppData\Roaming\Python\Python312\site-packages\portend.py", line 71, in assert_free
+    list(itertools.starmap(self._connect, info))
+  File "C:\Users\71538\AppData\Roaming\Python\Python312\site-packages\portend.py", line 87, in _connect
+    raise PortNotFree(tmpl.format(**locals()))
+portend.PortNotFree: Port 8080 is in use on 127.0.0.1.
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File "C:\Users\71538\AppData\Roaming\Python\Python312\site-packages\cherrypy\process\wspbus.py", line 230, in publish
+    output.append(listener(*args, **kwargs))
+                  ^^^^^^^^^^^^^^^^^^^^^^^^^
+  File "C:\Users\71538\AppData\Roaming\Python\Python312\site-packages\cherrypy\_cpserver.py", line 180, in start
+    super(Server, self).start()
+  File "C:\Users\71538\AppData\Roaming\Python\Python312\site-packages\cherrypy\process\servers.py", line 177, in start
+    portend.free(*self.bind_addr, timeout=Timeouts.free)
+  File "C:\Users\71538\AppData\Roaming\Python\Python312\site-packages\portend.py", line 126, in free
+    raise Timeout("Port {port} not free on {host}.".format(**locals()))
+portend.Timeout: Port 8080 not free on 0.0.0.0.
+
+2024-05-02 10:01:24,012:ERROR:[02/May/2024:10:01:24] ENGINE Shutting down due to error in start listener:
+Traceback (most recent call last):
+  File "C:\Users\71538\AppData\Roaming\Python\Python312\site-packages\cherrypy\process\wspbus.py", line 268, in start
+    self.publish('start')
+  File "C:\Users\71538\AppData\Roaming\Python\Python312\site-packages\cherrypy\process\wspbus.py", line 248, in publish
+    raise exc
+cherrypy.process.wspbus.ChannelFailures: Timeout('Port 8080 not free on 0.0.0.0.')
+
+2024-05-02 10:01:24,012:INFO:[02/May/2024:10:01:24] ENGINE Bus STOPPING
+2024-05-02 10:01:24,012:INFO:[02/May/2024:10:01:24] ENGINE HTTP Server cherrypy._cpwsgi_server.CPWSGIServer(('0.0.0.0', 8080)) already shut down
+2024-05-02 10:01:24,012:INFO:[02/May/2024:10:01:24] ENGINE Stopped thread 'Autoreloader'.
+2024-05-02 10:01:24,012:INFO:[02/May/2024:10:01:24] ENGINE Bus STOPPED
+2024-05-02 10:01:24,012:INFO:[02/May/2024:10:01:24] ENGINE Bus EXITING
+2024-05-02 10:01:24,012:INFO:[02/May/2024:10:01:24] ENGINE Bus EXITED
+2024-05-02 10:01:26,797:INFO:192.168.137.1 - - [02/May/2024:10:01:26] "GET /conversion_results?input_string=aa HTTP/1.1" 200 51 "" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36"
+2024-05-02 10:01:40,614:INFO:192.168.137.1 - - [02/May/2024:10:01:40] "GET /conversion_results?input_string=aa HTTP/1.1" 200 51 "" "python-requests/2.31.0"
+2024-05-02 10:01:40,631:INFO:192.168.137.1 - - [02/May/2024:10:01:40] "GET /conversion_results?input_string=abbcc HTTP/1.1" 200 54 "" "python-requests/2.31.0"
+2024-05-02 10:01:40,647:INFO:192.168.137.1 - - [02/May/2024:10:01:40] "GET /conversion_results?input_string=dz_a_aazzaaa HTTP/1.1" 200 59 "" "python-requests/2.31.0"
+2024-05-02 10:01:40,661:INFO:192.168.137.1 - - [02/May/2024:10:01:40] "GET /conversion_results?input_string=a_ HTTP/1.1" 200 51 "" "python-requests/2.31.0"
+2024-05-02 10:01:40,672:INFO:192.168.137.1 - - [02/May/2024:10:01:40] "GET /conversion_results?input_string=abcdabcdab HTTP/1.1" 200 57 "" "python-requests/2.31.0"
+2024-05-02 10:01:40,680:INFO:192.168.137.1 - - [02/May/2024:10:01:40] "GET /conversion_results?input_string=abcdabcdab_ HTTP/1.1" 200 60 "" "python-requests/2.31.0"
+2024-05-02 10:01:40,695:INFO:192.168.137.1 - - [02/May/2024:10:01:40] "GET /conversion_results?input_string=zdaaaaaaaabaaaaaaaabaaaaaaaabbaa HTTP/1.1" 200 52 "" "python-requests/2.31.0"
+2024-05-02 10:01:40,695:INFO:192.168.137.1 - - [02/May/2024:10:01:40] "GET /conversion_results?input_string=zza_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_a_ HTTP/1.1" 200 52 "" "python-requests/2.31.0"
+2024-05-02 10:01:40,710:INFO:192.168.137.1 - - [02/May/2024:10:01:40] "GET /conversion_results?input_string=za_a_a_a_a_a_a_a_a_a_a_a_a_azaaa HTTP/1.1" 200 55 "" "python-requests/2.31.0"
+2024-05-02 10:01:40,738:INFO:192.168.137.1 - - [02/May/2024:10:01:40] "GET /conversion_results?input_string=_ HTTP/1.1" 200 51 "" "python-requests/2.31.0"
+2024-05-02 10:01:40,742:INFO:192.168.137.1 - - [02/May/2024:10:01:40] "GET /conversion_results?input_string=_ad HTTP/1.1" 200 51 "" "python-requests/2.31.0"
+2024-05-02 10:01:40,758:INFO:192.168.137.1 - - [02/May/2024:10:01:40] "GET /conversion_results?input_string=a_ HTTP/1.1" 200 51 "" "python-requests/2.31.0"
+2024-05-02 10:01:40,789:INFO:192.168.137.1 - - [02/May/2024:10:01:40] "GET /conversion_results?input_string=_zzzb HTTP/1.1" 200 51 "" "python-requests/2.31.0"
+2024-05-02 10:01:40,808:INFO:192.168.137.1 - - [02/May/2024:10:01:40] "GET /conversion_results?input_string=__ HTTP/1.1" 200 51 "" "python-requests/2.31.0"
+2024-05-02 10:01:40,816:INFO:192.168.137.1 - - [02/May/2024:10:01:40] "GET /conversion_results?input_string=+++ HTTP/1.1" 200 50 "" "python-requests/2.31.0"
+2024-05-02 10:01:40,829:INFO:192.168.137.1 - - [02/May/2024:10:01:40] "GET /conversion_results?input_string=%40%40%40 HTTP/1.1" 200 50 "" "python-requests/2.31.0"
+2024-05-02 10:01:40,836:INFO:192.168.137.1 - - [02/May/2024:10:01:40] "GET /conversion_results?input_string=1234 HTTP/1.1" 200 50 "" "python-requests/2.31.0"
+2024-05-02 10:01:40,852:INFO:192.168.137.1 - - [02/May/2024:10:01:40] "GET /conversion_results?input_string=aaa HTTP/1.1" 200 51 "" "python-requests/2.31.0"
+2024-05-02 10:01:40,868:INFO:192.168.137.1 - - [02/May/2024:10:01:40] "GET /conversion_results?input_string=ccc HTTP/1.1" 200 50 "" "python-requests/2.31.0"
diff --git a/Package_Measurement_Conversion_API/services/converter.py b/Package_Measurement_Conversion_API/services/converter.py
index 74337df..7be358b 100644
--- a/Package_Measurement_Conversion_API/services/converter.py
+++ b/Package_Measurement_Conversion_API/services/converter.py
@@ -38,9 +38,9 @@ def measurement_results(self, input_str):
         is_a_step = True  # First character/number = step one.
         step_count_remaining = 0  # Set the count as soon as the number is encountered.
         curr_input_sum = 0  # continue adding the values until remaining step count != 0
-        i = 0
+        # i = 0
         for curr_num in list_of_num:
-            i += 1
+            # i += 1
             if is_a_step:
                 if curr_num == 26:  # Check if current character is Z count
                     step_count_remaining += curr_num
@@ -62,7 +62,7 @@ def measurement_results(self, input_str):
                 curr_input_sum = 0
                 step_count_remaining = 0
                 is_a_step = True
-            elif step_count_remaining > (len(list_of_num) - 1) - i:
-                result_input_list = []
+            # elif step_count_remaining > (len(list_of_num) - 1) - i:
+            #     result_input_list = []
 
         return result_input_list
diff --git a/conversion_history.db b/conversion_history.db
index 382a81c1195c82d0f6cec577ce8c9d7ed02f93b7..a182f02bf7f2793e035bafa287c068639facd164 100644
GIT binary patch
literal 8192
zcmeH~&u`mg7{}j~nK+JPFNCgatG#!4Sy!4awqH9*%_JIzS5>srmU$9WG-XcGLB!gO
zHbYvZ2>}8LaYEw49RcDGsI>bu!S0+mBeDCW-4IV4XCm?Iv_eQ+-Z!>l=llG4{du4F
zNpkJ#MyI!hZ+CaM{T?RhC`u&ID#i#Q2hJHdM<W3jM@BdBKDa+<IOzP&!wgs@q`wdx
zY%l_h03*N%FanGKBftnS0*nA7zz8q`{{w+fKS?C#3?uRRV$W~h*=lunKHl2h>vVS-
zA9VJ5-QD}qPi8LG+^Xkduln|ei=#R|C*X<EY2)?Fp1bDO@Ri#7X0>($zw6#8MD2F&
z-s@q{eb0+(-Fv-wvDew&+Uxn-cd@s=>0a}yn^*8V?xpJW4G&+uUaPs6y~Yb=EbZdp
zzxhh?D<uCe@5|rFAIUY@lylNE={IR#`d0c-+K}>@XPN!Xt&Eo8#6QHx;`ibg;%#wF
zToC#6)AX<DAJd<uucptWdEu$>MEF_wTDT*u3CB{;Q%_RgrRph;f5iX5f62ekyZl)`
znfx>POY$d3$p$092rvSS03*N%C@UPwWl5{ms^2tq(^}T;W!=Pj$<YnR($xycIpX_%
z-Jt4a4$WqXVG@h#uatuDtE;PY*$!m*;X;=!4rOzs(WvXR<d|@14&;8n-=te8W)Q%S
z37{Im(>44y-F;r?kPHdv>RUw)ZJs23zY+WD55QS^0aM|5=Q;FXmh`7Zh>zW<n<W~R
z3(GJqh}wqS!DvP=;G;URXx_yFhqOHLo2~Zngfs<Q4i4%fEG=>9^r?S1jO=OAl{coY
zM{$uud5yIDgQxa^3ry3j6tGQV2x{k`0**uSCe$y?lL|yx7$%J=Vdd-;*(|B~X%()U
z%9+>-*Bz^(XhC#Z3F{6aCtl}JCQBmK51PJo`jBLG$Iy%Tu;^^ZUV({er>3C`j7%M?
z!44bp9fu1R6^E2nCBPFbz}SipbxWBK@I?9x$R)?tm6L%ySm;Ubfvld0fj@FTPKQ5|
zUkl_&dl|`d^tB0Pd@Q!Ti~`IKOJ}k{gtGc7q=)tqX)mEZpQE;yP<`_i*vGkp+sk-s
z37x&{f7)8Ys27g@tJV^F7v;mYme3(D!3KaYpBKHTUZxd^l9{>+3nJ`{+;~%=GQ;U<
z#U50vFw8XBNy7OmsaP2-426%CO~<yCWb9S|*;HQ+ifOP@CTDMy9AYb6;7-|ShV2kj
mJreJ3JEoz%G_4(2j$MWz+DxpGG5E<~RUEUVB@QqG7WUr)_fL`l

delta 45
zcmZp0XmFSy&B#7c#+i|QW5N=C0XBXk2L9Xp+xRE)7xD-38*MD?<(t?rak7#8IRGD7
B4aooi

diff --git a/main_app.py b/main_app.py
index 7235791..edd7eb9 100644
--- a/main_app.py
+++ b/main_app.py
@@ -11,5 +11,6 @@
             'tools.response_headers.headers': [('Content-Type', 'application/json')],
         }
     }
+    cherrypy.config.update({'server.socket_host': "0.0.0.0"})
     cherrypy.config.update({'server.socket_port': 8080})
     cherrypy.quickstart(MeasurementService(), '/', config)