moira-python-client 4.3.0__tar.gz → 4.3.2__tar.gz

{moira_python_client-4.3.0 → moira_python_client-4.3.2}/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 4.3.2
+
+The PATCH method should be used to update a team 
+
+# 4.3.1
+
+Fix package issues
+
 # 4.3.0
 
 Add support for Team APIs

{moira_python_client-4.3.0/moira_python_client.egg-info → moira_python_client-4.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: moira-python-client
-Version: 4.3.0
+Version: 4.3.2
 Summary: Client for Moira - Alerting system based on Graphite data
 Home-page: https://github.com/moira-alert/python-moira-client
 Author: Alexander Lukyanchenko
@@ -20,6 +20,14 @@ Classifier: Topic :: System :: Monitoring
 Classifier: License :: OSI Approved :: MIT License
 License-File: LICENSE
 Requires-Dist: requests>=2.4.3
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: requires-dist
+Dynamic: summary
 
 
         Moira is a real-time alerting tool, based on Graphite data.

moira_python_client-4.3.2/VERSION.txt

@@ -0,0 +1 @@
+4.3.2

{moira_python_client-4.3.0 → moira_python_client-4.3.2}/moira_client/client.py

@@ -68,7 +68,7 @@ class Client:
         :param kwargs: additional parameters for request
         :return: dict response
 
-        :raises: HTTPError
+        :raises: MoiraApiError
         :raises: InvalidJSONError
         """
         r = requests.get(self._path_join(path), headers=self.headers, auth=self.auth, **kwargs)
@@ -90,7 +90,7 @@ class Client:
         :param kwargs: additional parameters for request
         :return: dict response
 
-        :raises: HTTPError
+        :raises: MoiraApiError
         :raises: InvalidJSONError
         """
         r = requests.delete(self._path_join(path), headers=self.headers, auth=self.auth, **kwargs)
@@ -112,7 +112,7 @@ class Client:
         :param kwargs: additional parameters for request
         :return: dict response
 
-        :raises: HTTPError
+        :raises: MoiraApiError
         :raises: InvalidJSONError
         """
         r = requests.put(self._path_join(path), headers=self.headers, auth=self.auth, **kwargs)
@@ -127,6 +127,28 @@ class Client:
         except ValueError:
             raise InvalidJSONError(r.content)
 
+    def patch(self, path='', **kwargs):
+        """
+
+        :param path: str api path
+        :param kwargs: additional parameters for request
+        :return: dict response
+
+        :raises: MoiraApiError
+        :raises: InvalidJSONError
+        """
+        r = requests.patch(self._path_join(path), headers=self.headers, auth=self.auth, **kwargs)
+
+        try:
+            r.raise_for_status()
+        except requests.exceptions.HTTPError as err:
+            raise MoiraApiError(r.content)
+
+        try:
+            return r.json()
+        except ValueError:
+            raise InvalidJSONError(r.content)
+
     def post(self, path='', **kwargs):
         """
 
@@ -134,7 +156,7 @@ class Client:
         :param kwargs: additional parameters for request
         :return: dict response
 
-        :raises: HTTPError
+        :raises: MoiraApiError
         :raises: InvalidJSONError
         """
         r = requests.post(self._path_join(path), headers=self.headers, auth=self.auth, **kwargs)

moira_python_client-4.3.2/moira_client/models/team/__init__.py

@@ -0,0 +1,8 @@
+from ._managers import TeamManager
+from ._models import TeamModel
+
+
+__all__ = [
+    "TeamManager",
+    "TeamModel",
+]

moira_python_client-4.3.2/moira_client/models/team/_managers.py

@@ -0,0 +1,96 @@
+from typing import Optional
+
+from ._models import TeamModel, UserTeams, SaveTeamResponse
+from .contact import TeamContactManager
+from .settings import TeamSettingsManager
+from .subscription import TeamSubscriptionManager
+from .user import TeamUserManager
+from ...client import Client
+
+
+class TeamManager:
+    def __init__(self, client: Client) -> None:
+        self._client = client
+        self._user = None  # type: Optional[TeamUserManager]
+        self._settings = None  # type: Optional[TeamSettingsManager]
+        self._subscription = None  # type: Optional[TeamSubscriptionManager]
+        self._contact = None  # type: Optional[TeamContactManager]
+
+    def get_all(self) -> UserTeams:
+        """Get all teams"""
+        response = self._client.get(self._full_path())
+
+        return UserTeams(teams=[TeamModel(**team) for team in response["teams"]])
+
+    def create(self, team: TeamModel) -> SaveTeamResponse:
+        """Create a new team"""
+        payload = {
+            "name": team.name,
+            "description": team.description,
+        }
+
+        response = self._client.post(self._full_path(), json=payload)
+
+        return SaveTeamResponse(**response)
+
+    def delete(self, team_id: str) -> SaveTeamResponse:
+        """Delete a team"""
+        response = self._client.delete(self._full_path(team_id))
+
+        return SaveTeamResponse(**response)
+
+    def get(self, team_id: str) -> TeamModel:
+        """Get a team by ID"""
+        response = self._client.get(self._full_path(team_id))
+
+        return TeamModel(**response)
+
+    def update(self, team_id: str, team: TeamModel) -> SaveTeamResponse:
+        """Update existing team"""
+        payload = {
+            "name": team.name,
+            "description": team.description,
+        }
+
+        response = self._client.patch(self._full_path(team_id), json=payload)
+
+        return SaveTeamResponse(**response)
+
+    @property
+    def user(self) -> TeamUserManager:
+        """Get team user manager"""
+        if self._user is None:
+            self._user = TeamUserManager(self._client)
+
+        return self._user
+
+    @property
+    def settings(self) -> TeamSettingsManager:
+        """Get team settings manager"""
+        if self._settings is None:
+            self._settings = TeamSettingsManager(self._client)
+
+        return self._settings
+
+    @property
+    def subscription(self) -> TeamSubscriptionManager:
+        """Get team subscription manager"""
+        if self._subscription is None:
+            self._subscription = TeamSubscriptionManager(self._client)
+
+        return self._subscription
+
+    @property
+    def contact(self) -> TeamContactManager:
+        """Get team contact manager"""
+        if self._contact is None:
+            self._contact = TeamContactManager(self._client)
+
+        return self._contact
+
+    @staticmethod
+    def _full_path(team_id: Optional[str] = None) -> str:
+        if team_id is None:
+            return "teams"
+
+        return "teams/{team_id}".format(team_id=team_id)

moira_python_client-4.3.2/moira_client/models/team/_models.py

@@ -0,0 +1,19 @@
+from ..base import Base
+from typing import List
+
+
+class TeamModel(Base):
+    def __init__(self, description: str, name: str, **kwargs):
+        self.description = description
+        self.name = name
+        self._id = kwargs.get("id", None)
+
+
+class UserTeams:
+    def __init__(self, teams: List[TeamModel]):
+        self.teams = teams
+
+
+class SaveTeamResponse(Base):
+    def __init__(self, **kwargs):
+        self._id = kwargs.get("id")

moira_python_client-4.3.2/moira_client/models/team/contact/__init__.py

@@ -0,0 +1,5 @@
+from ._managers import TeamContactManager
+
+__all__ = [
+    "TeamContactManager",
+]

moira_python_client-4.3.2/moira_client/models/team/contact/_managers.py

@@ -0,0 +1,24 @@
+from ...contact import Contact
+from ....client import Client
+
+
+class TeamContactManager:
+    def __init__(self, client: Client) -> None:
+        self._client = client
+
+    def create(self, team_id: str, contact: Contact) -> Contact:
+        """Create a new team contact"""
+        payload = {
+            "team_id": team_id,
+            "name": contact.name,
+            "type": contact.type,
+            "value": contact.value,
+        }
+
+        response = self._client.post(self._full_path(team_id), json=payload)
+
+        return Contact(**response)
+
+    @staticmethod
+    def _full_path(team_id: str) -> str:
+        return "teams/{team_id}/contacts".format(team_id=team_id)

moira_python_client-4.3.2/moira_client/models/team/settings/__init__.py

@@ -0,0 +1,7 @@
+from ._managers import TeamSettingsManager
+from ._models import TeamSettings
+
+__all__ = [
+    "TeamSettings",
+    "TeamSettingsManager",
+]

moira_python_client-4.3.2/moira_client/models/team/settings/_managers.py

@@ -0,0 +1,23 @@
+from ._models import TeamSettings
+from ...contact import Contact
+from ...subscription import Subscription
+from ....client import Client
+
+
+class TeamSettingsManager:
+    def __init__(self, client: Client) -> None:
+        self._client = client
+
+    def get(self, team_id: str) -> TeamSettings:
+        """Get team settings"""
+        response = self._client.get(self._full_path(team_id))
+
+        return TeamSettings(
+            contacts=[Contact(**contact) for contact in response["contacts"]],
+            subscriptions=[Subscription(self._client, **subscription) for subscription in response["subscriptions"]],
+            team_id=response["team_id"],
+        )
+
+    @staticmethod
+    def _full_path(team_id: str) -> str:
+        return "teams/{team_id}/settings".format(team_id=team_id)

moira_python_client-4.3.2/moira_client/models/team/settings/_models.py

@@ -0,0 +1,11 @@
+from typing import List
+
+from ...contact import Contact
+from ...subscription import Subscription
+
+
+class TeamSettings:
+    def __init__(self, contacts: List[Contact], subscriptions: List[Subscription], team_id: str) -> None:
+        self.contacts = contacts
+        self.subscriptions = subscriptions
+        self.team_id = team_id

moira_python_client-4.3.2/moira_client/models/team/subscription/__init__.py

@@ -0,0 +1,5 @@
+from ._managers import TeamSubscriptionManager
+
+__all__ = [
+    "TeamSubscriptionManager",
+]

moira_python_client-4.3.2/moira_client/models/team/subscription/_managers.py

@@ -0,0 +1,30 @@
+from ...subscription import SubscriptionModel, Subscription
+from ....client import Client
+
+
+class TeamSubscriptionManager:
+    def __init__(self, client: Client) -> None:
+        self._client = client
+
+    def create(self, team_id: str, subscription: SubscriptionModel) -> Subscription:
+        """Create a new team subscription"""
+        payload = {
+            "team_id": team_id,
+            "contacts": subscription.contacts,
+            "tags": subscription.tags,
+            "enabled": subscription.enabled,
+            "any_tags": subscription.any_tags,
+            "throttling": subscription.throttling,
+            "sched": subscription.sched,
+            "ignore_warnings": subscription.ignore_warnings,
+            "ignore_recoverings": subscription.ignore_recoverings,
+            "plotting": subscription.plotting,
+        }
+
+        response = self._client.post(self._full_path(team_id), json=payload)
+
+        return Subscription(self._client, **response)
+
+    @staticmethod
+    def _full_path(team_id: str) -> str:
+        return "teams/{team_id}/subscriptions".format(team_id=team_id)

moira_python_client-4.3.2/moira_client/models/team/user/__init__.py

@@ -0,0 +1,7 @@
+from ._managers import TeamUserManager
+from ._models import TeamMembers
+
+__all__ = [
+    "TeamMembers",
+    "TeamUserManager",
+]

moira_python_client-4.3.2/moira_client/models/team/user/_managers.py

@@ -0,0 +1,43 @@
+from ._models import TeamMembers
+from ....client import Client
+from typing import Optional
+
+
+class TeamUserManager:
+    def __init__(self, client: Client) -> None:
+        self._client = client
+
+    def get(self, team_id: str) -> TeamMembers:
+        """Get users of a team"""
+        response = self._client.get(self._full_path(team_id))
+
+        return TeamMembers(**response)
+
+    def add(self, team_id: str, members: TeamMembers) -> TeamMembers:
+        """Add users to a team"""
+        payload = {"usernames": members.usernames}
+
+        response = self._client.post(self._full_path(team_id), json=payload)
+
+        return TeamMembers(**response)
+
+    def set(self, team_id: str, members: TeamMembers) -> TeamMembers:
+        """Set users of a team"""
+        payload = {"usernames": members.usernames}
+
+        response = self._client.put(self._full_path(team_id), json=payload)
+
+        return TeamMembers(**response)
+
+    def delete(self, team_id: str, team_user_id: str) -> TeamMembers:
+        """Delete a user from a team"""
+        response = self._client.delete(self._full_path(team_id, team_user_id))
+
+        return TeamMembers(**response)
+
+    @staticmethod
+    def _full_path(team_id: str, team_user_id: Optional[str] = None) -> str:
+        if team_user_id is None:
+            return "teams/{team_id}/users".format(team_id=team_id)
+
+        return "teams/{team_id}/users/{team_user_id}".format(team_id=team_id, team_user_id=team_user_id)

moira_python_client-4.3.2/moira_client/models/team/user/_models.py

@@ -0,0 +1,6 @@
+from typing import List
+
+
+class TeamMembers:
+    def __init__(self, usernames: List[str]) -> None:
+        self.usernames = usernames

{moira_python_client-4.3.0 → moira_python_client-4.3.2/moira_python_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: moira-python-client
-Version: 4.3.0
+Version: 4.3.2
 Summary: Client for Moira - Alerting system based on Graphite data
 Home-page: https://github.com/moira-alert/python-moira-client
 Author: Alexander Lukyanchenko
@@ -20,6 +20,14 @@ Classifier: Topic :: System :: Monitoring
 Classifier: License :: OSI Approved :: MIT License
 License-File: LICENSE
 Requires-Dist: requests>=2.4.3
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: requires-dist
+Dynamic: summary
 
 
         Moira is a real-time alerting tool, based on Graphite data.

{moira_python_client-4.3.0 → moira_python_client-4.3.2}/moira_python_client.egg-info/SOURCES.txt

@@ -22,6 +22,19 @@ moira_client/models/subscription.py
 moira_client/models/tag.py
 moira_client/models/trigger.py
 moira_client/models/user.py
+moira_client/models/team/__init__.py
+moira_client/models/team/_managers.py
+moira_client/models/team/_models.py
+moira_client/models/team/contact/__init__.py
+moira_client/models/team/contact/_managers.py
+moira_client/models/team/settings/__init__.py
+moira_client/models/team/settings/_managers.py
+moira_client/models/team/settings/_models.py
+moira_client/models/team/subscription/__init__.py
+moira_client/models/team/subscription/_managers.py
+moira_client/models/team/user/__init__.py
+moira_client/models/team/user/_managers.py
+moira_client/models/team/user/_models.py
 moira_python_client.egg-info/PKG-INFO
 moira_python_client.egg-info/SOURCES.txt
 moira_python_client.egg-info/dependency_links.txt

{moira_python_client-4.3.0 → moira_python_client-4.3.2}/setup.py

@@ -23,7 +23,12 @@ setup(
     author_email = 'al.lukyanchenko@gmail.com',
     packages=[
         'moira_client',
-        'moira_client.models'
+        'moira_client.models',
+        'moira_client.models.team',
+        'moira_client.models.team.contact',
+        'moira_client.models.team.settings',
+        'moira_client.models.team.subscription',
+        'moira_client.models.team.user',
     ],
     classifiers=[
         'Development Status :: 4 - Beta',

moira_python_client-4.3.0/VERSION.txt

@@ -1 +0,0 @@
-4.3.0