naeural-client 2.7.23__py3-none-any.whl → 2.7.24__py3-none-any.whl

naeural_client/_ver.py

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

naeural_client/base/generic_session.py

@@ -100,7 +100,7 @@ class GenericSession(BaseDecentrAIObject):
               root_topic="naeural",
               local_cache_base_folder=None,
               local_cache_app_folder='_local_cache',
-              use_home_folder=False,
+              use_home_folder=True,
               eth_enabled=True,
               auto_configuration=True,
               **kwargs
@@ -179,6 +179,11 @@ class GenericSession(BaseDecentrAIObject):
     auto_configuration : bool, optional
         If True, the SDK will attempt to complete the dauth process automatically.
         Defaults to True.
+        
+        
+    use_home_folder : bool, optional
+        If True, the SDK will use the home folder as the base folder for the local cache.
+        NOTE: if you need to use development style ./_local_cache, set this to False.
     """
     
     debug = debug or not debug_silent
@@ -818,11 +823,11 @@ class GenericSession(BaseDecentrAIObject):
             if needs_netconfig:
               lst_netconfig_request.append(node_addr)
           # end for each node in network map
+          self.P(f"Net mon from <{sender_addr}> `{ee_id}`:  {len(online_addresses)}/{len(all_addresses)}", color='y')
           if len(lst_netconfig_request) > 0:
             self.__request_pipelines_from_net_config_monitor(lst_netconfig_request)
           # end if needs netconfig
           nr_peers = sum(self._dct_can_send_to_node.values())
-          self.P(f"Net mon from <{sender_addr}> `{ee_id}`:  {len(online_addresses)}/{len(all_addresses)}", color='y')
           if nr_peers > 0 and not self.__at_least_one_node_peered:                
             self.__at_least_one_node_peered = True
             self.P(
@@ -2276,7 +2281,11 @@ class GenericSession(BaseDecentrAIObject):
           self.P("Node '{}' did not appear online in {:.1f}s.".format(node, tm() - _start), color='r')
       return found
 
-    def wait_for_node_configs(self, node, /, timeout=15, verbose=True, attempt_additional_requests=True):
+    def wait_for_node_configs(
+      self, node, /, 
+      timeout=15, verbose=True, 
+      attempt_additional_requests=True
+    ):
       """
       Wait for the node to have its configurations loaded.
 
@@ -2295,8 +2304,7 @@ class GenericSession(BaseDecentrAIObject):
           True if the node has its configurations loaded, False otherwise.
       """
 
-      if verbose:
-        self.P("Waiting for node '{}' to have its configurations loaded...".format(node))
+      self.P("Waiting for node '{}' to have its configurations loaded...".format(node))
 
       _start = tm()
       found = self.check_node_config_received(node)
@@ -2306,8 +2314,7 @@ class GenericSession(BaseDecentrAIObject):
         sleep(0.1)
         found = self.check_node_config_received(node)
         if not found and not additional_request_sent and (tm() - _start) > request_time_thr and attempt_additional_requests:
-          if verbose:
-            self.P("Re-requesting configurations of node '{}'...".format(node), show=True)
+          self.P("Re-requesting configurations of node '{}'...".format(node), show=True)
           node_addr = self.__get_node_address(node)
           self.__request_pipelines_from_net_config_monitor(node_addr)
           additional_request_sent = True

naeural_client/const/evm_net.py

@@ -36,7 +36,7 @@ EVM_NET_DATA = {
     EvmNetData.DAUTH_URL_KEY                    : "https://dauth-devnet.ratio1.ngrok.app/get_auth_data",
     EvmNetData.DAUTH_ND_ADDR_KEY                : "0x9f49fc29366F1C8285d42e7E82cA0bb668B32CeA",
     EvmNetData.DAUTH_RPC_KEY                    : "https://base-sepolia.public.blastapi.io",
-    EvmNetData.EE_GENESIS_EPOCH_DATE_KEY        : "2025-01-12 16:00:00",
+    EvmNetData.EE_GENESIS_EPOCH_DATE_KEY        : "2025-02-12 16:00:00",
     EvmNetData.EE_EPOCH_INTERVALS_KEY           : 1,
     EvmNetData.EE_EPOCH_INTERVAL_SECONDS_KEY    : 3600,
     EvmNetData.EE_SUPERVISOR_MIN_AVAIL_PRC_KEY  : 0.6,

naeural_client/logging/base_logger.py

@@ -20,7 +20,10 @@ from pathlib import Path
 
 from .tzlocal import get_localzone_name
 
-
+SDK_HOME = ".ratio1"
+SDK_HOME_PREV = [
+  ".naeural"
+]
 
 from .._ver import __VER__
 
@@ -108,6 +111,12 @@ class BaseLogger(object):
       })
     
     self._lock_table_mutex = threading.Lock()
+    
+    if base_folder is None:
+      base_folder = self.get_user_folder(as_str=True)
+      
+    if app_folder is None:
+      app_folder = "_local_cache"
 
     self._base_folder = base_folder
     self._app_folder = app_folder
@@ -206,6 +215,16 @@ class BaseLogger(object):
 
     return
   
+  @staticmethod
+  def get_user_folder(as_str=False, include_sdk_home=True):
+    """
+    Returns the user folder.
+    """    
+    path =  Path.home() / SDK_HOME if include_sdk_home else Path.home()
+    if as_str:
+      return str(path)
+    return path
+  
   def get_unique_id(self, size=8):
     """
     efficient and low-colision function for small unique id generation
@@ -1062,6 +1081,8 @@ class BaseLogger(object):
       json.dump(path_dict, fp, sort_keys=True, indent=4)
     self._add_log("{} error log changed to {}...".format(file_path, self.log_e_file))
     return
+  
+  
 
   def _get_cloud_base_folder(self, base_folder):
     upper = base_folder.upper()
@@ -1077,8 +1098,28 @@ class BaseLogger(object):
   def reload_config(self):
     self._configure_data_and_dirs(self.config_file, self.config_file_encoding)
     return
+  
+  def _maybe_migrate_folder(self):
+    if self.get_user_folder().is_dir():
+      return
+    user_base_folder = self.get_user_folder(as_str=True, include_sdk_home=True)
+    if user_base_folder in self._base_folder:
+      BaseLogger.print_color("Using default user folder. Checking for previous app homes...", color='d')
+      for old_sdk in SDK_HOME_PREV:
+        new_path = self.get_user_folder(as_str=False, include_sdk_home=True)
+        old_path = self.get_user_folder(as_str=False, include_sdk_home=False) / old_sdk
+        if old_path.is_dir():
+          BaseLogger.print_color(f"Found previous app home '{old_path}'. Renaming to '{SDK_HOME}'...", color='d')
+          old_path.rename(new_path)
+          break
+      #endfor
+    #endif
+    return
+
 
   def _configure_data_and_dirs(self, config_file, config_file_encoding=None):
+    self._maybe_migrate_folder()
+    
     self.config_file_encoding = config_file_encoding
     
     if self.no_folders_no_save:
@@ -1109,6 +1150,9 @@ class BaseLogger(object):
         BaseLogger.print_color("Loaded config [{}]".format(config_file))
       self.config_file = config_file
     else:
+
+      
+      
       self.config_data = {
         'BASE_FOLDER' : self._base_folder,
         'APP_FOLDER' : self._app_folder
@@ -1145,7 +1189,7 @@ class BaseLogger(object):
 
       if not os.path.isdir(self._base_folder):
         BaseLogger.print_color(
-          f"WARNING! Invalid app base folder '{self._base_folder}'! We create it automatically!",
+          f"WARNING! No application base folder '{self._base_folder}'!",
           color='r'
         )
       #endif

naeural_client/utils/config.py

@@ -8,9 +8,11 @@ from datetime import datetime
 from naeural_client.const.base import BCct, dAuth
 from naeural_client._ver import __VER__ as version
 
+from naeural_client.logging.base_logger import SDK_HOME, BaseLogger
+
 
 CONFIG_FILE = "config"
-SDK_HOME = ".naeural"
+
 LOCAL_PEM_PATH = "./_local_cache/_data/" + BCct.DEFAULT_PEM_FILE
 
 ENV_TEMPLATE = """
@@ -84,7 +86,7 @@ def get_user_folder():
   """
   Returns the user folder.
   """
-  return Path.home() / SDK_HOME
+  return BaseLogger.get_user_folder(as_str=False, include_sdk_home=True)
 
 def get_user_config_file():
   """

{naeural_client-2.7.23.dist-info → naeural_client-2.7.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: naeural_client
-Version: 2.7.23
+Version: 2.7.24
 Summary: `naeural_client` is the Python SDK required for client app development for the Naeural Edge Protocol Edge Protocol framework
 Project-URL: Homepage, https://github.com/NaeuralEdgeProtocol/naeural_client
 Project-URL: Bug Tracker, https://github.com/NaeuralEdgeProtocol/naeural_client/issues

{naeural_client-2.7.23.dist-info → naeural_client-2.7.24.dist-info}/RECORD

@@ -1,10 +1,10 @@
 naeural_client/__init__.py,sha256=YimqgDbjLuywsf8zCWE0EaUXH4MBUrqLxt0TDV558hQ,632
-naeural_client/_ver.py,sha256=wFg4OEsc5m3WFmz4POoTwLN28ajs-fbBTFB_q41F3xE,331
+naeural_client/_ver.py,sha256=F2nRwaEx_ZNxxCd3_1xrglV7G0W65jMaiZhBO7n--l8,331
 naeural_client/base_decentra_object.py,sha256=C4iwZTkhKNBS4VHlJs5DfElRYLo4Q9l1V1DNVSk1fyQ,4412
 naeural_client/plugins_manager_mixin.py,sha256=X1JdGLDz0gN1rPnTN_5mJXR8JmqoBFQISJXmPR9yvCo,11106
 naeural_client/base/__init__.py,sha256=hACh83_cIv7-PwYMM3bQm2IBmNqiHw-3PAfDfAEKz9A,259
 naeural_client/base/distributed_custom_code_presets.py,sha256=cvz5R88P6Z5V61Ce1vHVVh8bOkgXd6gve_vdESDNAsg,2544
-naeural_client/base/generic_session.py,sha256=7yHc3lEE8gZ3O2kGYMktg63fIOWKArgz1lqVeQf0L5w,114952
+naeural_client/base/generic_session.py,sha256=sD8vijOFS8C1RJOBwrlNOFp0S8kWLhtBuWPmWCSvKfU,115164
 naeural_client/base/instance.py,sha256=kcZJmjLBtx8Bjj_ysIOx1JmLA-qSpG7E28j5rq6IYus,20444
 naeural_client/base/pipeline.py,sha256=b4BJlqZ4vsGNqYPjJD9Uzrv5G8CVYG_jbND5rh_s8E0,59702
 naeural_client/base/plugin_template.py,sha256=7YAFaND2iXoZLgtunjYkFf_TBGieFr3VdNLO3vCqzmM,138795
@@ -37,7 +37,7 @@ naeural_client/const/apps.py,sha256=ePBiJXLuPfFOKuw-LJrT9OWbaodU7QApfDurIPNDoB4,
 naeural_client/const/base.py,sha256=uq1HrxBsrFFiMP0yL0TcDANuxiSPafSx1Yh5ZyxRubE,5633
 naeural_client/const/comms.py,sha256=La6JXWHexH8CfcBCKyT4fCIoeaoZlcm7KtZ57ab4ZgU,2201
 naeural_client/const/environment.py,sha256=RpdDhDgB8NgRoFTk28eODigf9y0WcT9lul6mBOD029w,879
-naeural_client/const/evm_net.py,sha256=M6ayYHim5i15XyssOXRtkaA6eWmukanxt0mYZzypl8c,2606
+naeural_client/const/evm_net.py,sha256=mOSvsJnir1v_BrmKS51xIy9ddlZnQwlXWenzGXmXMOE,2606
 naeural_client/const/formatter.py,sha256=AW3bWlqf39uaqV4BBUuW95qKYfF2OkkU4f9hy3kSVhM,200
 naeural_client/const/heartbeat.py,sha256=xHZBX_NzHTklwA2_AEKR0SGdlbavMT4nirqjQg8WlTU,2550
 naeural_client/const/misc.py,sha256=VDCwwpf5bl9ltx9rzT2WPVP8B3mZFRufU1tSS5MO240,413
@@ -60,7 +60,7 @@ naeural_client/io_formatter/default/a_dummy.py,sha256=qr9eUizQ-NN5jdXVzkaZKMaf9K
 naeural_client/io_formatter/default/aixp1.py,sha256=MX0TeUR4APA-qN3vUC6uzcz8Pssz5lgrQWo7td5Ri1A,3052
 naeural_client/io_formatter/default/default.py,sha256=gEy78cP2D5s0y8vQh4aHuxqz7D10gGfuiKF311QhrpE,494
 naeural_client/logging/__init__.py,sha256=b79X45VC6c37u32flKB2GAK9f-RR0ocwP0JDCy0t7QQ,33
-naeural_client/logging/base_logger.py,sha256=sTdY0IudHyJKluKkJexyR4ZCZvO1XVKwKMjc1LeOL5E,67694
+naeural_client/logging/base_logger.py,sha256=ScFhAaaj0ZIeB_izbZct21sYHnPWNvheQec3bGe5DTU,68946
 naeural_client/logging/small_logger.py,sha256=m12hCb_H4XifJYYfgCAOUDkcXm-h4pSODnFf277OFVI,2937
 naeural_client/logging/logger_mixins/__init__.py,sha256=yQO7umlRvz63FeWpi-F9GRmC_MOHcNW6R6pwvZZBy3A,600
 naeural_client/logging/logger_mixins/class_instance_mixin.py,sha256=xUXE2VZgmrlrSrvw0f6GF1jlTnVLeVkIiG0bhlBfq3o,2741
@@ -82,11 +82,11 @@ naeural_client/logging/tzlocal/win32.py,sha256=zBoj0vFVrGhnCm_f7xmYzGym4-fV-4Ij2
 naeural_client/logging/tzlocal/windows_tz.py,sha256=Sv9okktjZJfRGGUOOppsvQuX_eXyXUxkSKCAFmWT9Hw,34203
 naeural_client/utils/__init__.py,sha256=mAnke3-MeRzz3nhQvhuHqLnpaaCSmDxicd7Ck9uwpmI,77
 naeural_client/utils/comm_utils.py,sha256=4cS9llRr_pK_3rNgDcRMCQwYPO0kcNU7AdWy_LtMyCY,1072
-naeural_client/utils/config.py,sha256=Jn2q0YV3JbLEp1N_j6NzFpb3Btuq_HQiGrSL1GjW4a4,10098
+naeural_client/utils/config.py,sha256=wVY_IdLJ6D-eJYnfsOGUa4eJApxDX2oAqK0FhjPI1DE,10187
 naeural_client/utils/dotenv.py,sha256=_AgSo35n7EnQv5yDyu7C7i0kHragLJoCGydHjvOkrYY,2008
 naeural_client/utils/oracle_sync/oracle_tester.py,sha256=GmZwu2JM9_UB2K-4rKB3o0RgWLqM-7Im6HwBnQLXmHI,25312
-naeural_client-2.7.23.dist-info/METADATA,sha256=ycmXGJodGgoac60-Bmm0rH5PQMG4yuIg8pFZ_FYCP10,12354
-naeural_client-2.7.23.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-naeural_client-2.7.23.dist-info/entry_points.txt,sha256=CTua17GUrRa4aXeafezGC9TiWKGKQzwTjQmB2jyj22g,91
-naeural_client-2.7.23.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-naeural_client-2.7.23.dist-info/RECORD,,
+naeural_client-2.7.24.dist-info/METADATA,sha256=Y5plq2aSBT0Fu-yLxzVK9K_wCfZ_cCf-iJ1XA_Kh6Wg,12354
+naeural_client-2.7.24.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+naeural_client-2.7.24.dist-info/entry_points.txt,sha256=CTua17GUrRa4aXeafezGC9TiWKGKQzwTjQmB2jyj22g,91
+naeural_client-2.7.24.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+naeural_client-2.7.24.dist-info/RECORD,,