aiomisc 17.5.29__py3-none-any.whl → 17.5.31__py3-none-any.whl

aiomisc/service/dns/records.py

@@ -88,7 +88,7 @@ class DNSRecord:
     type: RecordType
     data: RD
     cls: DNSClass = field(default=DNSClass.IN)
-    ttl: int = field(default=3600)
+    ttl: int = field(default=3600, compare=False)
 
     def rr(self, query_type: int) -> dnslib.RR:
         return dnslib.RR(

aiomisc/service/dns/store.py

@@ -1,4 +1,4 @@
-from typing import Optional, Sequence, Tuple
+from typing import Iterable, Mapping, Optional, Sequence, Tuple
 
 from .records import DNSRecord, RecordType
 from .tree import RadixTree
@@ -49,3 +49,22 @@ class DNSStore:
     @staticmethod
     def get_reverse_tuple(zone_name: str) -> Tuple[str, ...]:
         return tuple(zone_name.strip(".").split("."))[::-1]
+
+    def replace(
+        self, zones_data: Mapping[str, Iterable[DNSRecord]],
+    ) -> None:
+        """
+        Atomically replace all zones with new ones this method is safe
+        because it replaces all zones at once. zone_data is a mapping
+        zone name and a sequence of DNSRecord objects.
+
+        If any of the zones or records is invalid, nothing will be replaced.
+
+        This method is useful for reload configuration from disk
+        or database or etc.
+        """
+        new_zones: RadixTree[DNSZone] = RadixTree()
+        for zone_name, records in zones_data.items():
+            zone = DNSZone(zone_name, *records)
+            new_zones.insert(self.get_reverse_tuple(zone.name), zone)
+        self.zones = new_zones

aiomisc/service/dns/zone.py

@@ -1,28 +1,33 @@
 from collections import defaultdict
-from typing import DefaultDict, Sequence, Set, Tuple
+from typing import DefaultDict, Iterable, Sequence, Set, Tuple
 
 from .records import DNSRecord, RecordType
 
 
+RecordsType = DefaultDict[Tuple[str, RecordType], Set[DNSRecord]]
+
+
 class DNSZone:
-    records: DefaultDict[Tuple[str, RecordType], Set[DNSRecord]]
+    records: RecordsType
     name: str
 
     __slots__ = ("name", "records")
 
-    def __init__(self, name: str):
+    def __init__(self, name: str, *records: DNSRecord) -> None:
         if not name.endswith("."):
             name += "."
         self.name = name
         self.records = defaultdict(set)
 
+        for record in records:
+            self.add_record(record)
+
     def add_record(self, record: DNSRecord) -> None:
-        if not self._is_valid_record(record):
+        if not self.check_record(record):
             raise ValueError(
                 f"Record {record.name} does not belong to zone {self.name}",
             )
-        key = (record.name, record.type)
-        self.records[key].add(record)
+        self.records[(record.name, record.type)].add(record)
 
     def remove_record(self, record: DNSRecord) -> None:
         key = (record.name, record.type)
@@ -37,8 +42,26 @@ class DNSZone:
     ) -> Sequence[DNSRecord]:
         if not name.endswith("."):
             name += "."
-        key = (name, record_type)
-        return tuple(self.records.get(key, ()))
+        return tuple(self.records.get((name, record_type), ()))
 
-    def _is_valid_record(self, record: DNSRecord) -> bool:
+    def check_record(self, record: DNSRecord) -> bool:
         return record.name.endswith(self.name)
+
+    def replace(self, records: Iterable[DNSRecord]) -> None:
+        """
+        Atomically replace all records in specified zone with new ones.
+        This method is safe because it replaces all records at once.
+
+        If any of the records does not belong to the zone, ValueError
+        will be raised and no records will be replaced.
+        """
+        new_records: RecordsType = defaultdict(set)
+
+        for record in records:
+            if not self.check_record(record):
+                raise ValueError(
+                    f"Record {record.name} does not "
+                    f"belong to zone {self.name}",
+                )
+            new_records[(record.name, record.type)].add(record)
+        self.records = new_records

aiomisc/service/raven.py

@@ -70,7 +70,7 @@ class AioHttpTransportBase(
     def __init__(
         self, parsed_url: Optional[str] = None, *, verify_ssl: bool = True,
         timeout: TimeoutType = defaults.TIMEOUT, keepalive: bool = True,
-        family: int = socket.AF_INET,
+        family: socket.AddressFamily = socket.AddressFamily.AF_INET,
     ):
         self._keepalive = keepalive
         self._family = family
@@ -92,7 +92,7 @@ class AioHttpTransportBase(
         return self._keepalive
 
     @property
-    def family(self) -> int:
+    def family(self) -> socket.AddressFamily:
         return self._family
 
     def _client_session_factory(self) -> aiohttp.ClientSession:

aiomisc/version.py

@@ -2,5 +2,5 @@
 # BY: poem-plugins "git" plugin
 # NEVER EDIT THIS FILE MANUALLY
 
-version_info = (17, 5, 29)
-__version__ = "17.5.29"
+version_info = (17, 5, 31)
+__version__ = "17.5.31"

{aiomisc-17.5.29.dist-info → aiomisc-17.5.31.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aiomisc
-Version: 17.5.29
+Version: 17.5.31
 Summary: aiomisc - miscellaneous utils for asyncio
 Home-page: https://github.com/aiokitchen/aiomisc
 License: MIT

{aiomisc-17.5.29.dist-info → aiomisc-17.5.31.dist-info}/RECORD

@@ -25,16 +25,16 @@ aiomisc/service/base.py,sha256=6xvD27Sh2jy-4JWer6n31FuSq798DZhLI730YYGQbYc,4322
 aiomisc/service/carbon.py,sha256=o7x2LYUOfCcWYDAP9EFdCTtsduXhqkyMAuIqVio9YsM,1743
 aiomisc/service/cron.py,sha256=VM-FjdAhy_zFkU-YTdpBSxF79upvrsCo-3kdI9cZTOo,1975
 aiomisc/service/dns/__init__.py,sha256=RT8_0H8LrQe8sz2xvA2BvLi6CiJVZeVFltNRAx9MN7o,254
-aiomisc/service/dns/records.py,sha256=dN_yS3KKmRCF4fNk-fxRB2m-NCQaho42thG5OLFpyZU,8756
+aiomisc/service/dns/records.py,sha256=VE65kDSJ3Fg3-V60-AQQY2OxR89_ggaAc38k7vKUatM,8771
 aiomisc/service/dns/service.py,sha256=F8KSmFry6WpA4tWNrKcXVhS6GWb_Cyl3uanGu4lbOPw,3616
-aiomisc/service/dns/store.py,sha256=FchfLSoWAI2x4n5RyIcnx_i7RQjHmBbco4L4rSAanGU,1749
+aiomisc/service/dns/store.py,sha256=PCYp-H1UoFzUVaYfSnK78_TG3fw1CeIzg-ndMgu_cE4,2509
 aiomisc/service/dns/tree.py,sha256=q9VRcVxggrClUHyGZZqqSByMaHdU4nYPC1NdT17cVWM,1575
-aiomisc/service/dns/zone.py,sha256=Dc3bL7L3rz38J0_R790d_uJlisfJ78vwfdsxmtVfg_w,1343
+aiomisc/service/dns/zone.py,sha256=6Xmrl_leLalSiRQWWNuwGtZVw31Y93i9K2j0JU1vt-4,2174
 aiomisc/service/grpc_server.py,sha256=G1iRGX3jAfv3fpzNnw_n6UuhORmIZK4cz6aAi7t7qcU,4553
 aiomisc/service/periodic.py,sha256=BEKGWxWDOX11sfo7MFYp-hiB5iZ4-c2BRsjS56k5B-0,1241
 aiomisc/service/process.py,sha256=mZf8muZJNWQo95pUmzchMk08MJMhLifFK8m4CnNX49k,4477
 aiomisc/service/profiler.py,sha256=6KiJsU7tD5eO4YKZXYujV2E8P-G8GUqLAGIl0AuPNG4,1503
-aiomisc/service/raven.py,sha256=76GTQ2tOZ4exvWnqnI84hDQc1iBVO1Psrxal0zG7-ow,12166
+aiomisc/service/raven.py,sha256=VHqnXWx-_r71_pjFniIB_E4CgT2reuRD1EB4yEC0hzE,12214
 aiomisc/service/sdwatchdog.py,sha256=6AMI0MP5deZKEmxguE3w68dapW4xFLRYgx9rgBk5mRw,4473
 aiomisc/service/tcp.py,sha256=gIdm4wXT191TMpL3Yzm_I7y--1kVxBLioN5lBP8mlhs,5507
 aiomisc/service/tls.py,sha256=oFTYVe2zf1Ow_Gniem9WyNj_SkD3q95bcsz8LWAYqdI,7325
@@ -45,7 +45,7 @@ aiomisc/signal.py,sha256=_iiC2jukXg7-LLirIl1YATlKIIsKLbmTNFr1Ezheu7g,1728
 aiomisc/thread_pool.py,sha256=591u5HV1aBmBRcaVm4kAtMLPZOb6veqhT9wkts_knqE,14017
 aiomisc/timeout.py,sha256=OhXCvQGbPZA9IQ7cRT7ZlZnsbmDgH5ioErQyjeqIEzY,919
 aiomisc/utils.py,sha256=6yTfTpeRCVzfZp-MJCmB1oayOHUBVwQwzC3U5PBAjn8,11919
-aiomisc/version.py,sha256=nd6HyJwsO6HlGHmAhBOBqPIXx-CkhF0dqF_CekE6tJ0,156
+aiomisc/version.py,sha256=inQlcadD8kWvAqeup4DUVRxcUEOCEEwskUqD2Cu1nXM,156
 aiomisc/worker_pool.py,sha256=GA91KdOrBlqHthbVSTxu_d6BsBIbl-uKqW2NxqSafG0,11107
 aiomisc_log/__init__.py,sha256=ZD-Q-YTWoZdxJpMqMNMIraA_gaN0QawgnVpXz6mxd2o,4855
 aiomisc_log/enum.py,sha256=_zfCZPYCGyI9KL6TqHiYVlOfA5U5MCbsuCuDKxDHdxg,1549
@@ -63,8 +63,8 @@ aiomisc_worker/process_inner.py,sha256=8ZtjCSLrgySW57OIbuGrpEWxfysRLYKx1or1YaAqx
 aiomisc_worker/protocol.py,sha256=1smmlBbdreSmnrxuhHaUMUC10FO9xMIEcedhweQJX_A,2705
 aiomisc_worker/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aiomisc_worker/worker.py,sha256=f8nCFhlKh84UUBUaEgCllwMRvVZiD8_UUXaeit6g3T8,3236
-aiomisc-17.5.29.dist-info/COPYING,sha256=Ky_8CQMaIixfyOreUBsl0hKN6A5fLnPF8KPQ9molMYA,1125
-aiomisc-17.5.29.dist-info/METADATA,sha256=KoNJ-qBG7Wo5jedEjR_YqSNsDMDPDEpOVUwb3RHjwmM,15724
-aiomisc-17.5.29.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-aiomisc-17.5.29.dist-info/entry_points.txt,sha256=KRsSPCwKJyGTWrvzpwbS0yIDwzsgDA2X6f0CBWYmNao,55
-aiomisc-17.5.29.dist-info/RECORD,,
+aiomisc-17.5.31.dist-info/COPYING,sha256=Ky_8CQMaIixfyOreUBsl0hKN6A5fLnPF8KPQ9molMYA,1125
+aiomisc-17.5.31.dist-info/METADATA,sha256=4Mvo60Wnj7oJLOqGnrPrbiIGcSEiKY1HHCTj5dVHqa0,15724
+aiomisc-17.5.31.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+aiomisc-17.5.31.dist-info/entry_points.txt,sha256=KRsSPCwKJyGTWrvzpwbS0yIDwzsgDA2X6f0CBWYmNao,55
+aiomisc-17.5.31.dist-info/RECORD,,