moira-python-client 4.2.1__py3-none-any.whl → 4.3.0__py3-none-any.whl

moira_client/models/contact.py

@@ -23,6 +23,7 @@ class Contact(Base):
         self.user = kwargs.get('user', None)
         self.name = kwargs.get('name', None)
         self._id = kwargs.get('id', None)
+        self.team_id = kwargs.get('team_id', None)
 
 
 class ContactManager:

moira_client/models/subscription.py

@@ -2,12 +2,10 @@ from ..client import InvalidJSONError
 from ..client import ResponseStructureError
 from .base import Base
 
-class Subscription(Base):
-    def __init__(self, client, tags, contacts=None, enabled=None, throttling=None, sched=None,
+class SubscriptionModel(Base):
+    def __init__(self, tags, contacts=None, enabled=None, throttling=None, sched=None,
                  ignore_warnings=False, ignore_recoverings=False, plotting=None, any_tags=False, **kwargs):
         """
-
-        :param client: api client
         :param tags: list of str tags
         :param contacts: list of contact id's
         :param enabled: bool is enabled
@@ -19,8 +17,6 @@ class Subscription(Base):
         :param any_tags: bool any tags
         :param kwargs: additional parameters
         """
-        self._client = client
-
         self._id = kwargs.get('id', None)
         self.tags = tags if not any_tags else []
         if not contacts:
@@ -38,32 +34,7 @@ class Subscription(Base):
         if not plotting:
             plotting = {'enabled': False, 'theme': 'light'}
         self.plotting = plotting
-
-    def _send_request(self, subscription_id=None):
-        data = {
-            'contacts': self.contacts,
-            'tags': self.tags,
-            'enabled': self.enabled,
-            'any_tags': self.any_tags,
-            'throttling': self.throttling,
-            'sched': self.sched,
-            'ignore_warnings': self.ignore_warnings,
-            'ignore_recoverings': self.ignore_recoverings,
-            'plotting': self.plotting
-        }
-
-        if subscription_id:
-            data['id'] = subscription_id
-
-        if subscription_id:
-            result = self._client.put('subscription/{id}'.format(id=subscription_id), json=data)
-        else:
-            result = self._client.put('subscription', json=data)
-        if 'id' not in result:
-            raise ResponseStructureError("id doesn't exist in response", result)
-
-        self._id = result['id']
-        return self._id
+        self.team_id = kwargs.get('team_id', None)
 
     def disable_day(self, day):
         """
@@ -124,26 +95,6 @@ class Subscription(Base):
             'theme': 'light'
             }
 
-    def save(self):
-        """
-        Save subscription
-
-        :return: subscription id
-        """
-        if self._id:
-            return self.update()
-        self._send_request()
-
-    def update(self):
-        """
-        Update subscription
-
-        :return: subscription id
-        """
-        if not self._id:
-            return self.save()
-        self._send_request(self._id)
-
     def set_start_hour(self, hour):
         """
         Set start hour
@@ -185,6 +136,85 @@ class Subscription(Base):
         self._end_minute = minute
 
 
+class Subscription(SubscriptionModel):
+    def __init__(self, client, tags, contacts=None, enabled=None, throttling=None, sched=None,
+                 ignore_warnings=False, ignore_recoverings=False, plotting=None, any_tags=False, **kwargs):
+        """
+        :param client: api client
+        :param tags: list of str tags
+        :param contacts: list of contact id's
+        :param enabled: bool is enabled
+        :param throttling: bool throttling
+        :param sched: dict schedule
+        :param ignore_warnings: bool ignore warnings
+        :param ignore_recoverings: bool ignore recoverings
+        :param plotting: dict plotting settings
+        :param any_tags: bool any tags
+        :param kwargs: additional parameters
+        """
+        self._client = client
+
+        super().__init__(
+            tags=tags,
+            contacts=contacts,
+            enabled=enabled,
+            throttling=throttling,
+            sched=sched,
+            ignore_warnings=ignore_warnings,
+            ignore_recoverings=ignore_recoverings,
+            plotting=plotting,
+            any_tags=any_tags,
+            **kwargs,
+        )
+
+    def _send_request(self, subscription_id=None):
+        data = {
+            'contacts': self.contacts,
+            'tags': self.tags,
+            'enabled': self.enabled,
+            'any_tags': self.any_tags,
+            'throttling': self.throttling,
+            'sched': self.sched,
+            'ignore_warnings': self.ignore_warnings,
+            'ignore_recoverings': self.ignore_recoverings,
+            'plotting': self.plotting,
+            'team_id': self.team_id,
+        }
+
+        if subscription_id:
+            data['id'] = subscription_id
+
+        if subscription_id:
+            result = self._client.put('subscription/{id}'.format(id=subscription_id), json=data)
+        else:
+            result = self._client.put('subscription', json=data)
+        if 'id' not in result:
+            raise ResponseStructureError("id doesn't exist in response", result)
+
+        self._id = result['id']
+        return self._id
+
+    def save(self):
+        """
+        Save subscription
+
+        :return: subscription id
+        """
+        if self._id:
+            return self.update()
+        self._send_request()
+
+    def update(self):
+        """
+        Update subscription
+
+        :return: subscription id
+        """
+        if not self._id:
+            return self.save()
+        self._send_request(self._id)
+
+
 class SubscriptionManager:
     def __init__(self, client):
         self._client = client

moira_client/moira.py

@@ -9,6 +9,7 @@ from .models.trigger import TriggerManager
 from .models.health import HealthManager
 from .models.config import ConfigManager
 from .models.user import UserManager
+from .models.team import TeamManager
 
 
 class Moira:
@@ -34,6 +35,7 @@ class Moira:
         self._health = None
         self._config = None
         self._user = None
+        self._team = None
 
     @property
     def trigger(self):
@@ -145,3 +147,12 @@ class Moira:
         if not self._user:
             self._user = UserManager(self._client)
         return self._user
+
+    @property
+    def team(self) -> TeamManager:
+        """Get team manager
+        """
+        if not self._team:
+            self._team = TeamManager(self._client)
+
+        return self._team

{moira_python_client-4.2.1.dist-info → moira_python_client-4.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: moira-python-client
-Version: 4.2.1
+Version: 4.3.0
 Summary: Client for Moira - Alerting system based on Graphite data
 Home-page: https://github.com/moira-alert/python-moira-client
 Author: Alexander Lukyanchenko

{moira_python_client-4.2.1.dist-info → moira_python_client-4.3.0.dist-info}/RECORD

@@ -1,20 +1,20 @@
 moira_client/__init__.py,sha256=BUWUwGU1V5wvdi5-mUXd8AJlsGyrAvFKOjs8-vkUV4o,67
 moira_client/client.py,sha256=SGakaO2SB2EjsZPlfD1Dv2naIgwBr5F5QufYKm-Ro1w,4106
-moira_client/moira.py,sha256=40OmxdnUTyrhjZhDwhy9OToeZhYyMLkytB619X0p8z4,3601
+moira_client/moira.py,sha256=Pa3grEVhGu2gcPxWR8sdu7GGowNF3AXBYvK1nmRiZi8,3859
 moira_client/models/__init__.py,sha256=K3Kcjh8F_jV703ii-QMeN9cMwqcCfbfeNF7e9MfCD1c,126
 moira_client/models/base.py,sha256=cYVLxnc5PGjmUcoZRZ7AFx5f0Ij96HypJpOjpwr_D-Q,385
 moira_client/models/config.py,sha256=BbsShuKhe5H0DTXkIeOndHyXbi2xW2BRP0pwoIQl4Ok,2178
-moira_client/models/contact.py,sha256=iBt9A-wOF6CVprRfUVIKeJMkZy4vxb7zuvFxdE23x0E,4936
+moira_client/models/contact.py,sha256=-z8p32EIUfG9x8KRbUPeJR3DroOuPHfBN9pv8yq4lgI,4987
 moira_client/models/event.py,sha256=pXsuU-X3i3DX89rs1wBaB7SBvw_q5dgJwLJgQFrp7vg,1375
 moira_client/models/health.py,sha256=a2bGgHVVbcIJCraArjI9V-gqpwdRZ1B5SnNrsLqR6mI,1708
 moira_client/models/notification.py,sha256=stk78RW0lENkBX7FHm9cTskHkz8SxdXmpcXP72XwWio,1946
 moira_client/models/pattern.py,sha256=Ef8Roupkjrs8gb41vrgBwvgpgTmJU4igsU58z19LHcg,1619
-moira_client/models/subscription.py,sha256=xyB8MXM6mC0VjE_2aezBnSSaFER9u4LAQ0kJuzJsxas,7891
+moira_client/models/subscription.py,sha256=vAGuxrcTkGLtrj8D_cC_lo3EMGtAnClOXdmFfMl45E0,9050
 moira_client/models/tag.py,sha256=2sDmf9CKAzzZRqQykBdR3-jKgcfo62hGO7eivI1X_sc,4336
 moira_client/models/trigger.py,sha256=61Gs4blN0pcPrCEnOzpaKkA_UgeChz3Kv2qV-zXySYE,17868
 moira_client/models/user.py,sha256=9zG7pbmEA9ESUWFMzvqfyLP0lqcjz1pc0n8U7mL1UMk,1767
-moira_python_client-4.2.1.dist-info/LICENSE,sha256=HJk93uYDrJpwAa6G3ufYfC4ZgCKH2flOtdgOv1esxgI,1062
-moira_python_client-4.2.1.dist-info/METADATA,sha256=dZBENvHfgEfmaYvqZCDRl1wgvV4yBqRlONoHD32HNwA,1243
-moira_python_client-4.2.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-moira_python_client-4.2.1.dist-info/top_level.txt,sha256=zBB6_FP28feugBNn2cLmi5nCniRPnuChI6HuXUqFdIA,13
-moira_python_client-4.2.1.dist-info/RECORD,,
+moira_python_client-4.3.0.dist-info/LICENSE,sha256=HJk93uYDrJpwAa6G3ufYfC4ZgCKH2flOtdgOv1esxgI,1062
+moira_python_client-4.3.0.dist-info/METADATA,sha256=_OsSWx_61kPxAoKt0oIaH1h90ZT_fCyA40liA2i3SdY,1243
+moira_python_client-4.3.0.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+moira_python_client-4.3.0.dist-info/top_level.txt,sha256=zBB6_FP28feugBNn2cLmi5nCniRPnuChI6HuXUqFdIA,13
+moira_python_client-4.3.0.dist-info/RECORD,,

{moira_python_client-4.2.1.dist-info → moira_python_client-4.3.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (75.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any