pyzotero 1.6.2__py3-none-any.whl → 1.6.4__py3-none-any.whl

_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.6.2'
-__version_tuple__ = version_tuple = (1, 6, 2)
+__version__ = version = '1.6.4'
+__version_tuple__ = version_tuple = (1, 6, 4)

pyzotero/zotero.py

@@ -62,6 +62,23 @@ def build_url(base_url, path, args_dict=None):
     return urlunparse(url_parts)
 
 
+def merge_params(url, params):
+    """This function strips query parameters, extracting them into a dict, then merging it with
+    the "params" dict, returning the truncated url and merged query params dict"""
+    parsed = urlparse(url)
+    # Extract query parameters from URL
+    incoming = parse_qs(parsed.query)
+    incoming = {k: v[0] for k, v in incoming.items()}
+
+    # Create new params dict by merging
+    merged = {**incoming, **params}
+
+    # Get base URL by zeroing out the query component
+    base_url = urlunparse(parsed._replace(query=""))
+
+    return base_url, merged
+
+
 def token():
     """Return a unique 32-char write-token"""
     return str(uuid.uuid4().hex)
@@ -458,7 +475,16 @@ class Zotero:
         if not self.url_params:
             self.url_params = {}
         merged_params = params | self.url_params
-        self.request = self.client.get(url=full_url, params=merged_params)
+        # our incoming url might be from the "links" dict, in which case it will contain url parameters.
+        # 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"
         try:
             self.request.raise_for_status()
@@ -660,7 +686,7 @@ class Zotero:
                 ),
             ),
             headers=headers,
-            content=json.dumps(payload),
+            data=json.dumps(payload),
         )
 
     def new_fulltext(self, since):
@@ -894,7 +920,6 @@ class Zotero:
         """Return the result of the call to the URL in the 'Next' link"""
         if n := self.links.get("next"):
             newurl = self._striplocal(n)
-            print(newurl)
             return newurl
         return
 
@@ -1022,7 +1047,7 @@ class Zotero:
         linked_file
         linked_url
         """
-        return self.item_template("attachment&linkMode=" + attachment_type)
+        return self.item_template("attachment", linkmode=attachment_type)
 
     def _attachment(self, payload, parentid=None):
         """
@@ -1072,7 +1097,7 @@ class Zotero:
                 "/{t}/{u}/searches".format(t=self.library_type, u=self.library_id),
             ),
             headers=headers,
-            content=json.dumps(payload),
+            data=json.dumps(payload),
         )
         self.request = req
         try:
@@ -1274,7 +1299,7 @@ class Zotero:
                 self.endpoint,
                 "/{t}/{u}/items".format(t=self.library_type, u=self.library_id),
             ),
-            content=to_send,
+            data=to_send,
             headers=dict(headers),
         )
         self.request = req
@@ -1305,7 +1330,7 @@ class Zotero:
                             t=self.library_type, u=self.library_id, v=value
                         ),
                     ),
-                    content=payload,
+                    data=payload,
                     headers=dict(uheaders),
                 )
                 self.request = presp
@@ -1349,7 +1374,7 @@ class Zotero:
                 "/{t}/{u}/collections".format(t=self.library_type, u=self.library_id),
             ),
             headers=headers,
-            content=json.dumps(payload),
+            data=json.dumps(payload),
         )
         self.request = req
         try:
@@ -1382,7 +1407,7 @@ class Zotero:
                 ),
             ),
             headers=headers,
-            content=json.dumps(payload),
+            data=json.dumps(payload),
         )
 
     def attachment_simple(self, files, parentid=None):
@@ -1440,7 +1465,7 @@ class Zotero:
                 ),
             ),
             headers=headers,
-            content=json.dumps(to_send),
+            data=json.dumps(to_send),
         )
 
     def update_items(self, payload):
@@ -1458,7 +1483,7 @@ class Zotero:
                     self.endpoint,
                     "/{t}/{u}/items/".format(t=self.library_type, u=self.library_id),
                 ),
-                content=json.dumps(chunk),
+                data=json.dumps(chunk),
             )
             self.request = req
             try:
@@ -1487,7 +1512,7 @@ class Zotero:
                         t=self.library_type, u=self.library_id
                     ),
                 ),
-                content=json.dumps(chunk),
+                data=json.dumps(chunk),
             )
             self.request = req
             try:
@@ -1518,7 +1543,7 @@ class Zotero:
                     t=self.library_type, u=self.library_id, i=ident
                 ),
             ),
-            content=json.dumps({"collections": modified_collections}),
+            data=json.dumps({"collections": modified_collections}),
             headers=headers,
         )
 
@@ -1543,7 +1568,7 @@ class Zotero:
                     t=self.library_type, u=self.library_id, i=ident
                 ),
             ),
-            content=json.dumps({"collections": modified_collections}),
+            data=json.dumps({"collections": modified_collections}),
             headers=headers,
         )
 
@@ -1907,14 +1932,14 @@ class Zupload:
                 child["parentItem"] = self.parentid
         to_send = json.dumps(self.payload)
         self.zinstance._check_backoff()
-        req = self.client.post(
+        req = self.zinstance.client.post(
             url=build_url(
                 self.zinstance.endpoint,
                 liblevel.format(
                     t=self.zinstance.library_type, u=self.zinstance.library_id
                 ),
             ),
-            content=to_send,
+            data=to_send,
             headers=headers,
         )
         try:
@@ -1963,7 +1988,7 @@ class Zupload:
                     i=reg_key,
                 ),
             ),
-            content=data,
+            data=data,
             headers=auth_headers,
         )
         try:
@@ -2027,7 +2052,7 @@ class Zupload:
                     i=reg_key,
                 ),
             ),
-            content=reg_data,
+            data=reg_data,
             headers=dict(reg_headers),
         )
         try:

{pyzotero-1.6.2.dist-info → pyzotero-1.6.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyzotero
-Version: 1.6.2
+Version: 1.6.4
 Summary: Python wrapper for the Zotero API
 Author-email: Stephan Hügel <urschrei@gmail.com>
 License: # Blue Oak Model License
@@ -43,11 +43,11 @@ Project-URL: Repository, https://github.com/urschrei/pyzotero
 Project-URL: Tracker, https://github.com/urschrei/pyzotero/issues
 Keywords: Zotero,DH
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
@@ -55,7 +55,7 @@ Classifier: Intended Audience :: Education
 Classifier: License :: OSI Approved :: Blue Oak Model License (BlueOak-1.0.0)
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
 License-File: AUTHORS

pyzotero-1.6.4.dist-info/RECORD

@@ -0,0 +1,10 @@
+_version.py,sha256=nUUf9xc-xNn7sMTK7c2rpMt1p2OZlNNmLiVGIkTETu8,411
+pyzotero/__init__.py,sha256=5QI4Jou9L-YJAf_oN9TgRXVKgt_Unc39oADo2Ch8bLI,243
+pyzotero/zotero.py,sha256=bPWHCgUbom96ijwM-ImEMtN91A6YajlmZHyx4I8GYPU,76374
+pyzotero/zotero_errors.py,sha256=UPhAmf2K05cnoeIl2wjufWQedepg7vBKb-ShU0TdlL4,2582
+pyzotero-1.6.4.dist-info/AUTHORS,sha256=ZMicxg7lRScOYbxzMPznlzMbmrFIUIHwg-NvljEMbRQ,110
+pyzotero-1.6.4.dist-info/LICENSE.md,sha256=bhy1CPMj1zWffD9YifFmSeBzPylsrhb1qP8OCEx5Etw,1550
+pyzotero-1.6.4.dist-info/METADATA,sha256=Lft4hiPbO-zeImbXKm38aBGcxo2DnU6ue36j5UAwpN4,7290
+pyzotero-1.6.4.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
+pyzotero-1.6.4.dist-info/top_level.txt,sha256=BOPNkPk5VtNDCy_li7Xftx6k0zG8STGxh-KgckcxLEw,18
+pyzotero-1.6.4.dist-info/RECORD,,

{pyzotero-1.6.2.dist-info → pyzotero-1.6.4.dist-info}/WHEEL

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

pyzotero-1.6.2.dist-info/RECORD

@@ -1,10 +0,0 @@
-_version.py,sha256=ay9A4GSmtr3NioHirRgXvWfXtjwRjzXIO_WPuFobCoI,411
-pyzotero/__init__.py,sha256=5QI4Jou9L-YJAf_oN9TgRXVKgt_Unc39oADo2Ch8bLI,243
-pyzotero/zotero.py,sha256=jnfqgwbn2nMxUnUNG98dm--AlE6CaLyJCuOizXOvJz4,75376
-pyzotero/zotero_errors.py,sha256=UPhAmf2K05cnoeIl2wjufWQedepg7vBKb-ShU0TdlL4,2582
-pyzotero-1.6.2.dist-info/AUTHORS,sha256=ZMicxg7lRScOYbxzMPznlzMbmrFIUIHwg-NvljEMbRQ,110
-pyzotero-1.6.2.dist-info/LICENSE.md,sha256=bhy1CPMj1zWffD9YifFmSeBzPylsrhb1qP8OCEx5Etw,1550
-pyzotero-1.6.2.dist-info/METADATA,sha256=aFEP8H1c0A7W75pQO_qBh6HNNcqDmnlRZ47llubffwc,7289
-pyzotero-1.6.2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-pyzotero-1.6.2.dist-info/top_level.txt,sha256=BOPNkPk5VtNDCy_li7Xftx6k0zG8STGxh-KgckcxLEw,18
-pyzotero-1.6.2.dist-info/RECORD,,