dimp 2.3.0__tar.gz → 2.3.1__tar.gz

{dimp-2.3.0 → dimp-2.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dimp
-Version: 2.3.0
+Version: 2.3.1
 Summary: Decentralized Instant Messaging Protocol
 Home-page: https://github.com/dimchat/core-py
 Author: Albert Moky

{dimp-2.3.0 → dimp-2.3.1}/dimp/__init__.py

@@ -52,7 +52,8 @@ __all__ = [
 
     'URI', 'DateTime',
 
-    'Converter', 'Copier',
+    'Converter', 'DataConverter', 'BaseConverter',
+    'Copier',
     'Wrapper', 'Stringer', 'Mapper',
     'ConstantString',  # 'String',
     'Dictionary',

{dimp-2.3.0 → dimp-2.3.1}/dimp/crypto/keys.py

@@ -29,7 +29,7 @@
 # ==============================================================================
 
 from abc import ABC
-from typing import Optional, Any, Dict
+from typing import Any, Dict
 
 from mkm.types import Dictionary
 from mkm.crypto import CryptographyKey, EncryptKey, DecryptKey, SignKey, VerifyKey
@@ -58,9 +58,10 @@ class BaseKey(Dictionary, CryptographyKey, ABC):
     #
 
     @classmethod
-    def get_key_algorithm(cls, key: Dict[str, Any]) -> Optional[str]:
+    def get_key_algorithm(cls, key: Dict[str, Any]) -> str:
         ext = SharedCryptoExtensions()
-        return ext.helper.get_key_algorithm(key=key, default='')
+        algorithm = ext.helper.get_key_algorithm(key=key, default=None)
+        return '' if algorithm is None else algorithm
 
     @classmethod
     def match_encrypt_key(cls, encrypt_key: EncryptKey, decrypt_key: DecryptKey) -> bool:

{dimp-2.3.0 → dimp-2.3.1}/dimp/crypto/pnf.py

@@ -35,8 +35,6 @@ from mkm.types import URI
 from mkm.types import Dictionary
 from mkm.crypto import DecryptKey, SymmetricKey
 
-from .algorithms import EncodeAlgorithms
-
 
 class BaseFileWrapper(Dictionary):
     """
@@ -92,7 +90,7 @@ class BaseFileWrapper(Dictionary):
             ted = None
             self.pop('data', None)
         else:
-            ted = TransportableData.create(data=binary, algorithm=EncodeAlgorithms.DEFAULT)
+            ted = TransportableData.create(data=binary)
             self['data'] = ted.object
         self.__attachment = ted
 

{dimp-2.3.0 → dimp-2.3.1}/dimp/crypto/ted.py

@@ -69,11 +69,11 @@ class BaseDataWrapper(Dictionary):
 
     # Override
     def __str__(self) -> str:
-        text = self.get_str(key='data', default='')
-        if len(text) == 0:
-            return text
-        alg = self.get_str(key='algorithm', default='')
-        if alg == EncodeAlgorithms.DEFAULT:
+        text = self.get_str(key='data', default=None)
+        if text is None:  # or len(text) == 0:
+            return ''
+        alg = self.get_str(key='algorithm', default=None)
+        if alg is None or alg == EncodeAlgorithms.DEFAULT:
             alg = ''
         if len(alg) == 0:
             # 0. "{BASE64_ENCODE}"
@@ -85,9 +85,9 @@ class BaseDataWrapper(Dictionary):
     def encode(self, mime_type: str) -> str:
         """ toString(mimeType) """
         # get encoded data
-        text = self.get_str(key='data', default='')
-        if len(text) == 0:
-            return text
+        text = self.get_str(key='data', default=None)
+        if text is None:  # or len(text) == 0:
+            return ''
         alg = self.algorithm
         # 2. "data:image/png;base64,{BASE64_ENCODE}"
         return 'data:%s;%s,%s' % (mime_type, alg, text)
@@ -98,8 +98,8 @@ class BaseDataWrapper(Dictionary):
 
     @property
     def algorithm(self) -> str:
-        alg = self.get_str(key='algorithm', default='')
-        if len(alg) == 0:
+        alg = self.get_str(key='algorithm', default=None)
+        if alg is None or len(alg) == 0:
             alg = EncodeAlgorithms.DEFAULT
         return alg
 
@@ -118,8 +118,11 @@ class BaseDataWrapper(Dictionary):
     def data(self) -> Optional[bytes]:
         binary = self.__data
         if binary is None:
-            text = self.get_str(key='data', default='')
-            if len(text) > 0:
+            text = self.get_str(key='data', default=None)
+            if text is None or len(text) == 0:
+                assert False, 'TED data empty: %s' % self.dictionary
+                # return None
+            else:
                 alg = self.algorithm
                 if alg == EncodeAlgorithms.BASE_64:
                     binary = base64_decode(string=text)
@@ -145,6 +148,7 @@ class BaseDataWrapper(Dictionary):
             elif alg == EncodeAlgorithms.HEX:
                 text = hex_encode(data=binary)
             else:
-                assert False, 'data algorithm not support: %s' % alg
+                raise ArithmeticError('data algorithm not support: %s' % alg)
+                # assert False, 'data algorithm not support: %s' % alg
             self['data'] = text
         self.__data = binary

{dimp-2.3.0 → dimp-2.3.1}/dimp/dkd/contents.py

@@ -106,13 +106,15 @@ class ListContent(BaseContent, ArrayContent):
 
     @property  # Override
     def contents(self) -> List[Content]:
-        if self.__list is None:
+        array = self.__list
+        if array is None:
             array = self.get('contents')
             if array is None:
-                self.__list = []
+                array = []
             else:
-                self.__list = Content.convert(array=array)
-        return self.__list
+                array = Content.convert(array=array)
+            self.__list = array
+        return array
 
 
 class SecretContent(BaseContent, ForwardContent):
@@ -161,19 +163,19 @@ class SecretContent(BaseContent, ForwardContent):
 
     @property  # Override
     def secrets(self) -> List[ReliableMessage]:
-        if self.__secrets is None:
-            messages = self.get('secrets')
-            if messages is None:
+        messages = self.__secrets
+        if messages is None:
+            info = self.get('secrets')
+            if isinstance(info, List):
+                # get from 'secrets'
+                messages = ReliableMessage.convert(array=info)
+            else:
+                assert info is None, 'secret messages error: %s' % info
                 # get from 'forward'
                 msg = self.forward
-                if msg is None:
-                    self.__secrets = []
-                else:
-                    self.__secrets = [msg]
-            else:
-                # get from 'secrets'
-                self.__secrets = ReliableMessage.convert(array=messages)
-        return self.__secrets
+                messages = [] if msg is None else [msg]
+            self.__secrets = messages
+        return messages
 
 
 class WebPageContent(BaseContent, PageContent):

{dimp-2.3.0 → dimp-2.3.1}/dimp/dkd/group_admins.py

@@ -62,14 +62,32 @@ class HireGroupCommand(BaseGroupCommand, HireCommand):
     @property  # Override
     def administrators(self) -> Optional[List[ID]]:
         users = self.get('administrators')
-        if users is not None:
+        if isinstance(users, List):
+            # convert all items to ID objects
             return ID.convert(array=users)
+        assert users is None, 'ID list error: %s' % users
+
+    @administrators.setter  # Override
+    def administrators(self, users: List[ID]):
+        if users is None:
+            self.pop('administrators', None)
+        else:
+            self['administrators'] = ID.revert(identifiers=users)
 
     @property  # Override
     def assistants(self) -> Optional[List[ID]]:
         bots = self.get('assistants')
-        if bots is not None:
+        if isinstance(bots, List):
+            # convert all items to ID objects
             return ID.convert(array=bots)
+        assert bots is None, 'ID list error: %s' % bots
+
+    @assistants.setter  # Override
+    def assistants(self, bots: List[ID]):
+        if bots is None:
+            self.pop('assistants', None)
+        else:
+            self['assistants'] = ID.revert(identifiers=bots)
 
 
 class FireGroupCommand(BaseGroupCommand, FireCommand):
@@ -89,14 +107,32 @@ class FireGroupCommand(BaseGroupCommand, FireCommand):
     @property  # Override
     def administrators(self) -> Optional[List[ID]]:
         users = self.get('administrators')
-        if users is not None:
+        if isinstance(users, List):
+            # convert all items to ID objects
             return ID.convert(array=users)
+        assert users is None, 'ID list error: %s' % users
+
+    @administrators.setter  # Override
+    def administrators(self, users: List[ID]):
+        if users is None:
+            self.pop('administrators', None)
+        else:
+            self['administrators'] = ID.revert(identifiers=users)
 
     @property  # Override
     def assistants(self) -> Optional[List[ID]]:
         bots = self.get('assistants')
-        if bots is not None:
+        if isinstance(bots, List):
+            # convert all items to ID objects
             return ID.convert(array=bots)
+        assert bots is None, 'ID list error: %s' % bots
+
+    @assistants.setter  # Override
+    def assistants(self, bots: List[ID]):
+        if bots is None:
+            self.pop('assistants', None)
+        else:
+            self['assistants'] = ID.revert(identifiers=bots)
 
 
 class ResignGroupCommand(BaseGroupCommand, ResignCommand):

{dimp-2.3.0 → dimp-2.3.1}/dimp/dkd/money.py

@@ -30,6 +30,7 @@
 
 from typing import Optional, Any, Dict
 
+from mkm.types import Converter
 from mkm import ID
 
 from ..protocol import ContentType
@@ -77,7 +78,14 @@ class BaseMoneyContent(BaseContent, MoneyContent):
 
     @property  # Override
     def amount(self) -> float:
-        return self.get_float(key='amount', default=0.0)
+        # return self.get_float(key='amount', default=0.0)
+        value = self.get('amount')
+        if value is None:
+            return 0.0
+        elif isinstance(value, int) or isinstance(value, float):
+            return value
+        else:
+            return Converter.get_float(value=value, default=0.0)
 
     @amount.setter  # Override
     def amount(self, value: float):

{dimp-2.3.0 → dimp-2.3.1}/dimp/dkd/quote.py

@@ -120,6 +120,7 @@ class CombineForwardContent(BaseContent, CombineContent):
             assert not (title is None or messages is None), 'params error: %s, %s' % (title, messages)
             msg_type = ContentType.COMBINE_FORWARD
             super().__init__(None, msg_type)
+            self['title'] = title
             self['messages'] = InstantMessage.revert(messages=messages)
         else:
             # 2. content info from network
@@ -136,6 +137,9 @@ class CombineForwardContent(BaseContent, CombineContent):
     def messages(self) -> List[InstantMessage]:
         if self.__messages is None:
             array = self.get('messages')
-            if array is not None:
+            if array is None:
+                self.__messages = []
+            else:
+                assert isinstance(array, List), 'combined messages error: %s' % array
                 self.__messages = InstantMessage.convert(array=array)
         return self.__messages

{dimp-2.3.0 → dimp-2.3.1}/dimp/mkm/document.py

@@ -37,8 +37,6 @@ from mkm.format import TransportableData
 from mkm.format import json_encode, json_decode, utf8_encode
 from mkm import ID, Document
 
-from ..crypto import EncodeAlgorithms
-
 
 """
     Base Documents
@@ -102,15 +100,6 @@ class BaseDocument(Dictionary, Document):
         self.__properties = properties
         self.__status = status  # 1 for valid, -1 for invalid
 
-    # @property  # Override
-    # def type(self) -> Optional[str]:
-    #     doc_type = self.get_property(name='type')  # deprecated
-    #     if doc_type is None:
-    #         ext = SharedAccountExtensions()
-    #         doc_type = ext.helper.get_document_type(document=self.dictionary, default=None)
-    #         # doc_type = self.get_str(key='type', default=None)
-    #     return doc_type
-
     @property  # Override
     def identifier(self) -> ID:
         if self.__identifier is None:
@@ -210,7 +199,7 @@ class BaseDocument(Dictionary, Document):
         if len(signature) == 0:
             # assert False, 'should not happen'
             return None
-        ted = TransportableData.create(data=signature, algorithm=EncodeAlgorithms.DEFAULT)
+        ted = TransportableData.create(data=signature)
         # 3. update 'data' & 'signature' fields
         self['data'] = data             # JsON string
         self['signature'] = ted.object  # BASE-64

{dimp-2.3.0 → dimp-2.3.1}/dimp/mkm/meta.py

@@ -59,7 +59,6 @@ from mkm import Meta
 """
 
 
-# noinspection PyAbstractClass
 class BaseMeta(Dictionary, Meta, ABC):
 
     def __init__(self, meta: Dict[str, Any] = None,

{dimp-2.3.0 → dimp-2.3.1}/dimp/msg/instant.py

@@ -86,11 +86,11 @@ class PlainMessage(BaseMessage, InstantMessage):
 
     @property  # Override
     def time(self) -> Optional[DateTime]:
-        value = self.content.time
-        if value is not None:
-            return value
-        # return super().time
-        return self.envelope.time
+        when = self.content.time
+        if when is None:
+            # when = super().time
+            when = self.envelope.time
+        return when
 
     @property  # Override
     def group(self) -> Optional[ID]:

{dimp-2.3.0 → dimp-2.3.1}/dimp/protocol/commands.py

@@ -220,7 +220,7 @@ class DocumentCommand(MetaCommand, ABC):
     #
 
     @classmethod
-    def query(cls, identifier: ID, last_time: str = None):  # -> DocumentCommand:
+    def query(cls, identifier: ID, last_time: DateTime = None):  # -> DocumentCommand:
         """
         1. Query Entity Document
         2. Query Entity Document for updating with last time

{dimp-2.3.0 → dimp-2.3.1}/dimp/protocol/groups.py

@@ -210,7 +210,6 @@ class QuitCommand(GroupCommand, ABC):
     pass
 
 
-# noinspection PyAbstractClass
 class QueryCommand(GroupCommand, ABC):
     """
     NOTICE:
@@ -236,7 +235,6 @@ class ResetCommand(GroupCommand, ABC):
 """
 
 
-# noinspection PyAbstractClass
 class HireCommand(GroupCommand, ABC):
 
     @property
@@ -244,13 +242,22 @@ class HireCommand(GroupCommand, ABC):
     def administrators(self) -> Optional[List[ID]]:
         raise NotImplemented
 
+    @administrators.setter
+    @abstractmethod
+    def administrators(self, users: List[ID]):
+        raise NotImplemented
+
     @property
     @abstractmethod
     def assistants(self) -> Optional[List[ID]]:
         raise NotImplemented
 
+    @assistants.setter
+    @abstractmethod
+    def assistants(self, bots: List[ID]):
+        raise NotImplemented
+
 
-# noinspection PyAbstractClass
 class FireCommand(GroupCommand, ABC):
 
     @property
@@ -258,11 +265,21 @@ class FireCommand(GroupCommand, ABC):
     def administrators(self) -> Optional[List[ID]]:
         raise NotImplemented
 
+    @administrators.setter
+    @abstractmethod
+    def administrators(self, users: List[ID]):
+        raise NotImplemented
+
     @property
     @abstractmethod
     def assistants(self) -> Optional[List[ID]]:
         raise NotImplemented
 
+    @assistants.setter
+    @abstractmethod
+    def assistants(self, bots: List[ID]):
+        raise NotImplemented
+
 
 # noinspection PyAbstractClass
 class ResignCommand(GroupCommand, ABC):

{dimp-2.3.0 → dimp-2.3.1}/dimp/protocol/quote.py

@@ -114,7 +114,7 @@ class CombineContent(Content, ABC):
         ~~~~~~~~~~~~~~~~~~~~~~~
 
         data format: {
-            type : i2s(0xFF),
+            type : i2s(0xCF),
             sn   : 456,
 
             title    : "...",  // chat title

{dimp-2.3.0 → dimp-2.3.1}/dimp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dimp
-Version: 2.3.0
+Version: 2.3.1
 Summary: Decentralized Instant Messaging Protocol
 Home-page: https://github.com/dimchat/core-py
 Author: Albert Moky

dimp-2.3.1/dimp.egg-info/requires.txt

@@ -0,0 +1,2 @@
+dkd>=2.3.1
+mkm>=2.3.1

{dimp-2.3.0 → dimp-2.3.1}/setup.py

@@ -14,7 +14,7 @@ import io
 
 from setuptools import setup, find_packages
 
-__version__ = '2.3.0'
+__version__ = '2.3.1'
 __author__ = 'Albert Moky'
 __contact__ = 'albert.moky@gmail.com'
 
@@ -38,7 +38,7 @@ setup(
         'Operating System :: OS Independent',
     ],
     install_requires=[
-        'dkd>=2.3.0',
-        'mkm>=2.3.0',
+        'dkd>=2.3.1',
+        'mkm>=2.3.1',
     ]
 )

dimp-2.3.0/dimp.egg-info/requires.txt

@@ -1,2 +0,0 @@
-dkd>=2.3.0
-mkm>=2.3.0