pyzotero 1.6.6__tar.gz → 1.6.7__tar.gz

{pyzotero-1.6.6 → pyzotero-1.6.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pyzotero
-Version: 1.6.6
+Version: 1.6.7
 Summary: Python wrapper for the Zotero API
 Author-email: Stephan Hügel <urschrei@gmail.com>
 License: # Blue Oak Model License
@@ -63,6 +63,7 @@ Requires-Dist: feedparser>=6.0.11
 Requires-Dist: pytz
 Requires-Dist: bibtexparser
 Requires-Dist: httpx>=0.28.1
+Requires-Dist: httpx-file>=0.2.0
 Provides-Extra: test
 Requires-Dist: pytest>=7.4.2; extra == "test"
 Requires-Dist: httpretty; extra == "test"

{pyzotero-1.6.6 → pyzotero-1.6.7}/pyproject.toml

@@ -8,6 +8,7 @@ dependencies = [
     "pytz",
     "bibtexparser",
     "httpx>=0.28.1",
+    "httpx-file>=0.2.0",
 ]
 authors = [{ name = "Stephan Hügel", email = "urschrei@gmail.com" }]
 license = {file = "LICENSE.md"}

{pyzotero-1.6.6 → pyzotero-1.6.7}/src/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.6.6'
-__version_tuple__ = version_tuple = (1, 6, 6)
+__version__ = version = '1.6.7'
+__version_tuple__ = version_tuple = (1, 6, 7)

{pyzotero-1.6.6 → pyzotero-1.6.7}/src/pyzotero/zotero.py

@@ -40,6 +40,7 @@ import feedparser
 import httpx
 import pytz
 from httpx import Request
+from httpx_file import Client as File_Client
 
 import pyzotero as pz
 
@@ -190,38 +191,9 @@ def retrieve(func):
             and self.content.search(str(self.request.url)).group(0)
             or "bib"
         )
-        # JSON by default
-        formats = {
-            "application/atom+xml": "atom",
-            "application/x-bibtex": "bibtex",
-            "application/json": "json",
-            "text/html": "snapshot",
-            "text/plain": "plain",
-            "application/pdf; charset=utf-8": "pdf",
-            "application/pdf": "pdf",
-            "application/msword": "doc",
-            "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": "xlsx",
-            "application/vnd.openxmlformats-officedocument.wordprocessingml.document": "docx",
-            "application/vnd.openxmlformats-officedocument.presentationml.presentation": "pptx",
-            "application/zip": "zip",
-            "application/epub+zip": "zip",
-            "audio/mpeg": "mp3",
-            "video/mp4": "mp4",
-            "audio/x-wav": "wav",
-            "video/x-msvideo": "avi",
-            "application/octet-stream": "octet",
-            "application/x-tex": "tex",
-            "application/x-texinfo": "texinfo",
-            "image/jpeg": "jpeg",
-            "image/png": "png",
-            "image/gif": "gif",
-            "image/tiff": "tiff",
-            "application/postscript": "postscript",
-            "application/rtf": "rtf",
-        }
         # select format, or assume JSON
         content_type_header = self.request.headers["Content-Type"].lower() + ";"
-        fmt = formats.get(
+        fmt = self.formats.get(
             # strip "; charset=..." segment
             content_type_header[0 : content_type_header.index(";")],
             "json",
@@ -321,12 +293,44 @@ class Zotero:
         self.tag_data = False
         self.request = None
         self.snapshot = False
-        self.client = httpx.Client(headers=self.default_headers())
+        self.client = httpx.Client(
+            headers=self.default_headers(), follow_redirects=True
+        )
         # these aren't valid item fields, so never send them to the server
         self.temp_keys = set(["key", "etag", "group_id", "updated"])
         # determine which processor to use for the parsed content
         self.fmt = re.compile(r"(?<=format=)\w+")
         self.content = re.compile(r"(?<=content=)\w+")
+        # JSON by default
+        self.formats = {
+            "application/atom+xml": "atom",
+            "application/x-bibtex": "bibtex",
+            "application/json": "json",
+            "text/html": "snapshot",
+            "text/plain": "plain",
+            "text/markdown": "plain",
+            "application/pdf; charset=utf-8": "pdf",
+            "application/pdf": "pdf",
+            "application/msword": "doc",
+            "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": "xlsx",
+            "application/vnd.openxmlformats-officedocument.wordprocessingml.document": "docx",
+            "application/vnd.openxmlformats-officedocument.presentationml.presentation": "pptx",
+            "application/zip": "zip",
+            "application/epub+zip": "zip",
+            "audio/mpeg": "mp3",
+            "video/mp4": "mp4",
+            "audio/x-wav": "wav",
+            "video/x-msvideo": "avi",
+            "application/octet-stream": "octet",
+            "application/x-tex": "tex",
+            "application/x-texinfo": "texinfo",
+            "image/jpeg": "jpeg",
+            "image/png": "png",
+            "image/gif": "gif",
+            "image/tiff": "tiff",
+            "application/postscript": "postscript",
+            "application/rtf": "rtf",
+        }
         self.processors = {
             "bib": self._bib_processor,
             "citation": self._citation_processor,
@@ -479,13 +483,28 @@ class Zotero:
         # Unfortunately, httpx doesn't like to merge query paramaters in the url string and passed params
         # so we strip the url params, combining them with our existing url_params
         final_url, final_params = merge_params(full_url, merged_params)
-        self.request = self.client.get(
-            url=final_url,
-            params=final_params,
-            headers=self.default_headers(),
-            timeout=timeout,
-        )
-        self.request.encoding = "utf-8"
+        # file URI errors are raised immediately so we have to try here
+        try:
+            self.request = self.client.get(
+                url=final_url,
+                params=final_params,
+                headers=self.default_headers(),
+                timeout=timeout,
+            )
+            self.request.encoding = "utf-8"
+        except httpx.UnsupportedProtocol:
+            # File URI handler logic
+            fc = File_Client()
+            request = fc.get(
+                url=final_url,
+                params=final_params,
+                headers=self.default_headers(),
+                timeout=timeout,
+                follow_redirects=True,
+            )
+            self.request = request
+            # since we'll be writing bytes, we need to set this to a type that will trigger the bytes processor
+            self.request.headers["Content-Type"] = "text/plain"
         try:
             self.request.raise_for_status()
         except httpx.HTTPError as exc:

{pyzotero-1.6.6 → pyzotero-1.6.7}/src/pyzotero.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pyzotero
-Version: 1.6.6
+Version: 1.6.7
 Summary: Python wrapper for the Zotero API
 Author-email: Stephan Hügel <urschrei@gmail.com>
 License: # Blue Oak Model License
@@ -63,6 +63,7 @@ Requires-Dist: feedparser>=6.0.11
 Requires-Dist: pytz
 Requires-Dist: bibtexparser
 Requires-Dist: httpx>=0.28.1
+Requires-Dist: httpx-file>=0.2.0
 Provides-Extra: test
 Requires-Dist: pytest>=7.4.2; extra == "test"
 Requires-Dist: httpretty; extra == "test"

{pyzotero-1.6.6 → pyzotero-1.6.7}/src/pyzotero.egg-info/requires.txt

@@ -2,6 +2,7 @@ feedparser>=6.0.11
 pytz
 bibtexparser
 httpx>=0.28.1
+httpx-file>=0.2.0
 
 [test]
 pytest>=7.4.2

{pyzotero-1.6.6 → pyzotero-1.6.7}/uv.lock

@@ -1,6 +1,15 @@
 version = 1
 requires-python = ">=3.9"
 
+[[package]]
+name = "aiofiles"
+version = "24.1.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/0b/03/a88171e277e8caa88a4c77808c20ebb04ba74cc4681bf1e9416c862de237/aiofiles-24.1.0.tar.gz", hash = "sha256:22a075c9e5a3810f0c2e48f3008c94d68c65d763b9b03857924c99e57355166c", size = 30247 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/a5/45/30bb92d442636f570cb5651bc661f52b610e2eec3f891a5dc3a4c3667db0/aiofiles-24.1.0-py3-none-any.whl", hash = "sha256:b4ec55f4195e3eb5d7abd1bf7e061763e864dd4954231fb8539a0ef8bb8260e5", size = 15896 },
+]
+
 [[package]]
 name = "anyio"
 version = "4.5.2"
@@ -152,6 +161,19 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/2a/39/e50c7c3a983047577ee07d2a9e53faf5a69493943ec3f6a384bdc792deb2/httpx-0.28.1-py3-none-any.whl", hash = "sha256:d909fcccc110f8c7faf814ca82a9a4d816bc5a6dbfea25d6591d6985b8ba59ad", size = 73517 },
 ]
 
+[[package]]
+name = "httpx-file"
+version = "0.2.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "aiofiles" },
+    { name = "httpx" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/b4/f7/737dbfaa3b3288ce69f75fad9a4cd22cae60d71763618ddd849018895172/httpx-file-0.2.0.tar.gz", hash = "sha256:a00f1dd02c9ffb5e7e072205c30f7ae0d867c397318b045a40b3268f2cdfa932", size = 4250 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/f4/9c/4f3fba4c1b5a8919c3f6d407a41df43980c6a03a631d49f458b9546da128/httpx_file-0.2.0-py3-none-any.whl", hash = "sha256:9a425b351bf65aa394c02096204dc3fa8b647573a289079f927d3e3abfa3c7c8", size = 4471 },
+]
+
 [[package]]
 name = "idna"
 version = "3.10"
@@ -359,6 +381,7 @@ dependencies = [
     { name = "bibtexparser" },
     { name = "feedparser" },
     { name = "httpx" },
+    { name = "httpx-file" },
     { name = "pytz" },
 ]
 
@@ -376,6 +399,7 @@ requires-dist = [
     { name = "feedparser", specifier = ">=6.0.11" },
     { name = "httpretty", marker = "extra == 'test'" },
     { name = "httpx", specifier = ">=0.28.1" },
+    { name = "httpx-file", specifier = ">=0.2.0" },
     { name = "ipython", marker = "extra == 'test'" },
     { name = "pytest", marker = "extra == 'test'", specifier = ">=7.4.2" },
     { name = "python-dateutil", marker = "extra == 'test'" },