naeural-client 2.5.20__py3-none-any.whl → 2.5.22__py3-none-any.whl

naeural_client/_ver.py

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

naeural_client/base/generic_session.py

@@ -250,12 +250,18 @@ class GenericSession(BaseDecentrAIObject):
     # end bc_engine
     self.formatter_wrapper = IOFormatterWrapper(self.log, plugin_search_locations=self.__formatter_plugins_locations)
 
+    msg = f"Connection to {self._config[comm_ct.USER]}:*****@{self._config[comm_ct.HOST]}:{self._config[comm_ct.PORT]} {'<secured>' if self._config[comm_ct.SECURED] else '<UNSECURED>'}"
+    self.P(msg, color='y')
     self._connect()
 
-    self.P("Created {} comms session '{}' from <{}> SDKv{}.".format(
-      "decrypted" if not self.encrypt_comms else "encrypted", 
-      self.name, self.bc_engine.address, self.log.version
-    ))
+    msg = f"Created comms session '{self.name}'"
+    msg += f"\n - SDK:     {self.log.version}"
+    msg += f"\n - Address: {self.bc_engine.address}"
+    msg += f"\n - Server:  {self._config[comm_ct.HOST]}:{self._config[comm_ct.PORT]}"
+    msg += f"\n - Secured: {self._config[comm_ct.SECURED]}"
+    msg += f"\n - User:    {self._config[comm_ct.USER]}"
+    msg += f"\n - Encrypt: {'YES' if self.encrypt_comms else 'NO'}"
+    self.P(msg, color='g')
     
     if not self.encrypt_comms:
       self.P(
@@ -657,8 +663,7 @@ class GenericSession(BaseDecentrAIObject):
   if True:
     def __start_blockchain(self, bc_engine, blockchain_config, user_config=False):
       if bc_engine is not None:
-        self.bc_engine = bc_engine
-        self.bc_engine.set_eth_flat(self.__eth_enabled)
+        self.bc_engine = bc_engine        
         return
 
       try:
@@ -668,10 +673,13 @@ class GenericSession(BaseDecentrAIObject):
           config=blockchain_config,
           verbosity=self._verbosity,
           user_config=user_config,
-          eth_enabled=self.__eth_enabled,
+          eth_enabled=self.__eth_enabled, 
         )
       except:
         raise ValueError("Failure in private blockchain setup:\n{}".format(traceback.format_exc()))
+      
+      # extra setup flag for re-connections with same multiton instance
+      self.bc_engine.set_eth_flag(self.__eth_enabled)
       return
 
     def __start_main_loop_thread(self):
@@ -1023,6 +1031,7 @@ class GenericSession(BaseDecentrAIObject):
       if secured is not None and self._config.get(comm_ct.SECURED, None) is None:
         secured = str(secured).strip().upper() in ['TRUE', '1']
         self._config[comm_ct.SECURED] = secured
+        
       return
 
     def __get_node_address(self, node):

naeural_client/bc/base.py

@@ -359,7 +359,7 @@ class BaseBlockEngine:
       s = "<BC:{}> ".format(self.__name) + s
     return self.log.P(
       s, 
-      color='g' if (color is None or color.lower() not in ['r', 'red', 'error']) else color, 
+      color=color or 'd', 
       boxed=boxed, 
       **kwargs
     )
@@ -375,8 +375,7 @@ class BaseBlockEngine:
 
   def _init(self):
     self.P(
-      f"Initializing BC-engine (ETH_ENABLED={self.__eth_enabled})...", 
-      boxed=True, box_char='*', verbosity=1
+      f"Initializing BC-engine (ETH_ENABLED={self.__eth_enabled})...", verbosity=1
     )
 
     if True:
@@ -414,9 +413,12 @@ class BaseBlockEngine:
     self.__eth_account = self._get_eth_account()
     ### end Ethereum
     if self.__eth_enabled:
-      self.P("Address: {} / ETH: {}".format(self.address, self.eth_address), boxed=True, verbosity=1)
+      self.P(
+        "Address: {} / ETH: {}".format(self.address, self.eth_address), boxed=True, verbosity=1,
+        color='g'
+      )
     else:
-      self.P("Address: {}".format(self.address), boxed=True, verbosity=1)
+      self.P("Address: {}".format(self.address), boxed=True, color='g', verbosity=1)
     self.P("Allowed list of senders: {}".format(self.allowed_list), verbosity=1)
     return
   
@@ -702,7 +704,7 @@ class BaseBlockEngine:
 
     """
     if from_file and os.path.isfile(source):
-      self.P("Reading SK from '{}'".format(source), color='g', verbosity=1)
+      self.P("Reading SK from '{}'".format(source), verbosity=1)
       with open(source, 'rt') as fh:
         data = fh.read()
     else:
@@ -1230,8 +1232,11 @@ class BaseBlockEngine:
   
   ### Ethereum
   
-  def set_eth_flag(self, value):
-    self.__eth_enabled = value
+  def set_eth_flag(self, value):    
+    if value != self.__eth_enabled:
+      self.__eth_enabled = value
+      self.log.P("Changed eth_enabled to {}".format(value), color='d')
+    return
   
   @property
   def eth_address(self):

naeural_client/utils/config.py

@@ -83,11 +83,12 @@ def get_user_config_file():
   """
   return get_user_folder() / "config"
 
-def reset_config(args, *larg, **kwargs):
+def reset_config(*larg, **kwargs):
   """
   Resets the configuration by creating a ~/.naeural folder and populating
   ~/.naeural/config with values from a local .env file, if it exists.
   """
+  log_with_color("Resetting the configuration...", color='y')
   # Define the target config folder and file
   config_dir = get_user_folder()
   config_file = get_user_config_file()

{naeural_client-2.5.20.dist-info → naeural_client-2.5.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: naeural_client
-Version: 2.5.20
+Version: 2.5.22
 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
@@ -35,6 +35,13 @@ This packet depends on the following packets: `pika`, `paho-mqtt`, `numpy`, `pyo
 python -m pip install naeural_client
 ```
 
+### Development installation
+
+```shell
+git clone https://github.com/NaeuralEdgeProtocol/naeural_client
+pip install -e .
+```
+
 ## Documentation
 
 Minimal documentation will be presented here. The complete documentation is

{naeural_client-2.5.20.dist-info → naeural_client-2.5.22.dist-info}/RECORD

@@ -1,10 +1,10 @@
 naeural_client/__init__.py,sha256=GP8WSrn87sjTPO-QRNL2PG8JK5Mixbiea_HrtbG8RAQ,592
-naeural_client/_ver.py,sha256=uTqaN7xpck9Wbtyp-J-7kahzd8SaJ5FHu8BtiFHFhOo,331
+naeural_client/_ver.py,sha256=hAQqRW-VZgezlnLQtLAB_kXl-vLNgz3ubPhqfDOIrVg,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=Jymz_4ML2pkvKDWSRoalZuXB95NCyBYmhnJSc7tUpNU,88612
+naeural_client/base/generic_session.py,sha256=rKOTBmreGwjoEG7CRAAKePNOdl0masfF66ORC-a0vjY,89170
 naeural_client/base/instance.py,sha256=kcZJmjLBtx8Bjj_ysIOx1JmLA-qSpG7E28j5rq6IYus,20444
 naeural_client/base/pipeline.py,sha256=b4uNHrEIOlAtw4PGUx20dxwBhDck5__SrVXaHcSi8ZA,58251
 naeural_client/base/plugin_template.py,sha256=qGaXByd_JZFpjvH9GXNbT7KaitRxIJB6-1IhbKrZjq4,138123
@@ -14,7 +14,7 @@ naeural_client/base/webapp_pipeline.py,sha256=QmPLVmhP0CPdi0YuvbZEH4APYz2Amtw3gy
 naeural_client/base/payload/__init__.py,sha256=y8fBI8tG2ObNfaXFWjyWZXwu878FRYj_I8GIbHT4GKE,29
 naeural_client/base/payload/payload.py,sha256=x-au7l67Z_vfn_4R2C_pjZCaFuUVXHngJiGOfIAYVdE,2690
 naeural_client/bc/__init__.py,sha256=FQj23D1PrY06NUOARiKQi4cdj0-VxnoYgYDEht8lpr8,158
-naeural_client/bc/base.py,sha256=uky74Z4vLurZXK4vqoxDAA6P5Xs0EqVY-9eWX7BEWxM,32931
+naeural_client/bc/base.py,sha256=G-NYWhQaFHlHrKF01M7hOgXOKRsOtjcjJYjoxamYLbQ,32990
 naeural_client/bc/chain.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 naeural_client/bc/ec.py,sha256=mWjodWCRgC3omVXOA9jtNdtPVNn2kMKV3Dcjt9oFUCQ,22974
 naeural_client/certs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -79,10 +79,10 @@ 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=aUVyi5rZjvnbUwM5mmj0E2IHvURdrlHSgleqZvJBNuU,5202
+naeural_client/utils/config.py,sha256=mFqzz69UQAZN9oblxoTqWS52F2p8AnXmzDtdf2SoDz4,5258
 naeural_client/utils/dotenv.py,sha256=_AgSo35n7EnQv5yDyu7C7i0kHragLJoCGydHjvOkrYY,2008
-naeural_client-2.5.20.dist-info/METADATA,sha256=XbXnIq0bEvjD4GP2XALZLzMxib6tk2VOFLI_Zgboy8o,14494
-naeural_client-2.5.20.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-naeural_client-2.5.20.dist-info/entry_points.txt,sha256=PNdyotDaQBAslZREx5luVyj0kqpQnwNACwkFNTPIHU4,55
-naeural_client-2.5.20.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
-naeural_client-2.5.20.dist-info/RECORD,,
+naeural_client-2.5.22.dist-info/METADATA,sha256=PGQE3We4_RODRS6YsHEyMspcTRDBZZGLuJUsegEB8Ds,14619
+naeural_client-2.5.22.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+naeural_client-2.5.22.dist-info/entry_points.txt,sha256=PNdyotDaQBAslZREx5luVyj0kqpQnwNACwkFNTPIHU4,55
+naeural_client-2.5.22.dist-info/licenses/LICENSE,sha256=cvOsJVslde4oIaTCadabXnPqZmzcBO2f2zwXZRmJEbE,11311
+naeural_client-2.5.22.dist-info/RECORD,,