ratio1 3.4.124__py3-none-any.whl → 3.4.126__py3-none-any.whl

ratio1/_ver.py

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

ratio1/bc/base.py

@@ -92,51 +92,40 @@ 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

ratio1/logging/logger_mixins/computer_vision_mixin.py

@@ -270,10 +270,18 @@ class _ComputerVisionMixin(object):
       plt.axis('off')
     fig = plt.gcf()
     fig.canvas.draw()
-    data = np.frombuffer(fig.canvas.tostring_rgb(), dtype=np.uint8)
-    w, h = fig.canvas.get_width_height()
     try:
-      np_img = data.reshape((int(h), int(w), -1))
+      w, h = fig.canvas.get_width_height()
+      if hasattr(fig.canvas, 'tostring_rgb'):
+        data = np.frombuffer(fig.canvas.tostring_rgb(), dtype=np.uint8)
+        np_img = data.reshape((int(h), int(w), 3))
+      elif hasattr(fig.canvas, 'tostring_argb'):
+        data = np.frombuffer(fig.canvas.tostring_argb(), dtype=np.uint8)
+        argb = data.reshape((int(h), int(w), 4))
+        np_img = argb[:, :, 1:4]
+      else:
+        rgba = np.asarray(fig.canvas.buffer_rgba())
+        np_img = rgba[:, :, :3]
     except Exception as e:
       print(e)
       np_img = None
@@ -440,4 +448,4 @@ class _ComputerVisionMixin(object):
     resized = cv2.resize(image, dim, interpolation = inter)
 
     # return the resized image
-    return resized
+    return resized

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):
   """

{ratio1-3.4.124.dist-info → ratio1-3.4.126.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ratio1
-Version: 3.4.124
+Version: 3.4.126
 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.124.dist-info → ratio1-3.4.126.dist-info}/RECORD

@@ -1,5 +1,5 @@
 ratio1/__init__.py,sha256=YimqgDbjLuywsf8zCWE0EaUXH4MBUrqLxt0TDV558hQ,632
-ratio1/_ver.py,sha256=V3wM9ENgD5iKWU_u3Dv1dX0N64XQgIwz2-AUegpOMeU,332
+ratio1/_ver.py,sha256=WYlO2MZRg2pVclGXnijRTllaAOkXr7doUQiRB9lTCDY,332
 ratio1/base_decentra_object.py,sha256=iXvAAf6wPnGWzeeiRfwLojVoan-m1e_VsyPzjUQuENo,4492
 ratio1/plugins_manager_mixin.py,sha256=X1JdGLDz0gN1rPnTN_5mJXR8JmqoBFQISJXmPR9yvCo,11106
 ratio1/base/__init__.py,sha256=hACh83_cIv7-PwYMM3bQm2IBmNqiHw-3PAfDfAEKz9A,259
@@ -14,7 +14,7 @@ ratio1/base/webapp_pipeline.py,sha256=H83EjkmyljetdHZ18V5R8OU3wXoWi_EpV0AAhQ4AM6
 ratio1/base/payload/__init__.py,sha256=y8fBI8tG2ObNfaXFWjyWZXwu878FRYj_I8GIbHT4GKE,29
 ratio1/base/payload/payload.py,sha256=MoCeL6iZzl1an-4eqRpLW0iz6Yk3OvlBrymcmhWeecM,2689
 ratio1/bc/__init__.py,sha256=BI5pcqHdhwnMdbWTYDLW1cVP_844VtLra-lz7xprgsk,171
-ratio1/bc/base.py,sha256=sqiGjsskpD4L9Tb53mHdrla9DL85PsfJS8ah7kR_63c,46477
+ratio1/bc/base.py,sha256=LU75I3ef-yzlke30YPP94lHWw8AaCPqUz185jIL3AnQ,46254
 ratio1/bc/chain.py,sha256=HCTQGnmuKqTvUo95OKdg8rL2jhKfSMwrich2e_7Nyms,2336
 ratio1/bc/ec.py,sha256=FwlkWmJvQ9aHuf_BZX1CWSUAxw6OZ9jBparLIWcs_e4,18933
 ratio1/bc/evm.py,sha256=iMLdm_rtQFqmt44zTE_UA0OKSTmuH7sCSI2iKvFI1_k,52013
@@ -87,11 +87,11 @@ ratio1/logging/base_logger.py,sha256=iwNirMP38xEA26K8arwDjHXOjJhjE5q_SHzipjqAQzo
 ratio1/logging/small_logger.py,sha256=BoCCEDManhe804zqfykZAvXUu9gV0_2NPebftUMIyPk,2998
 ratio1/logging/logger_mixins/__init__.py,sha256=fmDmGVDV41Dfoafe0yCZxJ_CqxWac4DSM8hO6UZnrcA,641
 ratio1/logging/logger_mixins/class_instance_mixin.py,sha256=x2vr_VrRAzGhjgayPxV9t3XtU-c0VoHZb6cjDbslJM8,2725
-ratio1/logging/logger_mixins/computer_vision_mixin.py,sha256=TrtG7ayM2ab-4jjIkIWAQaFi9cVfiINAWrJCt8mCCFI,13213
+ratio1/logging/logger_mixins/computer_vision_mixin.py,sha256=9IccYDZFnBNEUutymvEdhmStPrhK-XT-B55x7g-sRH8,13567
 ratio1/logging/logger_mixins/datetime_mixin.py,sha256=ORqOW4bxaI0UKLtII8-QhOiHvIfwNfz1irBrdYsOJFA,11264
 ratio1/logging/logger_mixins/download_mixin.py,sha256=ZZ1QuQ7kDcUkxhu65odD2pvBRlogsb8mvEEViIYV_L0,18668
 ratio1/logging/logger_mixins/general_serialization_mixin.py,sha256=bNM-6AsYhKD56v79hvJDgO8un5rHH4IKv1XJ3yksseQ,7424
-ratio1/logging/logger_mixins/json_serialization_mixin.py,sha256=Xs_3zufgP7HLwBBWYOdcvd5b__clY3dG7Bc1RshJN4c,15407
+ratio1/logging/logger_mixins/json_serialization_mixin.py,sha256=GFtk3oDd0rstq0au2QthOkxhUWBHctt4WyDLRKQ-TBo,12729
 ratio1/logging/logger_mixins/machine_mixin.py,sha256=BOk7nHThRG6nNVK8atM5TrBfuHuaeLwb2sheLvE357o,3985
 ratio1/logging/logger_mixins/pickle_serialization_mixin.py,sha256=tmdmoRz38iJGfK4J37oEghbRizN4BdZs7F2kObZ2ldQ,11391
 ratio1/logging/logger_mixins/process_mixin.py,sha256=eI0izBAhStPOant2SZv2ZuTDH10s2ON_CkuGQEEFew4,1888
@@ -109,8 +109,8 @@ ratio1/utils/comm_utils.py,sha256=4cS9llRr_pK_3rNgDcRMCQwYPO0kcNU7AdWy_LtMyCY,10
 ratio1/utils/config.py,sha256=Elfkl7W4aDMvB5WZLiYlPXrecBncgTxb4hcKhQedMzI,10111
 ratio1/utils/dotenv.py,sha256=_AgSo35n7EnQv5yDyu7C7i0kHragLJoCGydHjvOkrYY,2008
 ratio1/utils/oracle_sync/oracle_tester.py,sha256=aJOPcZhtbw1XPqsFG4qYpfv2Taj5-qRXbwJzrPyeXDE,27465
-ratio1-3.4.124.dist-info/METADATA,sha256=KX9h9ghSAVUrTYsK5BQ6rOjtyRLpvMc34YLa_OdIIWs,12256
-ratio1-3.4.124.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-ratio1-3.4.124.dist-info/entry_points.txt,sha256=DR_olREzU1egwmgek3s4GfQslBi-KR7lXsd4ap0TFxE,46
-ratio1-3.4.124.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-ratio1-3.4.124.dist-info/RECORD,,
+ratio1-3.4.126.dist-info/METADATA,sha256=t3oQHfvAkdt0kMhcB3SRpPH4C69QYaO2hlNKzRgFVxw,12256
+ratio1-3.4.126.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+ratio1-3.4.126.dist-info/entry_points.txt,sha256=DR_olREzU1egwmgek3s4GfQslBi-KR7lXsd4ap0TFxE,46
+ratio1-3.4.126.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+ratio1-3.4.126.dist-info/RECORD,,