dimples 1.4.1__tar.gz → 1.4.2__tar.gz

{dimples-1.4.1 → dimples-1.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dimples
-Version: 1.4.1
+Version: 1.4.2
 Summary: DIMP Library for Edges and Stations
 Home-page: https://github.com/dimchat/demo-py
 Author: Albert Moky

{dimples-1.4.1 → dimples-1.4.2}/dimples/__init__.py

@@ -470,7 +470,7 @@ __all__ = [
     #   Table
     #
 
-    'DbTask',
+    'DbTask', 'DataCache',
 
     'PrivateKeyTable', 'MetaTable', 'DocumentTable',
     'UserTable', 'GroupTable', 'GroupHistoryTable',

{dimples-1.4.1 → dimples-1.4.2}/dimples/database/__init__.py

@@ -34,7 +34,7 @@ from ..common.dbi import *
 from .dos import *
 from .redis import *
 
-from .t_base import DbTask
+from .t_base import DbTask, DataCache
 
 from .t_private import PrivateKeyTable
 from .t_meta import MetaTable
@@ -100,7 +100,7 @@ __all__ = [
     #   Table
     #
 
-    'DbTask',
+    'DbTask', 'DataCache',
 
     'PrivateKeyTable', 'MetaTable', 'DocumentTable',
     'UserTable', 'GroupTable', 'GroupHistoryTable',

{dimples-1.4.1 → dimples-1.4.2}/dimples/database/t_base.py

@@ -61,37 +61,37 @@ class DbTask(Logging, Generic[K, V], ABC):
     def __init__(self, mutex_lock: threading.Lock, cache_pool: CachePool,
                  cache_expires: float = None, cache_refresh: float = None):
         super().__init__()
-        self.__lock = mutex_lock
+        self._lock = mutex_lock
         # memory cache
-        self.__cache_pool = cache_pool
+        self._cache_pool = cache_pool
         # memory expires
         if cache_expires is None:
-            self.__cache_expires = self.MEM_CACHE_EXPIRES
+            self._cache_expires = self.MEM_CACHE_EXPIRES
         else:
             assert cache_expires > 0, 'cache expires durations error: %s' % cache_expires
-            self.__cache_expires = cache_expires
+            self._cache_expires = cache_expires
         # memory refresh
         if cache_refresh is None:
-            self.__cache_refresh = self.MEM_CACHE_REFRESH
+            self._cache_refresh = self.MEM_CACHE_REFRESH
         else:
             assert cache_refresh > 0, 'cache refresh durations error: %s' % cache_refresh
-            self.__cache_refresh = cache_refresh
+            self._cache_refresh = cache_refresh
 
     @property  # protected
     def lock(self) -> threading.Lock:
-        return self.__lock
+        return self._lock
 
     @property  # protected
     def cache_pool(self) -> CachePool[K, V]:
-        return self.__cache_pool
+        return self._cache_pool
 
     @property  # protected
     def cache_expires(self) -> float:
-        return self.__cache_expires
+        return self._cache_expires
 
     @property  # protected
     def cache_refresh(self) -> float:
-        return self.__cache_refresh
+        return self._cache_refresh
 
     @property  # protected
     @abstractmethod

{dimples-1.4.1 → dimples-1.4.2}/dimples/database/t_group.py

@@ -72,7 +72,7 @@ class MemberTask(GrpTask):
             # 4. return empty array as a placeholder for the memory cache
             members = []
         # 5. update redis server
-        await self._dos.save_members(members=members, group=self._group)
+        await self._redis.save_members(members=members, group=self._group)
         return members
 
     # Override
@@ -99,7 +99,7 @@ class BotTask(GrpTask):
             # 4. return empty array as a placeholder for the memory cache
             bots = []
         # 5. update redis server
-        await self._dos.save_assistants(assistants=bots, group=self._group)
+        await self._redis.save_assistants(assistants=bots, group=self._group)
         return bots
 
     # Override
@@ -126,7 +126,7 @@ class AdminTask(GrpTask):
             # 4. return empty array as a placeholder for the memory cache
             admins = []
         # 5. update redis server
-        await self._dos.save_administrators(administrators=admins, group=self._group)
+        await self._redis.save_administrators(administrators=admins, group=self._group)
         return admins
 
     # Override

{dimples-1.4.1 → dimples-1.4.2}/dimples/database/t_group_history.py

@@ -68,7 +68,7 @@ class HisTask(DbTask[ID, List[Tuple[GroupCommand, ReliableMessage]]]):
             # 4. return empty array as a placeholder for the memory cache
             array = []
         # 5. update redis server
-        await self._dos.save_group_histories(group=self._group, histories=array)
+        await self._redis.save_group_histories(group=self._group, histories=array)
         return array
 
     # Override

{dimples-1.4.1 → dimples-1.4.2}/dimples/database/t_group_keys.py

@@ -67,7 +67,7 @@ class PwdTask(DbTask[Tuple[ID, ID], Dict[str, str]]):
             # 4. return empty dictionary as a placeholder for the memory cache
             keys = {}
         # 5. update redis server
-        await self._dos.save_group_keys(group=self._group, sender=self._sender, keys=keys)
+        await self._redis.save_group_keys(group=self._group, sender=self._sender, keys=keys)
         return keys
 
     # Override

{dimples-1.4.1 → dimples-1.4.2}/dimples/database/t_meta.py

@@ -68,7 +68,7 @@ class TaiTask(DbTask[ID, Meta]):
         meta = await self._dos.get_meta(identifier=self._identifier)
         if meta is not None:
             # 3. update redis server
-            await self._dos.save_meta(meta=meta, identifier=self._identifier)
+            await self._redis.save_meta(meta=meta, identifier=self._identifier)
             return meta
 
     # Override

{dimples-1.4.1 → dimples-1.4.2}/dimples/utils/config.py

@@ -24,7 +24,7 @@
 # ==============================================================================
 
 from configparser import ConfigParser
-from typing import Optional, Any, Dict, List
+from typing import Optional, Any, List, Dict
 from typing import Iterable
 
 from aiou import JSONFile
@@ -33,6 +33,7 @@ from aiou import RedisConnector
 from dimsdk import JSON
 from dimsdk import Dictionary
 from dimsdk import ID
+from dimsdk import Facebook
 
 from .log import Log, Logging
 from .http import HttpClient
@@ -104,7 +105,8 @@ class Config(Logging):
     def __init__(self):
         super().__init__()
         self.__parser: Optional[ConfigParser] = None
-        self.__info: Optional[Dict] = None
+        self.__ready = False
+        self.__info = {}
         self.__path: Optional[str] = None
         self.__redis: Optional[RedisConnector] = None
         self.__stations: List[MessageTransferAgent] = []
@@ -120,7 +122,7 @@ class Config(Logging):
         parser = ConfigParser()
         parser.read(path)
         self.__parser = parser
-        self.__info = None
+        self.__ready = False
         self.__stations = None
         # load neighbor stations
         try:
@@ -132,13 +134,12 @@ class Config(Logging):
 
     @property
     def dictionary(self) -> Optional[Dict]:
-        info = self.__info
-        if info is None:
-            parser = self.__parser
-            if parser is not None:
-                info = _config_sections(parser=parser)
-                self.__info = info
-        return info
+        parser = self.__parser
+        if parser is None or self.__ready:
+            return self.__info
+        else:
+            self.__ready = True
+            return _update_sections(info=self.__info, parser=parser)
 
     # Override
     def __str__(self) -> str:
@@ -198,6 +199,37 @@ class Config(Logging):
                 result.append(string)
         return result
 
+    #
+    #   ID list
+    #
+
+    def get_identifiers(self, section: str, option: str) -> List[ID]:
+        array = self.get_list(section=section, option=option)
+        return ID.convert(array=array)
+
+    async def get_users(self, section: str, option: str, facebook: Facebook) -> List[ID]:
+        users = []
+        array = self.get_identifiers(section=section, option=option)
+        for item in array:
+            if item.is_user:
+                if item not in users:
+                    users.append(item)
+                continue
+            # extract group members
+            members = await facebook.get_members(identifier=item)
+            for usr in members:
+                if usr not in users:
+                    users.append(usr)
+        return users
+
+    async def get_supervisors(self, section: str = 'admin', option: str = 'supervisors',
+                              facebook: Facebook = None) -> List[ID]:
+        """ extract group members when facebook available """
+        if facebook is None:
+            return self.get_identifiers(section=section, option=option)
+        else:
+            return await self.get_users(section=section, option=option, facebook=facebook)
+
     #
     #   database
     #
@@ -335,10 +367,12 @@ class NeighborLoader(Logging):
         self.info(msg='downloading stations: %s' % url)
         http = self.__http
         try:
-            text = http.cache_get(url=url)
-            if text is None:
+            response = http.cache_get(url=url)
+            if response is None or response.status_code != 200:
+                self.error(msg='failed to get URL: %s response: %s' % (url, response))
                 return None
             else:
+                text = response.text
                 stations = JSON.decode(string=text)
         except Exception as error:
             self.error(msg='failed to download stations: %s, %s' % (error, url))
@@ -369,8 +403,7 @@ class NeighborLoader(Logging):
             self.error(msg='failed to save stations: %s, %s' % (error, path))
 
 
-def _config_sections(parser: ConfigParser) -> Dict:
-    info = {}
+def _update_sections(info: Dict, parser: ConfigParser) -> Dict:
     sections = parser.sections()
     for name in sections:
         options = _section_options(parser=parser, section=name)

{dimples-1.4.1 → dimples-1.4.2}/dimples/utils/http.py

@@ -158,7 +158,7 @@ class HttpClient(Logging):
     def remove_cache(self, url: str):
         self.__web_cache.erase(key=url)
 
-    def cache_get(self, url: str, headers: Dict = None):
+    def cache_get(self, url: str, headers: Dict = None) -> Optional[Response]:
         now = DateTime.now()
         # 1. check memory cache
         value, holder = self.__web_cache.fetch(key=url, now=now)
@@ -174,11 +174,9 @@ class HttpClient(Logging):
                 # cache expired, wait to reload
                 holder.renewal(duration=self.CACHE_REFRESHING, now=now)
             # 2. query remote server
-            response = self.http_get(url=url, headers=headers)
-            if response.status_code == 200:
-                value = response.text
-                # 3. update memory cache
-                self.__web_cache.update(key=url, value=value, life_span=self.CACHE_EXPIRES, now=now)
+            value = self.http_get(url=url, headers=headers)
+            # 3. update memory cache
+            self.__web_cache.update(key=url, value=value, life_span=self.CACHE_EXPIRES, now=now)
         # OK, return cached value
         return value
 

{dimples-1.4.1 → dimples-1.4.2}/dimples/utils/log.py

@@ -35,6 +35,16 @@ def current_time() -> str:
     return str(DateTime.now())
 
 
+def shorten(text: str, max_len: int = 1024) -> str:
+    # assert max_len > 128, 'too short: %s' % max_len
+    size = 0 if text is None else len(text)
+    if size <= max_len:
+        return text
+    desc = 'total %d chars' % size
+    pos = (max_len - len(desc) - 10) >> 1
+    return '%s ... %s ... %s' % (text[:pos], desc, text[-pos:])
+
+
 DEBUG_FLAG = 0x01
 INFO_FLAG = 0x02
 WARNING_FLAG = 0x04
@@ -49,28 +59,38 @@ class Log:
 
     LEVEL = RELEASE
 
+    MAX_LEN = 1024
+
     @classmethod
     def debug(cls, msg: str):
         if cls.LEVEL & DEBUG_FLAG == 0:
             return None
+        # elif cls.MAX_LEN > 0:
+        #     msg = shorten(text=msg, max_len=cls.MAX_LEN)
         print('[%s]  DEBUG  | %s' % (current_time(), msg))
 
     @classmethod
     def info(cls, msg: str):
         if cls.LEVEL & INFO_FLAG == 0:
             return None
+        elif cls.MAX_LEN > 0:
+            msg = shorten(text=msg, max_len=cls.MAX_LEN)
         print('[%s]         | %s' % (current_time(), msg))
 
     @classmethod
     def warning(cls, msg: str):
         if cls.LEVEL & WARNING_FLAG == 0:
             return None
+        elif cls.MAX_LEN > 0:
+            msg = shorten(text=msg, max_len=cls.MAX_LEN)
         print('[%s] WARNING | %s' % (current_time(), msg))
 
     @classmethod
     def error(cls, msg: str):
         if cls.LEVEL & ERROR_FLAG == 0:
             return None
+        elif cls.MAX_LEN > 0:
+            msg = shorten(text=msg, max_len=cls.MAX_LEN)
         print('[%s]  ERROR  | %s' % (current_time(), msg))
 
 

{dimples-1.4.1 → dimples-1.4.2}/dimples.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dimples
-Version: 1.4.1
+Version: 1.4.2
 Summary: DIMP Library for Edges and Stations
 Home-page: https://github.com/dimchat/demo-py
 Author: Albert Moky

{dimples-1.4.1 → dimples-1.4.2}/setup.py

@@ -14,7 +14,7 @@ import io
 
 from setuptools import setup, find_packages
 
-__version__ = '1.4.1'
+__version__ = '1.4.2'
 __author__ = 'Albert Moky'
 __contact__ = 'albert.moky@gmail.com'