ratio1 3.4.123__tar.gz → 3.4.125__tar.gz

{ratio1-3.4.123 → ratio1-3.4.125}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ratio1
-Version: 3.4.123
+Version: 3.4.125
 Summary: `ratio1` or Ration1 SDK is the Python SDK required for client app development for the Ratio1 ecosystem
 Project-URL: Homepage, https://github.com/Ratio1/ratio1_sdk
 Project-URL: Bug Tracker, https://github.com/Ratio1/ratio1_sdk/issues

{ratio1-3.4.123 → ratio1-3.4.125}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ratio1"
-version = "3.4.123"
+version = "3.4.125"
 authors = [
   { name="Andrei Ionut Damian", email="andrei.damian@ratio1.ai" },
   { name="Cristan Bleotiu", email="cristian.bleotiu@ratio1.ai" },

{ratio1-3.4.123 → ratio1-3.4.125}/ratio1/_ver.py

@@ -1,4 +1,4 @@
-__VER__ = "3.4.123"
+__VER__ = "3.4.125"
 
 if __name__ == "__main__":
   with open("pyproject.toml", "rt") as fd:

{ratio1-3.4.123 → ratio1-3.4.125}/ratio1/bc/base.py

@@ -92,54 +92,49 @@ class _SimpleJsonEncoder(json.JSONEncoder):
       return float(obj)
     elif isinstance(obj, np.ndarray):
       return obj.tolist()
-    elif isinstance(obj, np.ndarray):
-      return obj.tolist()
-    elif isinstance(obj, datetime.datetime):
-      return obj.strftime("%Y-%m-%d %H:%M:%S")
-    else:
-      return super(_SimpleJsonEncoder, self).default(obj)
-
-class _ComplexJsonEncoder(json.JSONEncoder):
-  def default(self, obj):
-    if isinstance(obj, np.integer):
-      return int(obj)
-    elif isinstance(obj, np.floating):
-      return float(obj)
-    elif isinstance(obj, np.ndarray):
-      return obj.tolist()
+    # Datetime
     elif isinstance(obj, datetime.datetime):
       return obj.strftime("%Y-%m-%d %H:%M:%S")
-    else:
-      return super(_ComplexJsonEncoder, self).default(obj)
+    # torch
+    elif "torch" in str(type(obj)):
+      return str(obj)
+    # default
+    return super(_SimpleJsonEncoder, self).default(obj)
 
+class _ComplexJsonEncoder(_SimpleJsonEncoder):
   def iterencode(self, o, _one_shot=False):
     """Encode the given object and yield each string representation as available."""
-    if self.check_circular:
-      markers = {}
-    else:
-      markers = None
-    if self.ensure_ascii:
-      _encoder = json.encoder.encode_basestring_ascii
-    else:
-      _encoder = json.encoder.encode_basestring
-    
-    def floatstr(o, allow_nan=self.allow_nan, _repr=float.__repr__, _inf=json.encoder.INFINITY, _neginf=-json.encoder.INFINITY):
-      if o != o:  # Check for NaN
-        text = 'null'
-      elif o == _inf:
-        text = 'null'
-      elif o == _neginf:
-        text = 'null'
-      else:
-        return repr(o).rstrip('0').rstrip('.') if '.' in repr(o) else repr(o)
+    markers = {} if self.check_circular else None
+    _encoder = json.encoder.encode_basestring_ascii if self.ensure_ascii else json.encoder.encode_basestring
 
-      if not allow_nan:
-        raise ValueError("Out of range float values are not JSON compliant: " + repr(o))
-      
-      return text
+    def floatstr(
+        x, allow_nan=self.allow_nan, _repr=float.__repr__,
+        _inf=json.encoder.INFINITY, _neginf=-json.encoder.INFINITY
+    ):
+      # CRITICAL: normalize float subclasses (np.float64, etc.) to builtin float
+      # so we never emit "np.float64(9.99)" into JSON.
+      if type(x) is not float:
+        x = float(x)
+      # endif type check
+
+      # Check for NaN, Inf, -Inf
+      if x != x or x == _inf or x == _neginf:
+        if not allow_nan:
+          raise ValueError("Out of range float values are not JSON compliant: " + _repr(x))
+        return "null"
+
+      # Use builtin float repr (stable, JSON numeric literal)
+      return _repr(x)
+    # enddef floatstr
+
+    # Convert indent to string if it's an integer (required for Python 3.13+)
+    indent = self.indent
+    if indent is not None and not isinstance(indent, str):
+      indent = ' ' * indent
+    # endif indent not string
 
     _iterencode = json.encoder._make_iterencode(
-      markers, self.default, _encoder, self.indent, floatstr,
+      markers, self.default, _encoder, indent, floatstr,
       self.key_separator, self.item_separator, self.sort_keys,
       self.skipkeys, _one_shot
     )

{ratio1-3.4.123 → ratio1-3.4.125}/ratio1/logging/logger_mixins/json_serialization_mixin.py

@@ -1,13 +1,10 @@
 import json
 import yaml
 import os
-import numpy as np
 import traceback
-import datetime 
 
-from collections import OrderedDict 
-
-from copy import deepcopy
+from collections import OrderedDict
+from ...bc.base import _ComplexJsonEncoder, _SimpleJsonEncoder, replace_nan_inf
 
 def copy_docstring(original):
   """
@@ -29,98 +26,15 @@ def copy_docstring(original):
   return decorator
 
 
-def replace_nan_inf(data, inplace=False):
-  assert isinstance(data, (dict, list)), "Only dictionaries and lists are supported"
-  if inplace:
-    d = data
-  else:
-    d = deepcopy(data)    
-  stack = [d]
-  while stack:
-    current = stack.pop()
-    for key, value in current.items():
-      if isinstance(value, dict):
-        stack.append(value)
-      elif isinstance(value, list):
-        for item in value:
-          if isinstance(item, dict):
-            stack.append(item)
-      elif isinstance(value, float) and (np.isnan(value) or np.isinf(value)):
-        current[key] = None
-  return d 
-
-class SimpleNPJson(json.JSONEncoder):
+class SimpleNPJson(_SimpleJsonEncoder):
   """
   Used to help jsonify numpy arrays or lists that contain numpy data types,
   and handle datetime.
   """
-  def default(self, obj):
-    if isinstance(obj, np.integer):
-      return int(obj)
-    elif isinstance(obj, np.floating):
-      return float(obj)
-    elif isinstance(obj, np.ndarray):
-      return obj.tolist()
-    elif isinstance(obj, datetime.datetime):
-      return obj.strftime("%Y-%m-%d %H:%M:%S")
-    elif "torch" in str(type(obj)):
-      return str(obj)
-    else:
-      return super(SimpleNPJson, self).default(obj)
-
-class NPJson(json.JSONEncoder):
-  def default(self, obj):
-    if isinstance(obj, np.integer):
-      return int(obj)
-    elif isinstance(obj, np.floating):
-      return float(obj)
-    elif isinstance(obj, np.ndarray):
-      return obj.tolist()
-    elif isinstance(obj, datetime.datetime):
-      return obj.strftime("%Y-%m-%d %H:%M:%S")
-    elif "torch" in str(type(obj)):
-      return str(obj)
-    else:
-      return super(NPJson, self).default(obj)
-
-  def iterencode(self, o, _one_shot=False):
-    """Encode the given object and yield each string representation as available."""
-    if self.check_circular:
-      markers = {}
-    else:
-      markers = None
-    if self.ensure_ascii:
-      _encoder = json.encoder.encode_basestring_ascii
-    else:
-      _encoder = json.encoder.encode_basestring
-    
-    def floatstr(o, allow_nan=self.allow_nan, _repr=float.__repr__, _inf=json.encoder.INFINITY, _neginf=-json.encoder.INFINITY):
-      if o != o:  # Check for NaN
-        text = 'null'
-      elif o == _inf:
-        text = 'null'
-      elif o == _neginf:
-        text = 'null'
-      else:
-        return repr(o).rstrip('0').rstrip('.') if '.' in repr(o) else repr(o)
-
-      if not allow_nan:
-        raise ValueError("Out of range float values are not JSON compliant: " + repr(o))
-
-      return text
-
-    # Convert indent to string if it's an integer (required for Python 3.13+)
-    indent = self.indent
-    if indent is not None and not isinstance(indent, str):
-      indent = ' ' * indent
-
-    _iterencode = json.encoder._make_iterencode(
-      markers, self.default, _encoder, indent, floatstr,
-      self.key_separator, self.item_separator, self.sort_keys,
-      self.skipkeys, _one_shot
-    )
-    return _iterencode(o, 0)
+  pass
 
+class NPJson(_ComplexJsonEncoder):
+  pass
 
 class _JSONSerializationMixin(object):
   """