fix(build): update build arguments and version

- Changed BASE_IMAGE in BUILD_ARGS from python:3.9.21-slim-bookworm to python:3.10.16-slim-bookworm.
- Updated BUILD_DATE to 2025-04-01T23:04:43UTC.
- Modified LOCAL_SERVER IP address from 100.65.0.17 to 20.20.5.172.
- Bumped version in BUILD_ARGS from 2.1.7 to 2.1.12.
- Enhanced timestamp logging in convert_timestamp.py to include UTC time zone.
- Improved CPU time statistics gathering in server.py with better error handling and validation.
- Updated timestamp_to_string function in date_utils.py to support timezone conversion.
- Added timezone setup in test_typing_time.py for consistent test results.

Author: JINWOO-J

BUILD_ARGS

@@ -1,14 +1,14 @@
 
---build-arg BASE_IMAGE=python:3.9.21-slim-bookworm  
---build-arg BUILD_DATE=2025-03-04T23:47:58UTC  
+--build-arg BASE_IMAGE=python:3.10.16-slim-bookworm  
+--build-arg BUILD_DATE=2025-04-01T23:04:43UTC  
 --build-arg DOCKER_BUILD_OPTION=--no-cache --rm=true  
 --build-arg ECHO_OPTION=  
 --build-arg GIT_USER=JINWOO-J  
 --build-arg IS_MULTI_ARCH=false  
---build-arg LOCAL_SERVER=100.65.0.17  
+--build-arg LOCAL_SERVER=20.20.5.172  
 --build-arg NAME=pawnlib  
 --build-arg PRIMARY_BRANCH=master  
 --build-arg REPO_HUB=jinwoo  
 --build-arg SED_OPTION=''  
 --build-arg UNAME_S=Darwin  
---build-arg VERSION=2.1.7  
+--build-arg VERSION=2.1.12  

examples/converter/convert_timestamp.py

@@ -12,4 +12,5 @@
 number_list = []
 
 for unixtime_stamp in [1646060400000000, 1646060400]:
-    pawn.console.log(timestamp_to_string(unixtime_stamp))
+    pawn.console.log(f"Local Time Zone: {timestamp_to_string(unixtime_stamp)}")
+    pawn.console.log(f"UTC Time Zone: {timestamp_to_string(unixtime_stamp, tz='UTC')}")

pawnlib/resource/server.py

@@ -1470,46 +1470,83 @@ def convert_values_to_unit(data, convert_unit):
     return data
 
 
-def get_cpu_time():
+def get_cpu_time() -> Dict[str, Dict[str, float]]:
+    """
+    Reads /proc/stat to gather CPU time statistics for each CPU core.
+    Returns a dictionary with CPU IDs and their respective time metrics.
+    """
     cpu_infos = {}
-    if os.path.exists('/proc/stat'):
-        with open('/proc/stat', 'r') as file_stat:
-            cpu_lines = []
-            for lines in file_stat.readlines():
-                for line in lines.split('\n'):
-                    if line.startswith('cpu'):
-                        cpu_lines.append(line.split(' '))
-            for cpu_line in cpu_lines:
-                if '' in cpu_line:
-                    cpu_line.remove('')  # First row(cpu) exist '' and Remove ''
-                cpu_id = cpu_line[0]
-                cpu_line = [float(item) for item in cpu_line[1:]]
-                user, nice, system, idle, iowait, irq, softirq, steal, guest, guest_nice = cpu_line
-
-                idle_time = idle + iowait
-                non_idle_time = user + nice + system + irq + softirq + steal
-                total = idle_time + non_idle_time
-
-                cpu_infos.update({cpu_id: {'total': total, 'idle': idle_time, 'iowait': iowait}})
+    if not os.path.exists('/proc/stat'):
+        return cpu_infos  # Return empty dict if /proc/stat is unavailable
+
+    with open('/proc/stat', 'r') as file_stat:
+        for line in file_stat:
+            if not line.startswith('cpu'):
+                continue
+            fields = [field for field in line.split() if field]  # Remove empty strings
+            if len(fields) < 5:  # Basic validation for expected fields
+                continue
+
+            cpu_id = fields[0]
+            times = [float(t) for t in fields[1:]]  # Convert to floats
+            user, nice, system, idle, iowait = times[:5]  # Core fields
+            # Optional fields (irq, softirq, etc.) may not always be present
+            irq = times[5] if len(times) > 5 else 0
+            softirq = times[6] if len(times) > 6 else 0
+            steal = times[7] if len(times) > 7 else 0
+
+            idle_time = idle + iowait
+            non_idle_time = user + nice + system + irq + softirq + steal
+            total_time = idle_time + non_idle_time
+
+            cpu_infos[cpu_id] = {
+                'total': total_time,
+                'idle': idle_time,
+                'iowait': iowait
+            }
     return cpu_infos
 
 
-def get_cpu_usage_percentage():
+def get_cpu_usage_percentage(interval: float = 1.0) -> Dict[str, float]:
+    """
+    Calculates CPU usage percentage over a given interval.
+    Returns a dictionary with CPU usage percentages per core, average, and iowait.
+    """
     start = get_cpu_time()
-    time.sleep(1)
+    if not start:
+        return {}
+
+    time.sleep(interval)
     end = get_cpu_time()
+    if not end:
+        return {}
+
     cpu_usages = {}
     iowait_usages = []
+
     for cpu in start:
-        diff_total = end[cpu]['total'] - start[cpu]['total']
-        diff_idle = end[cpu]['idle'] - start[cpu]['idle']
-        diff_iowait = end[cpu].get('iowait', 0) - start[cpu].get('iowait', 0)
-        iowait_usages.append(diff_iowait)
-        cpu_usage_percentage = (diff_total - diff_idle) / diff_total * 100
-        cpu_usages.update({cpu: round(cpu_usage_percentage, 2)})
+        if cpu not in end:
+            continue  # Skip if CPU data is missing in end snapshot
+        try:
+            diff_total = end[cpu]['total'] - start[cpu]['total']
+            diff_idle = end[cpu]['idle'] - start[cpu]['idle']
+            diff_iowait = end[cpu]['iowait'] - start[cpu]['iowait']
+
+            if diff_total <= 0:  # Avoid division by zero or negative time
+                cpu_usage_percentage = 0.0
+            else:
+                cpu_usage_percentage = (diff_total - diff_idle) / diff_total * 100
+
+            cpu_usages[cpu] = round(cpu_usage_percentage, 2)
+            iowait_usages.append(diff_iowait)
+        except KeyError as e:
+            print(f"Warning: Missing data for {cpu}: {e}")
+            continue
+
     if cpu_usages:
-        cpu_usages['avg'] = round(sum(cpu_usages.values()) / len(cpu_usages.values()), 2)
+        cpu_usages['avg'] = round(sum(cpu_usages.values()) / len(cpu_usages), 2)
         cpu_usages['iowait'] = round(sum(iowait_usages) / len(iowait_usages), 2)
+
     return cpu_usages
 
 

pawnlib/typing/date_utils.py

@@ -11,7 +11,7 @@
 from functools import lru_cache
 
 if sys.version_info >= (3, 9):
-    from zoneinfo import ZoneInfo
+    from zoneinfo import ZoneInfo, ZoneInfoNotFoundError
     USE_ZONEINFO = True
 else:
     USE_ZONEINFO = False
@@ -317,26 +317,30 @@ def format_seconds_to_hhmmss(seconds: int = 0):
         return seconds
 
 
-def timestamp_to_string(unix_timestamp: int, str_format='%Y-%m-%d %H:%M:%S'):
+def timestamp_to_string(unix_timestamp: int, str_format: str = '%Y-%m-%d %H:%M:%S', tz: Optional[Union[str, datetime.tzinfo]] = None) -> str:
     """
+    Converts a Unix timestamp to a formatted string based on local timezone or specified timezone.
 
-    This functions will be returned unix timestamp to hh:mm:ss format
-
-    :param unix_timestamp: unix_timestamp
-    :param str_format: string format
-    :return:
+    :param unix_timestamp: Unix timestamp (seconds, milliseconds, or microseconds)
+    :param str_format: Output string format (default: '%Y-%m-%d %H:%M:%S')
+    :param tz: Timezone as string (e.g., 'UTC', 'Asia/Seoul') or tzinfo object (default: None, uses local timezone)
+    :return: Formatted datetime string
 
     Example:
-
         .. code-block:: python
-
             from pawnlib.typing import date_utils
 
+            # Local timezone (default)
             date_utils.timestamp_to_string(12323232323)
+            # >> '2360-07-05 09:05:23' (local timezone, e.g., KST)
 
-            # >> '2360-07-05 09:05:23'
-
+            # UTC timezone
+            date_utils.timestamp_to_string(12323232323, tz='UTC')
+            # >> '2360-07-05 00:05:23' (UTC)
 
+            # Asia/Seoul timezone
+            date_utils.timestamp_to_string(12323232323, tz='Asia/Seoul')
+            # >> '2360-07-05 09:05:23' (Asia/Seoul)
     """
     if isinstance(unix_timestamp, str):
         unix_timestamp = unix_timestamp.strip()
@@ -346,15 +350,25 @@ def timestamp_to_string(unix_timestamp: int, str_format='%Y-%m-%d %H:%M:%S'):
     ts_length = len(str(unix_timestamp))
 
     if ts_length == const.SECONDS_DIGITS:
-        timestamp_in_seconds = unix_timestamp
+        timestamp_in_seconds = int(unix_timestamp)
     elif ts_length == const.MILLI_SECONDS_DIGITS:
-        timestamp_in_seconds = unix_timestamp / 1_000
+        timestamp_in_seconds = int(unix_timestamp) / 1_000
     elif ts_length == const.MICRO_SECONDS_DIGITS:
-        timestamp_in_seconds = unix_timestamp / 1_000_000
+        timestamp_in_seconds = int(unix_timestamp) / 1_000_000
     else:
         raise ValueError(f'Invalid timestamp length - length={ts_length}, timestamp={unix_timestamp}')
 
-    return datetime.datetime.fromtimestamp(timestamp_in_seconds).strftime(str_format)
+    
+    if isinstance(tz, str):
+        try:
+            timezone = get_timezone(tz)
+        except ZoneInfoNotFoundError as e:
+            raise ValueError(f"Unsupported timezone: {tz} ({e})")
+    else:
+        timezone = tz
+
+    dt = datetime.datetime.fromtimestamp(timestamp_in_seconds, tz=timezone)
+    return dt.strftime(str_format)
 
 
 def second_to_dayhhmm(seconds: int = 0):

tests/test_typing_time.py

@@ -8,6 +8,11 @@
 import datetime
 from pawnlib.typing.date_utils import convert_unix_timestamp, get_range_day_of_month, timestamp_to_string, TimeCalculator, todaydate
 from pawnlib.output import cprint
+import time
+import os
+os.environ['TZ'] = 'Asia/Seoul'
+time.tzset()
+
 
 
 class TestMethodRequest(unittest.TestCase):