naeural-client 2.7.25__py3-none-any.whl → 2.7.27__py3-none-any.whl

naeural_client/_ver.py

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

naeural_client/logging/base_logger.py

@@ -1098,28 +1098,32 @@ 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):
-    user_folder = self.get_user_folder()
-    if user_folder.is_dir():
-      self.P(f"{str(user_folder)} already exists. Skipping migration.")
+
+  @staticmethod
+  def maybe_migrate_user_folder(verbose=False):
+    current_user_folder = BaseLogger.get_user_folder()
+    if current_user_folder.is_dir():
+      if verbose:
+        BaseLogger.print_color(f"{str(current_user_folder)} already exists. Skipping migration.")
       return
-    user_base_folder = self.get_user_folder(as_str=True, include_sdk_home=True)
-    self.P(f'{str(user_folder)} does not exist. Checking for previous app homes if necessary...')
-    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
-        self.P(f'Checking for previous app home: {old_path}')
-        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
+    if verbose:
+      BaseLogger.print_color(f'User folder {str(current_user_folder)} does not exist. Checking for previous versions...')
+    for old_sdk_home in SDK_HOME_PREV:
+      old_user_folder = current_user_folder.parent / old_sdk_home
+      if old_user_folder.is_dir():
+        if verbose:
+          BaseLogger.print_color(f"Found previous user folder '{old_user_folder}'. Renaming to '{current_user_folder}'...")
+        old_user_folder.rename(current_user_folder)
+        return
+    if verbose:
+      BaseLogger.print_color("No previous user folders found.")
     return
 
+  def _maybe_migrate_folder(self):
+    user_base_folder = BaseLogger.get_user_folder(as_str=True, include_sdk_home=True)
+    if user_base_folder in self._base_folder:
+      BaseLogger.maybe_migrate_user_folder(verbose=True)
+    return
 
   def _configure_data_and_dirs(self, config_file, config_file_encoding=None):
     self._maybe_migrate_folder()
@@ -1644,8 +1648,7 @@ class BaseLogger(object):
     return result
   
   
-  @staticmethod
-  def utc_to_local(remote_datetime, remote_utc, fmt='%Y-%m-%d %H:%M:%S', as_string=False):
+  def utc_to_local(self, remote_datetime, remote_utc, fmt='%Y-%m-%d %H:%M:%S', as_string=False):
     """
     Given a "remote" datetime (in datetime or str format) and a string or int denoting an offset 
     will return local datetime as a datetime object.
@@ -1664,13 +1667,21 @@ class BaseLogger(object):
     """
     if remote_utc is None:
       remote_utc = 'UTC+3'
-    if isinstance(remote_utc, str):
-      remote_utc = tz.gettz(remote_utc)
-    elif isinstance(remote_utc, int):
-      utc_offset = remote_utc
-      remote_utc = tz.tzoffset(None, timedelta(hours=utc_offset))
-    elif not isinstance(remote_utc, tzinfo):
-      raise ValueError("Unknown remote_utc type: {}".format(type(remote_utc)))
+    try:
+      if isinstance(remote_utc, str):
+        remote_utc = tz.gettz(remote_utc)
+      elif isinstance(remote_utc, int):
+        utc_offset = remote_utc
+        remote_utc = tz.tzoffset(None, timedelta(hours=utc_offset))
+      elif not isinstance(remote_utc, tzinfo):
+        raise ValueError("Unknown remote_utc type: {}".format(type(remote_utc)))
+    except Exception as exc:
+      # if it breaks use local time
+      remote_utc = tz.tzlocal()
+      self.P("Error in remote_datetime: {} requested remote_utc: {}, Error: {}. Using local timezone {} for given date.".format(
+        remote_datetime, remote_utc, exc, remote_utc), color='r'
+      )
+      
 
     if isinstance(remote_datetime, str):
       remote_datetime = dt.strptime(remote_datetime, fmt)

naeural_client/utils/config.py

@@ -327,7 +327,10 @@ def maybe_init_config():
   """
   config_file = get_user_config_file()
   if not config_file.exists():
-    log_with_color(f"No configuration file found at {config_file}. Initializing configuration...", color="y")     
-    reset_config(keep_existing=True)
-    return False
+    BaseLogger.maybe_migrate_user_folder(verbose=True)
+    if not config_file.exists():
+      log_with_color(f"No configuration file found at {config_file}. Initializing configuration...", color="y")
+      reset_config(keep_existing=True)
+      return False
+    # config_file still does not exist even after attempting the migration.
   return load_user_defined_config()

{naeural_client-2.7.25.dist-info → naeural_client-2.7.27.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: naeural_client
-Version: 2.7.25
+Version: 2.7.27
 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.25.dist-info → naeural_client-2.7.27.dist-info}/RECORD

@@ -1,5 +1,5 @@
 naeural_client/__init__.py,sha256=YimqgDbjLuywsf8zCWE0EaUXH4MBUrqLxt0TDV558hQ,632
-naeural_client/_ver.py,sha256=hFnAs1TM_Kwj7JxuCpMk1xnESln3MBoRLAaOeR42P3g,331
+naeural_client/_ver.py,sha256=xPABtqoee7FOJbdkfLEdq81iAPs9A1AH0mTWt03WkkA,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
@@ -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=cfSWHoZkDS0XSaNMF-ldNjAHZ0OkW8_B_oSwPQomoTM,69208
+naeural_client/logging/base_logger.py,sha256=c-ZSMHc_eO84MKrLOJcClxvhQydFD8W0LoWe5_hu2ag,69611
 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=wVY_IdLJ6D-eJYnfsOGUa4eJApxDX2oAqK0FhjPI1DE,10187
+naeural_client/utils/config.py,sha256=IG7-rRYBWCqCiI2kDesFmY8gld0Ku9xWgzNPE1rwVcA,10352
 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.25.dist-info/METADATA,sha256=Px5ucQyshk9HmWNfeIQDmNzH9-OeCPdDvjHsPO1R7X8,12354
-naeural_client-2.7.25.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-naeural_client-2.7.25.dist-info/entry_points.txt,sha256=CTua17GUrRa4aXeafezGC9TiWKGKQzwTjQmB2jyj22g,91
-naeural_client-2.7.25.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-naeural_client-2.7.25.dist-info/RECORD,,
+naeural_client-2.7.27.dist-info/METADATA,sha256=ljUYQkJp_UZZ1YFBTa40yuFvo-DgIAvTQUQJsVnmg50,12354
+naeural_client-2.7.27.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+naeural_client-2.7.27.dist-info/entry_points.txt,sha256=CTua17GUrRa4aXeafezGC9TiWKGKQzwTjQmB2jyj22g,91
+naeural_client-2.7.27.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+naeural_client-2.7.27.dist-info/RECORD,,