remove storage logic (like JSON and database) to own folder - tests not yet integrated

Author: VigneshVSV

hololinked/core/__init__.py

@@ -2,6 +2,5 @@
 from .events import *
 from .actions import *
 from .property import *
-from .database import *
 from .thing import *
 from .meta import ThingMeta

hololinked/core/dataklasses.py

@@ -3,9 +3,7 @@
 resources on the network. These classese are generally not for consumption by the package-end-user. 
 """
 import typing
-import platform
 import warnings
-import inspect
 from enum import Enum
 from dataclasses import dataclass, fields
 from types import FunctionType, MethodType

hololinked/core/meta.py

@@ -547,8 +547,10 @@ def get_from_DB(self) -> typing.Dict[str, typing.Any]:
         final_list = {}
         for name, prop in props.items():
             try:
-                serializer = Serializers.for_object(self.owner_inst.id, self.owner_cls.__name__, name)
-                final_list[name] = serializer.loads(prop)
+                # serializer = Serializers.for_object(self.owner_inst.id, self.owner_cls.__name__, name)
+                # if name in self.db_commit_objects:
+                #     continue
+                final_list[name] = prop
             except Exception as ex:
                 self.owner_inst.logger.error(
                     f"could not deserialize property {name} due to error - {str(ex)}, skipping this property"
@@ -568,8 +570,8 @@ def load_from_DB(self):
                                                                     get_missing_property_names=True
                                                                 )
         # 4. read db_init and db_persist objects
-        with edit_constant_parameters(self):
-            for db_prop, value in self.get_from_DB():
+        with edit_constant_parameters(self.owner_inst):
+            for db_prop, value in self.get_from_DB().items():
                 try:
                     if db_prop not in missing_properties:
                         setattr(self.owner_inst, db_prop, value) # type: ignore

hololinked/core/thing.py

@@ -87,7 +87,13 @@ class attribute.
                 any database credentials. `use_default_db` value can also be set as a class attribute.
             - db_config_file: `str`, optional.
                 if not using a default database, supply a JSON configuration file to create a database connection. Check documentaion
-                of `hololinked.core.database`.  
+                of `hololinked.core.database`.
+            - use_json_file: bool, Default False
+                if True, a JSON file will be used as the property storage instead of a database. This value can also be
+                set as a class attribute.
+            - json_filename: str, optional
+                If using JSON storage, this filename is used to persist property values. If not provided, a default filename
+                is generated based on the instance name.
         """          
         Propertized.__init__(self, id=id, logger=logger, **kwargs)
         RemoteInvokable.__init__(self)
@@ -100,7 +106,8 @@ class attribute.
 
         from .logger import prepare_object_logger
         from .state_machine import prepare_object_FSM
-        from .database import prepare_object_database
+        from ..storage import prepare_object_storage
+
         prepare_object_logger(
             instance=self,
             log_level=kwargs.get('log_level', None), 
@@ -112,7 +119,9 @@ class attribute.
                                 )
         )   
         prepare_object_FSM(self)
-        prepare_object_database(self, kwargs.get('use_default_db', False), kwargs.get('db_config_file', None))   
+        prepare_object_storage(self, **kwargs) # use_default_db, db_config_file, use_json_file, json_filename
+         # choose storage type, if use_json_file is True - use JSON storage, else - use database
+       
 
         # thing._qualified_id = f'{self._qualified_id}/{thing.id}'
 
@@ -121,9 +130,11 @@ def __post_init__(self):
         from .zmq.rpc_server import RPCServer
         from .events import EventPublisher
         from .logger import RemoteAccessHandler
+        from ..storage.database import prepare_object_database, ThingDB
         # Type definitions
         self.rpc_server = None # type: typing.Optional[RPCServer]
         self.event_publisher = None # type: typing.Optional[EventPublisher] 
+        self.db_engine: typing.Optional[ThingDB]
         self._owners = None if not hasattr(self, '_owners') else self._owners # type: typing.Optional[typing.List[Thing]]
         self._remote_access_loghandler: typing.Optional[RemoteAccessHandler] 
         self._internal_fixed_attributes: typing.List[str]

hololinked/serializers/serializers.py

@@ -532,10 +532,11 @@ def register_for_thing_instance(cls, thing_id: str, serializer: BaseSerializer)
         """
         cls.object_serializer_map[thing_id] = serializer
 
+
     @classmethod
     def reset(cls) -> None:
         """
-        Reset the serializer registry. This is useful for testing purposes to clear the registry and start fresh.
+        Reset the serializer registry.
         """
         cls.object_content_type_map.clear()
         cls.object_serializer_map.clear()