dimp 2.4.0__tar.gz → 2.4.2__tar.gz

{dimp-2.4.0 → dimp-2.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dimp
-Version: 2.4.0
+Version: 2.4.2
 Summary: Decentralized Instant Messaging Protocol
 Home-page: https://github.com/dimchat/core-py
 Author: Albert Moky
@@ -91,17 +91,23 @@ class HandshakeCommand(Command, ABC):
     @property
     @abstractmethod
     def title(self) -> str:
-        raise NotImplemented
+        raise NotImplementedError(
+            f'Not implemented: {type(self).__module__}.{type(self).__name__}.title getter'
+        )
 
     @property
     @abstractmethod
     def session(self) -> Optional[str]:
-        raise NotImplemented
+        raise NotImplementedError(
+            f'Not implemented: {type(self).__module__}.{type(self).__name__}.session getter'
+        )
 
     @property
     @abstractmethod
     def state(self) -> HandshakeState:
-        raise NotImplemented
+        raise NotImplementedError(
+            f'Not implemented: {type(self).__module__}.{type(self).__name__}.state getter'
+        )
 
     #
     #   Factories
@@ -198,7 +204,9 @@ class AppContent(Content, ABC):
     @abstractmethod
     def application(self) -> str:
         """ App ID """
-        raise NotImplemented
+        raise NotImplementedError(
+            f'Not implemented: {type(self).__module__}.{type(self).__name__}.application getter'
+        )
 
 
 class CustomizedContent(Content, ABC):
@@ -221,13 +229,17 @@ class CustomizedContent(Content, ABC):
     @abstractmethod
     def module(self) -> str:
         """ Module Name """
-        raise NotImplemented
+        raise NotImplementedError(
+            f'Not implemented: {type(self).__module__}.{type(self).__name__}.module getter'
+        )
 
     @property
     @abstractmethod
     def action(self) -> str:
         """ Action Name """
-        raise NotImplemented
+        raise NotImplementedError(
+            f'Not implemented: {type(self).__module__}.{type(self).__name__}.action getter'
+        )
 
     #
     #   Factory method

{dimp-2.4.0 → dimp-2.4.2}/README.md

@@ -77,17 +77,23 @@ class HandshakeCommand(Command, ABC):
     @property
     @abstractmethod
     def title(self) -> str:
-        raise NotImplemented
+        raise NotImplementedError(
+            f'Not implemented: {type(self).__module__}.{type(self).__name__}.title getter'
+        )
 
     @property
     @abstractmethod
     def session(self) -> Optional[str]:
-        raise NotImplemented
+        raise NotImplementedError(
+            f'Not implemented: {type(self).__module__}.{type(self).__name__}.session getter'
+        )
 
     @property
     @abstractmethod
     def state(self) -> HandshakeState:
-        raise NotImplemented
+        raise NotImplementedError(
+            f'Not implemented: {type(self).__module__}.{type(self).__name__}.state getter'
+        )
 
     #
     #   Factories
@@ -184,7 +190,9 @@ class AppContent(Content, ABC):
     @abstractmethod
     def application(self) -> str:
         """ App ID """
-        raise NotImplemented
+        raise NotImplementedError(
+            f'Not implemented: {type(self).__module__}.{type(self).__name__}.application getter'
+        )
 
 
 class CustomizedContent(Content, ABC):
@@ -207,13 +215,17 @@ class CustomizedContent(Content, ABC):
     @abstractmethod
     def module(self) -> str:
         """ Module Name """
-        raise NotImplemented
+        raise NotImplementedError(
+            f'Not implemented: {type(self).__module__}.{type(self).__name__}.module getter'
+        )
 
     @property
     @abstractmethod
     def action(self) -> str:
         """ Action Name """
-        raise NotImplemented
+        raise NotImplementedError(
+            f'Not implemented: {type(self).__module__}.{type(self).__name__}.action getter'
+        )
 
     #
     #   Factory method

{dimp-2.4.0 → dimp-2.4.2}/dimp/dkd/base.py

@@ -67,7 +67,7 @@ class BaseMessage(Dictionary, Message):
             msg = head.to_dict()
         else:
             # 2. message info from network
-            assert head is None, 'params error: %s, %s' % (msg, head)
+            assert head is None, f'params error: {msg}, {head}'
         super().__init__(dictionary=msg)
         # lazy
         self.__envelope = head

{dimp-2.4.0 → dimp-2.4.2}/dimp/dkd/envelope.py

@@ -56,7 +56,7 @@ class MessageEnvelope(Dictionary, Envelope):
                  sender: ID = None, receiver: Optional[ID] = None, time: Optional[DateTime] = None):
         if envelope is None:
             # 1. new envelope with sender, receiver & time
-            assert sender is not None, 'envelope error: %s, %s' % (receiver, time)
+            assert sender is not None, f'envelope error: {receiver}, {time}'
             if receiver is None:
                 receiver = ANYONE
             if time is None:
@@ -69,7 +69,7 @@ class MessageEnvelope(Dictionary, Envelope):
         else:
             # 2. envelope info from network
             assert sender is None and receiver is None and time is None, \
-                'params error: %s, %s, %s, %s' % (envelope, sender, receiver, time)
+                f'params error: {envelope}, {sender}, {receiver}, {time}'
         # initialize with envelope info
         super().__init__(dictionary=envelope)
         # lazy load

{dimp-2.4.0 → dimp-2.4.2}/dimp/dkd/instant.py

@@ -61,12 +61,12 @@ class PlainMessage(BaseMessage, InstantMessage):
                  head: Envelope = None, body: Content = None):
         if msg is None:
             # 1. new instant message with envelope & content
-            assert head is not None and body is not None, 'instant message error: %s, %s' % (head, body)
+            assert head is not None and body is not None, f'instant message error: {head}, {body}'
             super().__init__(None, head)
             # self['content'] = body.to_dict()
         else:
             # 2. message info from network
-            assert head is None and body is None, 'params error: %s, %s, %s' % (msg, head, body)
+            assert head is None and body is None, f'params error: {msg}, {head}, {body}'
             super().__init__(msg, head)
         # lazy
         self.__content = body
@@ -93,7 +93,7 @@ class PlainMessage(BaseMessage, InstantMessage):
         if body is None:
             info = self.get('content')
             body = Content.parse(content=info)
-            assert body is not None, 'message content error: %s' % self.to_dict()
+            assert body is not None, f'message content error: {self.to_dict()}'
             self.__content = body
         return body
 

{dimp-2.4.0 → dimp-2.4.2}/dimp/dkd/reliable.py

@@ -72,9 +72,9 @@ class NetworkMessage(EncryptedMessage, ReliableMessage):
         ted = self.__signature
         if ted is None:
             base64 = self.get('signature')
-            assert base64 is not None, 'message signature cannot be empty: %s' % self
+            assert base64 is not None, f'message signature cannot be empty: {self}'
             ted = TransportableData.parse(base64)
-            assert ted is not None, 'failed to decode message signature: %s' % base64
+            assert ted is not None, f'failed to decode message signature: {base64}'
             self.__signature = ted
-        assert ted is not None, 'message signature error: %s' % self.get('signature')
+        assert ted is not None, f'message signature error: {self.get("signature")}'
         return ted

{dimp-2.4.0 → dimp-2.4.2}/dimp/dkd/secure.py

@@ -83,9 +83,9 @@ class EncryptedMessage(BaseMessage, SecureMessage):
                 # so return the string data directly
                 ted = PlainData.create(string=text)  # JsON
             else:
-                assert False, 'content data error: %s' % text
+                assert False, f'content data error: {text}'
             self.__data = ted
-        assert ted is not None, 'message data error: %s' % self.get('data')
+        assert ted is not None, f'message data error: {self.get("data")}'
         return ted
 
     @property  # Override
@@ -96,6 +96,5 @@ class EncryptedMessage(BaseMessage, SecureMessage):
             if isinstance(keys, Dict):
                 self.__keys = keys
             else:
-                assert keys is None, 'message keys error: %s' % keys
-                # TODO: get from 'key'
+                assert keys is None, f'message keys error: {keys}'
         return keys

{dimp-2.4.0 → dimp-2.4.2}/dimp/format/base.py

@@ -101,7 +101,8 @@ class BaseString(Stringer):
     def __repr__(self) -> str:
         """ Return repr(self). """
         clazz = self.__class__.__name__
-        return '<%s>%s</%s>' % (clazz, self.to_str(), clazz)
+        text = self.to_str()
+        return f'<{clazz}>{text}</{clazz}>'
 
 
 class BaseData(BaseString, TransportableData, ABC):
@@ -118,7 +119,10 @@ class BaseData(BaseString, TransportableData, ABC):
     # Override
     @abstractmethod
     def to_str(self) -> str:
-        raise NotImplemented
+        """ Convert to string """
+        raise NotImplementedError(
+            f'Not implemented: {type(self).__module__}.{type(self).__name__}.to_str()'
+        )
 
     @property
     def is_empty(self) -> bool:

{dimp-2.4.0 → dimp-2.4.2}/dimp/format/data.py

@@ -44,7 +44,7 @@ class Base64Data(BaseData):
         data = self._binary
         if data is None:
             base64 = self._string
-            assert base64 is not None, 'Base64Data error: %s' % self
+            assert base64 is not None, f'Base64Data error: {self}'
             data = base64_decode(string=base64)
             self._binary = data
         return data
@@ -54,7 +54,7 @@ class Base64Data(BaseData):
         base64 = self._string
         if base64 is None or len(base64) == 0:
             data = self._binary
-            assert data is not None, 'Base64Data error: %s' % self
+            assert data is not None, f'Base64Data error: {self}'
             base64 = base64_encode(data=data)
             self._string = base64
         return base64
@@ -82,7 +82,7 @@ class PlainData(BaseData):
         data = self._binary
         if data is None:
             txt = self._string
-            assert txt is not None, 'PlainData error: %s' % self
+            assert txt is not None, f'PlainData error: {self}'
             data = utf8_encode(string=txt)
             self._binary = data
         return data
@@ -92,7 +92,7 @@ class PlainData(BaseData):
         txt = self._string
         if txt is None or len(txt) == 0:
             data = self._binary
-            assert data is not None, 'PlainData error: %s' % self
+            assert data is not None, f'PlainData error: {self}'
             txt = utf8_decode(data=data)
             self._string = txt
         return txt

{dimp-2.4.0 → dimp-2.4.2}/dimp/format/duri.py

@@ -110,9 +110,9 @@ class Header:
             #  2. extra info: 'charset' & 'filename'
             #
             if extra is not None:
-                for key in extra:
-                    value = extra[key]
-                    pair = '%s=%s' % (key, value)
+                for key, value in extra.items():
+                    # TODO: encode(value)
+                    pair = f'{key}={value}'
                     items.append(pair)
             #
             #  3. 'encoding'
@@ -139,7 +139,7 @@ class Header:
         if end < 6:
             # header empty
             return Header(mime_type='')
-        assert end < len(uri) - 1, 'data URI error: %s' % uri
+        assert end < len(uri) - 1, f'data URI error: {uri}'
         array = uri[5:end].split(';')
         # split main info
         mime_type: str = None
@@ -148,14 +148,14 @@ class Header:
         extra: Dict[str, str] = None
         for item in array:
             if len(item) == 0:
-                # assert False, 'header error: %s' % uri
+                # assert False, f'header error: {uri}'
                 continue
             #
             #  2. extra info: 'charset' or 'filename'
             #
             pos = item.find('=')
             if pos >= 0:
-                assert 0 < pos < len(item) - 1, 'header error: %s' % item
+                assert 0 < pos < len(item) - 1, f'header error: {item}'
                 if extra is None:
                     extra = {}
                 name = item[:pos].lower()
@@ -167,14 +167,14 @@ class Header:
             #
             pos = item.find('/')
             if pos >= 0:
-                assert 0 < pos < len(item) - 1, 'header error: %s' % item
-                assert mime_type is None, 'duplicate mime-type: %s' % uri
+                assert 0 < pos < len(item) - 1, f'header error: {item}'
+                assert mime_type is None, f'duplicate mime-type: {uri}'
                 mime_type = item
                 continue
             #
             #  3. 'encoding'
             #
-            assert encoding is None, 'duplicate encoding: %s' % uri
+            assert encoding is None, f'duplicate encoding: {uri}'
             encoding = item
         # OK
         if mime_type is None:
@@ -258,9 +258,9 @@ class DataURI:
         if text is None:
             header = self.head.to_str()
             if len(header) == 0:
-                text = 'data:,%s' % self.body
+                text = f'data:,{self.body}'
             else:
-                text = 'data:%s,%s' % (header, self.body)
+                text = f'data:{header},{self.body}'
             self.__uri_string = text
         return text
 
@@ -277,7 +277,7 @@ class DataURI:
             return None
         pos = uri.find(',')
         if pos < 0:
-            # assert False, 'data URI error: %s' % uri
+            # assert False, f'data URI error: {uri}'
             return None
         head = Header.split_header(uri=uri, end=pos)
         body = uri[pos+1:]

{dimp-2.4.0 → dimp-2.4.2}/dimp/format/embed.py

@@ -156,10 +156,9 @@ class EmbedData(BaseData):
             header = 'text/plain' if mime_type is None else mime_type
             extra = self.__parameters
             if extra is not None:
-                for key in extra:
-                    value = extra[key]
-                    header += ';%s=%s' % (key, value)
-            txt = 'data:%s;base64,%s' % (header, body)
+                for key, value in extra.items():
+                    header += f';{key}={value}'
+            txt = f'data:{header};base64,{body}'
             # self._string = txt
         # parse for data URI
         uri = DataURI.parse(uri=txt)

{dimp-2.4.0 → dimp-2.4.2}/dimp/format/file.py

@@ -63,22 +63,34 @@ class TransportableFile(Mapper, TransportableResource, ABC):
     @property
     @abstractmethod
     def data(self) -> Optional[TransportableData]:
-        raise NotImplemented
+        """ Get file data """
+        raise NotImplementedError(
+            f'Not implemented: {type(self).__module__}.{type(self).__name__}.data getter'
+        )
 
     @data.setter
     @abstractmethod
     def data(self, content: Optional[TransportableData]):
-        raise NotImplemented
+        """ Set file data """
+        raise NotImplementedError(
+            f'Not implemented: {type(self).__module__}.{type(self).__name__}.data setter'
+        )
 
     @property
     @abstractmethod
     def filename(self) -> Optional[str]:
-        raise NotImplemented
+        """ Get filename """
+        raise NotImplementedError(
+            f'Not implemented: {type(self).__module__}.{type(self).__name__}.filename getter'
+        )
 
     @filename.setter
     @abstractmethod
     def filename(self, string: Optional[str]):
-        raise NotImplemented
+        """ Set filename """
+        raise NotImplementedError(
+            f'Not implemented: {type(self).__module__}.{type(self).__name__}.filename setter'
+        )
 
     #
     #   Download URL
@@ -86,13 +98,18 @@ class TransportableFile(Mapper, TransportableResource, ABC):
     @property
     @abstractmethod
     def url(self) -> Optional[URI]:
-        # download URL from CDN
-        raise NotImplemented
+        """ Get download URL from CDN """
+        raise NotImplementedError(
+            f'Not implemented: {type(self).__module__}.{type(self).__name__}.url getter'
+        )
 
     @url.setter
     @abstractmethod
     def url(self, string: Optional[URI]):
-        raise NotImplemented
+        """ Set URL """
+        raise NotImplementedError(
+            f'Not implemented: {type(self).__module__}.{type(self).__name__}.url setter'
+        )
 
     #
     #   Password for decrypting the downloaded data from CDN,
@@ -101,12 +118,18 @@ class TransportableFile(Mapper, TransportableResource, ABC):
     @property
     @abstractmethod
     def password(self) -> Optional[DecryptKey]:
-        raise NotImplemented
+        """ Get password """
+        raise NotImplementedError(
+            f'Not implemented: {type(self).__module__}.{type(self).__name__}.password getter'
+        )
 
     @password.setter
     @abstractmethod
     def password(self, key: Optional[DecryptKey]):
-        raise NotImplemented
+        """ Set password """
+        raise NotImplementedError(
+            f'Not implemented: {type(self).__module__}.{type(self).__name__}.password setter'
+        )
 
     # Override
     @abstractmethod
@@ -116,13 +139,17 @@ class TransportableFile(Mapper, TransportableResource, ABC):
 
         :return: 'URL', or JSON string: '{...}'
         """
-        raise NotImplemented
+        raise NotImplementedError(
+            f'Not implemented: {type(self).__module__}.{type(self).__name__}.__str__()'
+        )
 
     # Override
     @abstractmethod
     def to_dict(self) -> Dict:
-        """ serialize to map """
-        raise NotImplemented
+        """ Serialize to map """
+        raise NotImplementedError(
+            f'Not implemented: {type(self).__module__}.{type(self).__name__}.to_dict()'
+        )
 
     # Override
     @abstractmethod
@@ -132,7 +159,9 @@ class TransportableFile(Mapper, TransportableResource, ABC):
 
         :return: str or dict
         """
-        return NotImplemented
+        raise NotImplementedError(
+            f'Not implemented: {type(self).__module__}.{type(self).__name__}.serialize()'
+        )
 
     #
     #  Factory methods
@@ -183,7 +212,9 @@ class TransportableFileFactory(ABC):
         :param password: decrypt key for downloaded data
         :return: PNF object
         """
-        raise NotImplemented
+        raise NotImplementedError(
+            f'Not implemented: {type(self).__module__}.{type(self).__name__}.create_transportable_file()'
+        )
 
     @abstractmethod
     def parse_transportable_file(self, pnf: Dict) -> Optional[TransportableFile]:
@@ -193,7 +224,9 @@ class TransportableFileFactory(ABC):
         :param pnf: PNF info
         :return: PNF object
         """
-        raise NotImplemented
+        raise NotImplementedError(
+            f'Not implemented: {type(self).__module__}.{type(self).__name__}.parse_transportable_file()'
+        )
 
 
 # -----------------------------------------------------------------------------
@@ -206,31 +239,49 @@ class TransportableFileHelper(ABC):
 
     @abstractmethod
     def set_transportable_file_factory(self, factory: TransportableFileFactory):
-        raise NotImplemented
+        """ Set PNF factory """
+        raise NotImplementedError(
+            f'Not implemented: {type(self).__module__}.{type(self).__name__}.set_transportable_file_factory()'
+        )
 
     @abstractmethod
     def get_transportable_file_factory(self) -> Optional[TransportableFileFactory]:
-        raise NotImplemented
+        """ Get PNF factory """
+        raise NotImplementedError(
+            f'Not implemented: {type(self).__module__}.{type(self).__name__}.get_transportable_file_factory()'
+        )
 
     @abstractmethod
     def create_transportable_file(self, data: Optional[TransportableData], filename: Optional[str],
                                   url: Optional[URI], password: Optional[DecryptKey]) -> TransportableFile:
-        raise NotImplemented
+        """ Create PNF """
+        raise NotImplementedError(
+            f'Not implemented: {type(self).__module__}.{type(self).__name__}.create_transportable_file()'
+        )
 
     @abstractmethod
     def parse_transportable_file(self, pnf: Any) -> Optional[TransportableFile]:
-        raise NotImplemented
+        """ Parse any object to PNF """
+        raise NotImplementedError(
+            f'Not implemented: {type(self).__module__}.{type(self).__name__}.parse_transportable_file()'
+        )
 
 
 class TransportableFileExtension:
 
     @property
     def pnf_helper(self) -> Optional[TransportableFileHelper]:
-        raise NotImplemented
+        """ Get PNF helper """
+        raise NotImplementedError(
+            f'Not implemented: {type(self).__module__}.{type(self).__name__}.pnf_helper getter'
+        )
 
     @pnf_helper.setter
     def pnf_helper(self, helper: TransportableFileHelper):
-        raise NotImplemented
+        """ Set PNF helper """
+        raise NotImplementedError(
+            f'Not implemented: {type(self).__module__}.{type(self).__name__}.pnf_helper setter'
+        )
 
 
 shared_format_extensions.pnf_helper: Optional[TransportableFileHelper] = None