atk-common 1.6.0__py3-none-any.whl → 1.7.0__py3-none-any.whl

atk_common/__init__.py

@@ -6,7 +6,7 @@ from atk_common.http_utils import is_status_code_ok, get_test_response
 from atk_common.log_utils import add_log_item, add_log_item_http
 from atk_common.rabbitmq_consumer import RabbitMQConsumer
 from atk_common.response_utils import create_save_resp
-from atk_common.docker_utils import get_image_version, get_current_container_info
+from atk_common.docker_utils import get_current_container_info
 
 __all__ = [
     'date_time_utc',
@@ -23,6 +23,5 @@ __all__ = [
     'add_log_item_http',
     'RabbitMQConsumer',
     'create_save_resp',
-    'get_image_version',
     'get_current_container_info',
 ]

atk_common/docker_utils.py

@@ -1,41 +1,30 @@
 import docker
-import os
 import socket
-from atk_common.env_utils import get_env_value
+from atk_common.log_utils import add_log_item
 
-def find_image_prop_list_by_name(image_list, image_name):
-    for image in image_list:
-        if image.tags and len(image.tags) > 0:
-            # Check if the image name is in the first tag
-            if image_name in image.tags[0]:
-                return image.tags[0]
-    return None
+def get_image_name_and_version(tags):
+    if tags:
+        # Use the first tag (usually only one)
+        full_tag = tags[0]  # e.g., 'bo-crypto-wrapper-api:latest'
 
-def get_image_version(default_value=None):
-    """
-    Get the version of a Docker image.
+        if ":" in full_tag:
+            image_name, image_version = full_tag.split(":", 1)
+        else:
+            image_name = full_tag
+            image_version = "<none>"
+        return image_name, image_version
+    else:
+        return None, None
     
-    :param image_name: Name of the Docker image
-    :return: Version of the Docker image
-    """
-    try:
-        image_name = get_env_value('DOCKER_IMAGE_NAME', default_value)
-        if image_name is None:
-            return None
-        client = docker.from_env()
-        image_list = client.images.list()
-        image_prop_list = find_image_prop_list_by_name(image_list, image_name)
-        if image_prop_list is None:
-            return None
-        image_props = image_prop_list.split(':')
-        if len(image_props) < 2:
-            return None
-        return image_props[1] 
-    except docker.errors.ImageNotFound:
-        return None
+def create_port_item(port, binding):
+    data = {}
+    data['port'] = port
+    data['binding'] = binding
+    return data
 
 def get_current_container_info():
     try:
+        data = {}
         client = docker.from_env()
 
         # Get current container's hostname (usually the container ID)
@@ -44,22 +33,20 @@ def get_current_container_info():
         # Fetch container object using partial ID
         container = client.containers.get(container_id)
 
-        name = container.name
+        tags_info = get_image_name_and_version(container.image.tags)
+        data['imageName'] = tags_info[0]
+        data['imageVersion'] = tags_info[1]
+        data['containerName'] = container.name
         ports = container.attrs['NetworkSettings']['Ports']
-
-        print(f"🔍 Container name: {name}")
-        print("🌐 Port mappings:")
+        data['ports'] = []
         if ports:
             for container_port, host_bindings in ports.items():
                 if host_bindings:
                     for binding in host_bindings:
-                        print(f"  {container_port} -> {binding['HostIp']}:{binding['HostPort']}")
+                        data['ports'].append(create_port_item(container_port, f"{binding['HostIp']}:{binding['HostPort']}"))
                 else:
-                    print(f"  {container_port} -> Not bound to host")
-        else:
-            print("No exposed ports found.")
-        return None
-
+                    data['ports'].append(create_port_item(container_port, None))
+        return data
     except Exception as e:
-        print("❌ Error getting container info:", e)
+        add_log_item("Error getting container info:" + str(e))
         return None

atk_common/error_utils.py

@@ -1,7 +1,6 @@
 from datetime import datetime
 import json
 from atk_common.datetime_utils import get_utc_date_time
-from atk_common.docker_utils import get_image_version
 from atk_common.log_utils import add_log_item
 from atk_common.response_utils import create_save_resp
 
@@ -10,22 +9,36 @@ def get_message(error):
         return str(error.message)
     else:
         return str(error)
+    
+def create_error_log(data):
+    err_str = data['message'] + ', statusCode: ' + str(data['statusCode']) + ', method: ' + data['method']
+    if data['containerInfo'] is not None:
+        err_str += ', imageName: ' + data['containerInfo']['imageName']
+        err_str += ', imageVersion: ' + data['containerInfo']['imageVersion']
+        err_str += ', containerName: ' + data['containerInfo']['containerName']
+    else:
+        err_str += ', imageName: <none>'
+        err_str += ', imageVersion: <none>'
+        err_str += ', containerName: <none>'
+    add_log_item(err_str)
 
-def get_error_entity(app, error, component, method, error_type, status_code):
+def get_error_entity(app, error, method, error_type, status_code, container_info):
     data = {}
     data['statusCode'] = status_code
     data['exceptionType'] = str(type(error))
     data['errorType'] = error_type
     data['message'] = get_message(error)
-    data['component'] = component
     data['method'] = method
-    data['imageVersion'] = get_image_version(component)
     data['timestamp'] = get_utc_date_time()
-    return app.response_class(
-        response=json.dumps(data),
-        status=500,
-        mimetype='application/json'
-    )
+    data['containerInfo'] = container_info
+    create_error_log(data)
+    if app is not None:
+        return app.response_class(
+            response=json.dumps(data),
+            status=500,
+            mimetype='application/json'
+        )
+    return None
 
 def handle_error(resp, status):
     if resp.status_code == 500:

atk_common/http_utils.py

@@ -1,24 +1,23 @@
 import json
 from atk_common.datetime_utils import get_utc_date_time
-from atk_common.docker_utils import get_current_container_info, get_image_version
+from atk_common.docker_utils import get_current_container_info
 from atk_common.env_utils import get_env_value
 
 def is_status_code_ok(status_code):
     return status_code >= 200 and status_code < 300
 
-def get_test_response(default_value=None):
+def get_test_response():
     data = {}
     container_info = get_current_container_info()
     if container_info is not None:
-        data['containerName'] = container_info.name
-        data['containerPorts'] = container_info.ports
+        data['imageName'] = container_info['imageName']
+        data['imageVersion'] = container_info['imageVersion']
+        data['containerName'] = container_info['containerName']
+        data['containerPorts'] = container_info['ports']
     else:
+        data['imageName'] = None
+        data['imageVersion'] = None
         data['containerName'] = None
         data['containerPorts'] = None
-    data['imageName'] = get_env_value('DOCKER_IMAGE_NAME', default_value)
-    if data['imageName'] is None:
-        data['imageVersion'] = None
-    else:
-        data['imageVersion'] = get_image_version(data['imageName'])
     data['timestamp'] = get_utc_date_time()
     return data

{atk_common-1.6.0.dist-info → atk_common-1.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: atk_common
-Version: 1.6.0
+Version: 1.7.0
 Summary: ATK common methods
 Home-page: https://github.com/pypa/atk_common
 Author: Roger

{atk_common-1.6.0.dist-info → atk_common-1.7.0.dist-info}/RECORD

@@ -1,9 +1,9 @@
-atk_common/__init__.py,sha256=aMDKBJAczXZpgr_BsuwsWKN14OE9h3UyzHoLu5cGs3I,1001
+atk_common/__init__.py,sha256=9aedYjZ5adS3zor4HPYubrFAmq2LuxhdtfwUKjDS6dE,956
 atk_common/datetime_utils.py,sha256=qsVF7l90P1-xukG2tV_jLqG9J_Yfl5wTpyfrdPBlyMo,239
-atk_common/docker_utils.py,sha256=BuulyBYuUoNS-iV4ZsknRifx5L2KWcKrrHDRqg6zqaY,2194
+atk_common/docker_utils.py,sha256=AY3SoMVm8wZkTnlJtQPhyOVoKxuKbyS2ICIguCrED6Y,1804
 atk_common/env_utils.py,sha256=66v-S0vlkJNaun6ay1XcOGRtYJb4Ce4odJsWxuaHsQc,373
-atk_common/error_utils.py,sha256=5OiL5nMBEkDc193m2cVMD2Bs-fwRvPeSlI7PwnqB0o4,1533
-atk_common/http_utils.py,sha256=t2XmuDMBjUAH071qwarZ6hcTBzpO_4a9x10E8MU2EMc,924
+atk_common/error_utils.py,sha256=JBc-yl5_29BSZ6d2kZBEX3X17qCDvEa_GZ7FC7sYwdc,2115
+atk_common/http_utils.py,sha256=GF1OTTgsOg2iN60r6Da2oWU8vOOuQzsGrEwMKcOJtwE,866
 atk_common/log_utils.py,sha256=DGGwXjD5jvpMZJNW1QBoJRdDaTY1e1Z69j0LSOOzsWA,419
 atk_common/rabbitmq_consumer.py,sha256=4MhuwZs47Jt1fX4sUxr1MKRe7o2QRbPe9_utXEsa8QE,1907
 atk_common/response_utils.py,sha256=ezqTSNdGwueFXzijKB7CKPWxZml39bqjAZOeIMWMntk,197
@@ -22,8 +22,8 @@ atk_package/enums/__init__.py,sha256=oW0aVnwewfH6sNu14jjZ5_uP4iRN4pRmGdTNC204rHo
 atk_package/enums/command_status_enum.py,sha256=M2Nln27a_DbzI07-gfytWQk2X087JhkU6Fmard5qVHs,127
 atk_package/enums/speed_control_status_enum.py,sha256=qpURh0K1L1tSpbrzVnckoe4hUn1illIkbo7k4mLfzIM,182
 shared_python_atk_enforcement/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-atk_common-1.6.0.dist-info/METADATA,sha256=ikyiDptd6cRlvezu9lz_0aKnCfS0_6LeHqHkxpT_OOA,1193
-atk_common-1.6.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-atk_common-1.6.0.dist-info/license.txt,sha256=_0O6fWM00-wTurDjnZhUP_N5QiwGhItaQZqHq5eqadA,1063
-atk_common-1.6.0.dist-info/top_level.txt,sha256=4CwRjkLnheIdI4jQwc4tK3dbRc58WqUmoqjkdDTWlME,41
-atk_common-1.6.0.dist-info/RECORD,,
+atk_common-1.7.0.dist-info/METADATA,sha256=jKzI0ZFXA0TjvY43_0Yw39s2eLf5L21Xk51QfLhCxdk,1193
+atk_common-1.7.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+atk_common-1.7.0.dist-info/license.txt,sha256=_0O6fWM00-wTurDjnZhUP_N5QiwGhItaQZqHq5eqadA,1063
+atk_common-1.7.0.dist-info/top_level.txt,sha256=4CwRjkLnheIdI4jQwc4tK3dbRc58WqUmoqjkdDTWlME,41
+atk_common-1.7.0.dist-info/RECORD,,