chore: merge upstream

.github/workflows/release.yml

@@ -58,21 +58,13 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v1
         with:
-          python-version: 3.9
-      - name: Install Poetry
-        uses: snok/[email protected]
-      - name: Cache Poetry virtualenv
-        uses: actions/cache@v1
-        id: cache
-        with:
-          path: ~/.virtualenvs
-          key: poetry-${{ hashFiles('**/poetry.lock') }}
-          restore-keys: |
-            poetry-${{ hashFiles('**/poetry.lock') }}
-      - name: Install Dependencies
-        run: poetry install
-        if: steps.cache.outputs.cache-hit != 'true'
-      - name: Build
-        run: poetry build
+          python-version: 3.11
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install poetry nox
       - name: Publish distribution 📦 to PyPI
-        run: poetry publish -u __token__ -p ${{ secrets.pypi_password }}
+        run: |
+          nox -rs release -- "$PYPI_PASSWORD"
+        env:
+          PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}

noxfile.py

@@ -146,6 +146,15 @@ def test_style(session: Session) -> None:
     session.run("interrogate", "pyarr")
 
 
+@nox.session(reuse_venv=True)
+def release(session: Session) -> None:
+    """Release a new version of the package"""
+    pypi_password = session.posargs[0]
+    session.run("poetry", "install", external=True)
+    session.run("poetry", "build", external=True)
+    session.run("poetry", "publish", "-u", "__token__", "-p", pypi_password)
+
+
 @nox.session(reuse_venv=True)
 def docs(session: Session) -> None:
     """Create local copy of docs for testing"""

pyarr/exceptions.py

@@ -40,3 +40,11 @@ class PyarrMissingArgument(PyarrError):
 
 class PyarrBadRequest(PyarrError):
     """Bad Request, possible bug."""
+
+
+class PyarrServerError(PyarrError):
+    """Server Error, missing or incorrect options."""
+
+    def __init__(self, message, response):
+        super().__init__(message)
+        self.response = response

pyarr/lidarr.py

@@ -235,8 +235,10 @@ def add_album(
         quality_profile_id: Optional[int] = None,
         metadata_profile_id: Optional[int] = None,
         monitored: bool = True,
+        artist_monitored: bool = True,
         artist_monitor: LidarrArtistMonitor = "all",
         artist_search_for_missing_albums: bool = False,
+        search_for_new_album: bool = False,
     ) -> JsonObject:
         """Adds an album to Lidarr
 
@@ -246,8 +248,10 @@ def add_album(
             quality_profile_id (Optional[int], optional): Quality profile ID. Defaults to None.
             metadata_profile_id (Optional[int], optional): Metadata profile ID. Defaults to None.
             monitored (bool, optional): Should the album be monitored. Defaults to True.
+            artist_monitored (bool, optional): Should the album be monitored. Defaults to True.
             artist_monitor (LidarrArtistMonitor, optional): What level to monitor the artist. Defaults to "all".
             artist_search_for_missing_albums (bool, optional): Search for any missing albums by this artist. Defaults to False.
+            search_for_new_album (bool, optional): Search for new albums by this artist. Defaults to False.
 
         Returns:
             JsonObject: Dictionary with added record
@@ -267,15 +271,18 @@ def add_album(
                     "There is no Metadata Profile setup"
                 ) from exception
 
-        album["id"] = 0
         album["artist"]["metadataProfileId"] = metadata_profile_id
         album["artist"]["qualityProfileId"] = quality_profile_id
         album["artist"]["rootFolderPath"] = root_dir
+        album["artist"]["monitored"] = artist_monitored
         album["artist"]["addOptions"] = {
             "monitor": artist_monitor,
             "searchForMissingAlbums": artist_search_for_missing_albums,
         }
         album["monitored"] = monitored
+        album["addOptions"] = {
+            "searchForNewAlbum": search_for_new_album,
+        }
         return self._post("album", self.ver_uri, data=album)
 
     def upd_album(self, data: JsonObject) -> JsonObject:

pyarr/request_handler.py

@@ -11,6 +11,7 @@
     PyarrConnectionError,
     PyarrMethodNotAllowed,
     PyarrResourceNotFound,
+    PyarrServerError,
     PyarrUnauthorizedError,
 )
 from .types import _ReturnType
@@ -241,11 +242,17 @@ def _process_response(
         )
     if res.status_code == 404:
         raise PyarrResourceNotFound("Resource not found")
-    if res.status_code == 502:
-        raise PyarrBadGateway("Bad Gateway. Check your server is accessible")
     if res.status_code == 405:
         raise PyarrMethodNotAllowed(f"The endpoint {res.url} is not allowed")
+    if res.status_code == 500:
+        raise PyarrServerError(
+            f"Internal Server Error: {res.json()['message']}",
+            res.json(),
+        )
+    if res.status_code == 502:
+        raise PyarrBadGateway("Bad Gateway. Check your server is accessible.")
 
+    print(res.status_code)
     content_type = res.headers.get("Content-Type", "")
     if "application/json" in content_type:
         return res.json()

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyarr"
-version = "4.2.0"
+version = "5.1.0"
 description = "Synchronous Sonarr, Radarr, Lidarr and Readarr API's for Python"
 authors = ["Steven Marks <[email protected]>"]
 license = "MIT"
@@ -18,6 +18,7 @@ classifiers = [
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
     "Topic :: Software Development :: Libraries :: Python Modules"
 ]
 packages = [
@@ -52,6 +53,7 @@ sphinx-toolbox = "^3.4.0"
 enum-tools = "^0.9.0.post1"
 pytest-rerunfailures = "^11.1.2"
 nox = "^2022.11.21"
+toml = "^0.10.2"
 
 [tool.black]
 line-length = 88

sphinx-docs/conf.py

@@ -4,6 +4,8 @@
 import re
 import sys
 
+import toml
+
 path = dirname(dirname(abspath(__file__)))
 sys.path.append(path)
 sys.path.append(join(path, "pyarr"))
@@ -13,8 +15,15 @@
 copyright = "2021, Steven Marks, TotalDebug"
 author = "Steven Marks, TotalDebug"
 
+
 # The short X.Y version
-version = "2.0"
+def get_version():
+    with open("../pyproject.toml") as f:
+        config = toml.load(f)
+    return config["tool"]["poetry"]["version"]
+
+
+version = get_version()
 # The full version, including alpha/beta/rc tags
 release = ""
 

sphinx-docs/requirements.txt

@@ -1 +1,3 @@
 sphinx_rtd_theme>=^1.2.0
+toml>=^0.10.2
+myst-parser>=^1.0.0

tests/test_lidarr.py

@@ -121,6 +121,28 @@ def test_add_album(lidarr_client: LidarrAPI):
             assert False
 
     assert isinstance(data, dict)
+    assert data["title"] == "Wicked Words & Epic Tales: A Narrative Landscape"
+
+    items = lidarr_client.lookup(LIDARR_ALBUM_TERM)
+
+    for item in items:
+        if "album" in item:
+            album = item["album"]
+            data = lidarr_client.add_album(
+                album=album,
+                root_dir="/defaults/",
+                quality_profile_id=qual_profile[0]["id"],
+                metadata_profile_id=meta_profile[0]["id"],
+                monitored=False,
+                artist_monitor="latest",
+                artist_search_for_missing_albums=False,
+            )
+            break
+        if item == items[-1]:
+            assert False
+
+    assert isinstance(data, dict)
+    assert data["title"] == "DAWN"
 
 
 def test_upd_album(lidarr_client: LidarrAPI):