PyOdoo 0.8.1__tar.gz → 0.9.0__tar.gz

{pyodoo-0.8.1 → pyodoo-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyOdoo
-Version: 0.8.1
+Version: 0.9.0
 Summary: API for Odoo
 Author-email: Fabio Castelli <muflone@muflone.com>
 License-Expression: GPL-3.0-or-later
@@ -56,6 +56,7 @@ its APIs.
 Currently the following implementations are provided:
 - XML-RPC
 - JSON-RPC
+- WEB-RPC
 
 # System Requirements
 
@@ -67,4 +68,4 @@ Currently the following implementations are provided:
 
 Please see the **samples** and the **tests** folders for some usage examples.
 
-Examples and documentation is available at <http://www.muflone.com/pyodoo/>
+Examples and documentation are available at <http://www.muflone.com/pyodoo/>

{pyodoo-0.8.1 → pyodoo-0.9.0}/PyOdoo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyOdoo
-Version: 0.8.1
+Version: 0.9.0
 Summary: API for Odoo
 Author-email: Fabio Castelli <muflone@muflone.com>
 License-Expression: GPL-3.0-or-later
@@ -56,6 +56,7 @@ its APIs.
 Currently the following implementations are provided:
 - XML-RPC
 - JSON-RPC
+- WEB-RPC
 
 # System Requirements
 
@@ -67,4 +68,4 @@ Currently the following implementations are provided:
 
 Please see the **samples** and the **tests** folders for some usage examples.
 
-Examples and documentation is available at <http://www.muflone.com/pyodoo/>
+Examples and documentation are available at <http://www.muflone.com/pyodoo/>

{pyodoo-0.8.1 → pyodoo-0.9.0}/README.md

@@ -29,6 +29,7 @@ its APIs.
 Currently the following implementations are provided:
 - XML-RPC
 - JSON-RPC
+- WEB-RPC
 
 # System Requirements
 
@@ -40,4 +41,4 @@ Currently the following implementations are provided:
 
 Please see the **samples** and the **tests** folders for some usage examples.
 
-Examples and documentation is available at <http://www.muflone.com/pyodoo/>
+Examples and documentation are available at <http://www.muflone.com/pyodoo/>

{pyodoo-0.8.1 → pyodoo-0.9.0}/pyodoo/api.py

@@ -60,7 +60,8 @@ class Api(object):
         if self.endpoint.endswith('/'):
             self.endpoint = self.endpoint[:-1]
         # Specific implementations
-        if implementation == Implementation.JSONRPC:
+        if implementation in (Implementation.JSONRPC,
+                              Implementation.WEBRPC):
             self.session = requests.Session()
 
     def authenticate(self
@@ -98,6 +99,22 @@ class Api(object):
                 timeout=self.timeout)
             result = response.json() if response else None
             self.uid = result['result'] if result else None
+        elif self.implementation == Implementation.WEBRPC:
+            # Authentication for WEB-RPC
+            response = self.session.post(
+                url=self.build_endpoint(method='web/session/authenticate'),
+                json={
+                    'jsonrpc': '2.0',
+                    'method': 'call',
+                    'params': {
+                        'db': self.database,
+                        'login': self.username,
+                        'password': self.password
+                    }
+                },
+                timeout=self.timeout)
+            result = response.json() if response else None
+            self.uid = result['result']['uid'] if result else None
         else:
             # Invalid implementation
             raise ValueError(f'Invalid implementation {self.implementation}')
@@ -209,6 +226,24 @@ class Api(object):
                 },
                 timeout=self.timeout
             ).json().get('result')
+        elif self.implementation == Implementation.WEBRPC:
+            # Execute for WEB-RPC
+            results = self.session.post(
+                url=self.build_endpoint(method='web/dataset/call_kw/'
+                                               f'{self.model_name}/'
+                                               f'{method_name}'),
+                json={
+                    'jsonrpc': '2.0',
+                    'method': 'call',
+                    'params': {
+                        'model': self.model_name,
+                        'method': method_name,
+                        'args': args,
+                        'kwargs': kwargs
+                    }
+                },
+                timeout=self.timeout
+            ).json().get('result')
         else:
             # Invalid implementation
             raise ValueError(f'Invalid implementation {self.implementation}')

{pyodoo-0.8.1 → pyodoo-0.9.0}/pyodoo/constants.py

@@ -19,7 +19,7 @@
 ##
 
 APP_NAME = 'PyOdoo'
-APP_VERSION = '0.8.1'
+APP_VERSION = '0.9.0'
 APP_DESCRIPTION = 'API for Odoo'
 APP_DOMAIN = 'pyodoo'
 APP_ID = f'{APP_DOMAIN}.muflone.com'

{pyodoo-0.8.1 → pyodoo-0.9.0}/pyodoo/implementation.py

@@ -24,3 +24,4 @@ class Implementation(object):
     """
     XMLRPC = 'xmlrpc'
     JSONRPC = 'jsonrpc'
+    WEBRPC = 'webrpc'

{pyodoo-0.8.1 → pyodoo-0.9.0}/pyodoo/model.py

@@ -269,6 +269,10 @@ class Model(object):
         if not authenticate and use_existing_uid:
             # Use the existing UID
             model.api.uid = self.api.uid
+            if model.api.implementation in (Implementation.JSONRPC,
+                                            Implementation.WEBRPC):
+                # Use the same session
+                model.api.session = self.api.session
         return model
 
     @_ignore_none_errors

{pyodoo-0.8.1 → pyodoo-0.9.0}/tests/test_compare_types.py

@@ -56,8 +56,8 @@ class BaseTests():
         results = self.model.search(filters=filters)
         # Check if the results are not None
         self.assertIsNotNone(results)
-        # Check if the results list has exactly three items
-        self.assertEqual(len(results), 3)
+        # Check if the results list has at least one item
+        self.assertGreaterEqual(len(results), 1)
         # Check if the results list doesn't contain the Office Chair Black
         self.assertNotIn(17, results)
 
@@ -75,8 +75,8 @@ class BaseTests():
         results = self.model.search(filters=filters)
         # Check if the results are not None
         self.assertIsNotNone(results)
-        # Check if the results list has exactly two items
-        self.assertEqual(len(results), 2)
+        # Check if the results list has at least one item
+        self.assertGreaterEqual(len(results), 1)
         # Check if the results list doesn't contain the Office Chair Black
         self.assertNotIn(17, results)
 
@@ -94,8 +94,8 @@ class BaseTests():
         results = self.model.search(filters=filters)
         # Check if the results are not None
         self.assertIsNotNone(results)
-        # Check if the results list has exactly three items
-        self.assertEqual(len(results), 3)
+        # Check if the results list has at least one item
+        self.assertGreaterEqual(len(results), 1)
         # Check if the results list contains the Office Chair Black
         self.assertIn(17, results)
 
@@ -113,8 +113,8 @@ class BaseTests():
         results = self.model.search(filters=filters)
         # Check if the results are not None
         self.assertIsNotNone(results)
-        # Check if the results list has exactly one item
-        self.assertEqual(len(results), 1)
+        # Check if the results list has at least one item
+        self.assertGreaterEqual(len(results), 1)
         # Check if the results list doesn't contain the Office Chair Black
         self.assertNotIn(17, results)
 
@@ -132,8 +132,8 @@ class BaseTests():
         results = self.model.search(filters=filters)
         # Check if the results are not None
         self.assertIsNotNone(results)
-        # Check if the results list has exactly two items
-        self.assertEqual(len(results), 2)
+        # Check if the results list has at least one item
+        self.assertGreaterEqual(len(results), 1)
         # Check if the results list contains the Office Chair Black
         self.assertIn(17, results)
 
@@ -152,8 +152,8 @@ class BaseTests():
         results = self.model.search(filters=filters)
         # Check if the results are not None
         self.assertIsNotNone(results)
-        # Check if the results list has exactly two items
-        self.assertEqual(len(results), 2)
+        # Check if the results list has at least one item
+        self.assertGreaterEqual(len(results), 1)
         # Check if the results list contains the Office Design Software
         self.assertIn(7, results)
         # Check if the results list contains the Office Chair Black
@@ -174,8 +174,8 @@ class BaseTests():
         results = self.model.search(filters=filters)
         # Check if the results are not None
         self.assertIsNotNone(results)
-        # Check if the results list has exactly two items
-        self.assertEqual(len(results), 2)
+        # Check if the results list has at least one item
+        self.assertGreaterEqual(len(results), 1)
         # Check if the results list doesn't contain the Office Design Software
         self.assertNotIn(7, results)
         # Check if the results list doesn't contain the Office Chair Black
@@ -192,8 +192,8 @@ class BaseTests():
         results = self.model.search(filters=filters)
         # Check if the results are not None
         self.assertIsNotNone(results)
-        # Check if the results list has exactly four items
-        self.assertEqual(len(results), 4)
+        # Check if the results list has at least one item
+        self.assertGreaterEqual(len(results), 1)
         # Check if the results list contains the Office Chair Black
         self.assertIn(17, results)
 
@@ -211,8 +211,8 @@ class BaseTests():
         results = self.model.search(filters=filters)
         # Check if the results are not None
         self.assertIsNotNone(results)
-        # Check if the results list has exactly three items
-        self.assertEqual(len(results), 3)
+        # Check if the results list has at least one item
+        self.assertGreaterEqual(len(results), 1)
         # Check if the results list doesn't contain the Office Chair Black
         self.assertNotIn(17, results)
 
@@ -230,8 +230,8 @@ class BaseTests():
         results = self.model.search(filters=filters)
         # Check if the results are not None
         self.assertIsNotNone(results)
-        # Check if the results list has exactly three items
-        self.assertEqual(len(results), 3)
+        # Check if the results list has at least one item
+        self.assertGreaterEqual(len(results), 1)
         # Check if the results list doesn't contain the Office Chair Black
         self.assertNotIn(17, results)
 
@@ -249,8 +249,8 @@ class BaseTests():
         results = self.model.search(filters=filters)
         # Check if the results are not None
         self.assertIsNotNone(results)
-        # Check if the results list has exactly one item
-        self.assertEqual(len(results), 1)
+        # Check if the results list has at least one item
+        self.assertGreaterEqual(len(results), 1)
         # Check if the results list contains the Office Chair Black
         self.assertIn(17, results)
 
@@ -268,8 +268,8 @@ class BaseTests():
         results = self.model.search(filters=filters)
         # Check if the results are not None
         self.assertIsNotNone(results)
-        # Check if the results list has exactly three items
-        self.assertEqual(len(results), 3)
+        # Check if the results list has at least one item
+        self.assertGreaterEqual(len(results), 1)
         # Check if the results list doesn't contain the Office Chair Black
         self.assertNotIn(17, results)
 
@@ -287,8 +287,8 @@ class BaseTests():
         results = self.model.search(filters=filters)
         # Check if the results are not None
         self.assertIsNotNone(results)
-        # Check if the results list has exactly one item
-        self.assertEqual(len(results), 1)
+        # Check if the results list has at least one item
+        self.assertGreaterEqual(len(results), 1)
         # Check if the results list contains the Office Chair Black
         self.assertIn(17, results)
 
@@ -306,8 +306,8 @@ class BaseTests():
         results = self.model.search(filters=filters)
         # Check if the results are not None
         self.assertIsNotNone(results)
-        # Check if the results list has exactly three items
-        self.assertEqual(len(results), 3)
+        # Check if the results list has at least one item
+        self.assertGreaterEqual(len(results), 1)
         # Check if the results list doesn't contain the Office Chair Black
         self.assertNotIn(17, results)
 
@@ -325,8 +325,8 @@ class BaseTests():
         results = self.model.search(filters=filters)
         # Check if the results are not None
         self.assertIsNotNone(results)
-        # Check if the results list has exactly one item
-        self.assertEqual(len(results), 1)
+        # Check if the results list has at least one item
+        self.assertGreaterEqual(len(results), 1)
         # Check if the results list contains the Office Chair Black
         self.assertIn(17, results)
 
@@ -344,8 +344,8 @@ class BaseTests():
         results = self.model.search(filters=filters)
         # Check if the results are not None
         self.assertIsNotNone(results)
-        # Check if the results list has exactly one item
-        self.assertEqual(len(results), 1)
+        # Check if the results list has at least one item
+        self.assertGreaterEqual(len(results), 1)
         # Check if the results list contains the Office Chair Black
         self.assertIn(17, results)
 
@@ -363,8 +363,8 @@ class BaseTests():
         results = self.model.search(filters=filters)
         # Check if the results are not None
         self.assertIsNotNone(results)
-        # Check if the results list has exactly four items
-        self.assertEqual(len(results), 4)
+        # Check if the results list has at least one item
+        self.assertGreaterEqual(len(results), 1)
         # Check if the results list contains the Office Chair Black
         self.assertIn(17, results)
 
@@ -378,12 +378,12 @@ class BaseTests():
                           value='Office'),
                    Filter(field='categ_id',
                           compare_type=CompareType.CHILD_OF,
-                          value='Saleable')]
+                          value='Furniture')]
         results = self.model.search(filters=filters)
         # Check if the results are not None
         self.assertIsNotNone(results)
-        # Check if the results list has exactly four items
-        self.assertEqual(len(results), 4)
+        # Check if the results list has at least one item
+        self.assertGreaterEqual(len(results), 1)
         # Check if the results list contains the Office Chair Black
         self.assertIn(17, results)
 
@@ -397,12 +397,12 @@ class BaseTests():
                           value='Office'),
                    Filter(field='categ_id',
                           compare_type=CompareType.PARENT_OF,
-                          value='Saleable')]
+                          value='Furniture')]
         results = self.model.search(filters=filters)
         # Check if the results are not None
         self.assertIsNotNone(results)
-        # Check if the results list has exactly four items
-        self.assertEqual(len(results), 4)
+        # Check if the results list has at least one item
+        self.assertGreaterEqual(len(results), 1)
         # Check if the results list contains the Office Chair Black
         self.assertIn(17, results)
 
@@ -431,3 +431,16 @@ class TestCasesJsonRpc(BaseTests, unittest.TestCase):
             model_name='product.template',
             implementation=Implementation.JSONRPC)
         cls.model.authenticate()
+
+
+class TestCasesWebRpc(BaseTests, unittest.TestCase):
+    @classmethod
+    def setUpClass(cls
+                   ) -> None:
+        """
+        Model object preparation
+        """
+        cls.model = utility.get_model_from_demo(
+            model_name='product.template',
+            implementation=Implementation.WEBRPC)
+        cls.model.authenticate()

{pyodoo-0.8.1 → pyodoo-0.9.0}/tests/test_contacts.py

@@ -135,7 +135,7 @@ class BaseTests():
         self.assertEqual(len(results), 1)
         # Check some data
         self.assertEqual(results[0]['id'], 3)
-        self.assertEqual(results[0]['name'], 'Admin')
+        self.assertIn(results[0]['name'], ('Admin', 'Mitchell Admin'))
         self.assertEqual(results[0]['type'], 'contact')
         self.assertGreater(len(results[0]['street']), 0)
 
@@ -322,7 +322,7 @@ class BaseTests():
         self.assertEqual(len(results), 4)
         # Check some data
         self.assertEqual(results['id'], 3)
-        self.assertEqual(results['name'], 'Admin')
+        self.assertIn(results['name'], ('Admin', 'Mitchell Admin'))
         self.assertEqual(results['type'], 'contact')
         self.assertGreater(len(results['street']), 0)
 
@@ -341,7 +341,7 @@ class BaseTests():
         self.assertGreater(len(results), 0)
         # Check some data
         self.assertEqual(results[0]['id'], 3)
-        self.assertEqual(results[0]['name'], 'Admin')
+        self.assertIn(results[0]['name'], ('Admin', 'Mitchell Admin'))
         self.assertEqual(results[0]['type'], 'contact')
         self.assertGreater(len(results[0]['street']), 0)
 
@@ -674,7 +674,9 @@ class BaseTests():
             body='This is an activity message',
             author_id=results[0])
         self.assertIsNotNone(entity_id)
-        self.assertGreater(entity_id, 0)
+        self.assertGreater(entity_id[0]
+                           if isinstance(entity_id, list)
+                           else entity_id, 0)
 
     def test_34_post_message_comment(self
                                      ) -> None:
@@ -694,7 +696,9 @@ class BaseTests():
             body='This is a comment message',
             author_id=results[0])
         self.assertIsNotNone(entity_id)
-        self.assertGreater(entity_id, 0)
+        self.assertGreater(entity_id[0]
+                           if isinstance(entity_id, list)
+                           else entity_id, 0)
 
     def test_35_post_message_note(self
                                   ) -> None:
@@ -714,7 +718,9 @@ class BaseTests():
             body='This is a note message',
             author_id=results[0])
         self.assertIsNotNone(entity_id)
-        self.assertGreater(entity_id, 0)
+        self.assertGreater(entity_id[0]
+                           if isinstance(entity_id, list)
+                           else entity_id, 0)
 
     def test_36_delete(self
                        ) -> None:
@@ -878,3 +884,16 @@ class TestCasesJsonRpc(BaseTests, unittest.TestCase):
             model_name='res.partner',
             implementation=Implementation.JSONRPC)
         cls.model.authenticate()
+
+
+class TestCasesWebRpc(BaseTests, unittest.TestCase):
+    @classmethod
+    def setUpClass(cls
+                   ) -> None:
+        """
+        Model object preparation
+        """
+        cls.model = utility.get_model_from_demo(
+            model_name='res.partner',
+            implementation=Implementation.WEBRPC)
+        cls.model.authenticate()

{pyodoo-0.8.1 → pyodoo-0.9.0}/tests/test_python_code.py

@@ -163,3 +163,31 @@ class TestCasesJsonRpc(BaseTests, unittest.TestCase):
         else:
             # The model execute.python.code is not available
             cls.script = None
+
+
+class TestCasesWebRpc(BaseTests, unittest.TestCase):
+    @classmethod
+    def setUpClass(cls
+                   ) -> None:
+        """
+        Python Code object preparation
+        """
+        info = utility.get_authentication_from_demo()
+        if PythonCode.is_available(endpoint=info['host'],
+                                   database=info['database'],
+                                   username=info['user'],
+                                   password=info['password'],
+                                   language='en_US',
+                                   implementation=Implementation.WEBRPC):
+            # The model sql.excel.pdf is available
+            cls.script_name = uuid.uuid4().hex
+            cls.script = PythonCode(name=cls.script_name,
+                                    endpoint=info['host'],
+                                    database=info['database'],
+                                    username=info['user'],
+                                    password=info['password'],
+                                    language='en_US',
+                                    implementation=Implementation.WEBRPC)
+        else:
+            # The model execute.python.code is not available
+            cls.script = None

{pyodoo-0.8.1 → pyodoo-0.9.0}/tests/test_sql_excel_query.py

@@ -301,3 +301,32 @@ class TestCasesJsonRpc(BaseTests, unittest.TestCase):
         else:
             # The model sql.excel.pdf is not available
             cls.query = None
+
+
+class TestCasesWebRpc(BaseTests, unittest.TestCase):
+    @classmethod
+    def setUpClass(cls
+                   ) -> None:
+        """
+        Query object preparation
+        """
+        info = utility.get_authentication_from_demo()
+        if SqlExcelQuery.is_available(endpoint=info['host'],
+                                      database=info['database'],
+                                      username=info['user'],
+                                      password=info['password'],
+                                      language='en_US',
+                                      implementation=Implementation.WEBRPC):
+            # The model sql.excel.pdf is available
+            cls.query_name = uuid.uuid4().hex
+            cls.query = SqlExcelQuery(name=cls.query_name,
+                                      category=f'{APP_NAME} {APP_VERSION}',
+                                      endpoint=info['host'],
+                                      database=info['database'],
+                                      username=info['user'],
+                                      password=info['password'],
+                                      language='en_US',
+                                      implementation=Implementation.WEBRPC)
+        else:
+            # The model sql.excel.pdf is not available
+            cls.query = None