glpi-api 0.5.0__py3-none-any.whl → 0.7.0__py3-none-any.whl

{glpi_api-0.5.0.dist-info → glpi_api-0.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: glpi-api
-Version: 0.5.0
+Version: 0.7.0
 Summary: Wrap calls to GLPI REST API.
 Home-page: https://github.com/unistra/python-glpi-api
 Author: François Ménabé
@@ -12,6 +12,15 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Programming Language :: Python :: 3
 License-File: LICENSE
 Requires-Dist: requests
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: summary
 
 ********
 glpi-api

glpi_api-0.7.0.dist-info/RECORD

@@ -0,0 +1,6 @@
+glpi_api.py,sha256=TR4bfSklkoRAvjqvYttYDj9vBR9ZrvyZALc6ozq5rwY,36738
+glpi_api-0.7.0.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+glpi_api-0.7.0.dist-info/METADATA,sha256=1E-nF1eqvqX50A57_D0jY1nFbqq7kwx2u_UkQr0W1Gs,833
+glpi_api-0.7.0.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+glpi_api-0.7.0.dist-info/top_level.txt,sha256=YOkX5fKd6VWRx_-iMUfVJN15Xobw1VQ-mUF8HKWK2l0,9
+glpi_api-0.7.0.dist-info/RECORD,,

{glpi_api-0.5.0.dist-info → glpi_api-0.7.0.dist-info}/WHEEL

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

glpi_api.py

@@ -33,7 +33,7 @@ class GLPIError(Exception):
     """Exception raised by this module."""
 
 @contextmanager
-def connect(url, apptoken, auth, verify_certs=True, use_headers=True):
+def connect(url, apptoken, auth, verify_certs=True, use_headers=True, user_agent=None):
     """Context manager that authenticate to GLPI when enter and kill application
     session in GLPI when leaving:
 
@@ -127,7 +127,8 @@ class GLPI:
     SSL certificates and passing authentication parameters as GET parameters
     (instead of headers).
     """
-    def __init__(self, url, apptoken, auth, verify_certs=True, use_headers=True):
+    def __init__(self, url, apptoken, auth, verify_certs=True, use_headers=True,
+                 user_agent=None):
         """Connect to GLPI and retrieve session token which is put in a
         ``requests`` session as attribute.
         """
@@ -141,14 +142,18 @@ class GLPI:
             self.session.verify = False
 
         # Connect and retrieve token.
-        session_token = self._init_session(apptoken, auth, use_headers=use_headers)
+        session_token = self._init_session(apptoken, auth, user_agent,
+                                           use_headers=use_headers)
 
         # Set required headers.
-        self.session.headers = {
+        headers = {
             'Content-Type': 'application/json',
             'Session-Token': session_token,
             'App-Token': apptoken
         }
+        if user_agent:
+            headers['User-Agent'] = user_agent
+        self.session.headers = headers
 
         # Use for caching field id/uid map.
         self._fields = {}
@@ -158,7 +163,7 @@ class GLPI:
         return '/'.join(str(part) for part in [self.url.strip('/'), *endpoints])
 
     @_catch_errors
-    def _init_session(self, apptoken, auth, use_headers=True):
+    def _init_session(self, apptoken, auth, user_agent, use_headers=True):
         """API documentation
         <https://github.com/glpi-project/glpi/blob/master/apirest.md#init-session>`__
 
@@ -170,6 +175,8 @@ class GLPI:
             'Content-Type': 'application/json',
             'App-Token': apptoken
         }
+        if user_agent:
+            init_headers['User-Agent'] = user_agent
         params = {}
 
         if isinstance(auth, (list, tuple)):
@@ -507,7 +514,7 @@ class GLPI:
         }.get(response.status_code, _unknown_error)(response)
 
     @_catch_errors
-    def get_multiple_items(self, *items):
+    def get_multiple_items(self, *items, **kwargs):
         """`API documentation
         <https://github.com/glpi-project/glpi/blob/master/apirest.md#get-multiple-items>`__
 
@@ -531,8 +538,10 @@ class GLPI:
                     for idx, item in enumerate(items)
                     for key, value in item.items()}
 
+        params = _convert_bools(kwargs)
+        params.update(format_items(items))
         response = self.session.get(self._set_method('getMultipleItems'),
-                                    params=format_items(items))
+                                    params=params)
         return {
             200: lambda r: r.json(),
             400: _glpi_error,
@@ -728,7 +737,7 @@ class GLPI:
             400: _glpi_error,
             401: _glpi_error
         }.get(response.status_code, _unknown_error)(response)
-    
+
     @_catch_errors
     def add_sub_items(self, itemtype, item_id, sub_itemtype, *items):
         """`API documentation
@@ -783,11 +792,11 @@ class GLPI:
             400: _glpi_error,
             401: _glpi_error
         }.get(response.status_code, _unknown_error)(response)
-    
+
     @_catch_errors
     def update_sub_items(self, itemtype, item_id, sub_itemtype, *items):
         """`API documentation
-        Same method used as get-sub-items, same parameters 
+        Same method used as get-sub-items, same parameters
         <https://github.com/glpi-project/glpi/blob/master/apirest.md#get-sub-items>`__
 
         Updates a collection of rows of the ``sub_itemtype`` for the identified
@@ -843,11 +852,11 @@ class GLPI:
             400: lambda r: _glpi_error(r) if r.json()[0] != 'ERROR_GLPI_DELETE' else r.json()[1],
             401: _glpi_error
         }.get(response.status_code, _unknown_error)(response)
-    
+
     @_catch_errors
     def delete_sub_items(self, itemtype, item_id, sub_itemtype, *items):
         """`API documentation
-        Same method used as get-sub-items, same parameters 
+        Same method used as get-sub-items, same parameters
         <https://github.com/glpi-project/glpi/blob/master/apirest.md#get-sub-items>`__
 
         deletes a collection of rows of the ``sub_itemtype`` for the identified
@@ -895,12 +904,9 @@ class GLPI:
         be deleted for some reasons) and purge the created but incomplete document.
         """
         with open(filepath, 'rb') as fhandler:
-            response = requests.post(
+            response = self.session.post(
                 url=self._set_method('Document'),
-                headers={
-                    'Session-Token': self.session.headers['Session-Token'],
-                    'App-Token': self.session.headers['App-Token']
-                },
+                headers={'Content-Type': None},
                 files={
                     'uploadManifest': (
                         None,

glpi_api-0.5.0.dist-info/RECORD

@@ -1,6 +0,0 @@
-glpi_api.py,sha256=5VhHjOPxBnobuGpTjFEeQwcnlaAL7QmemR74EYEXN10,36519
-glpi_api-0.5.0.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-glpi_api-0.5.0.dist-info/METADATA,sha256=OBZNx2L3e9MEb6S36g6zkrbqaZCCbRSPh6CIPmhKgNo,660
-glpi_api-0.5.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-glpi_api-0.5.0.dist-info/top_level.txt,sha256=YOkX5fKd6VWRx_-iMUfVJN15Xobw1VQ-mUF8HKWK2l0,9
-glpi_api-0.5.0.dist-info/RECORD,,