Api fixes

biglovisa · biglovisa · commit 5b433e80213c · 2021-01-29T17:28:10.000-07:00
diff --git a/.flake8 b/.flake8
@@ -0,0 +1,6 @@
+[flake8]
+# E501 is the "Line too long" error and is disabled since we use the black code formatter.
+# W504 is the "line break before binary operator" error and is disabled since we use
+# the black code formatter.
+# W503 is disabled by default, but must be disabled explicitly when using `ignore`.
+ignore = E501, W503, W504
diff --git a/.gitignore b/.gitignore
@@ -45,7 +45,6 @@ coverage.xml
 *,cover
 .hypothesis/
 venv/
-.venv/
 .python-version
 .pytest_cache
 
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -8,3 +8,4 @@ repos:
     rev: v1.2.3
     hooks:
     - id: flake8
+      args: ['--config=.flake8']
diff --git a/patch_api/__init__.py b/patch_api/__init__.py
@@ -25,3 +25,7 @@
 from patch_api.exceptions import ApiValueError
 from patch_api.exceptions import ApiKeyError
 from patch_api.exceptions import ApiException
+
+from patch_api.api import *
+
+from patch_api.models import *
diff --git a/patch_api/api/__init__.py b/patch_api/api/__init__.py
@@ -0,0 +1,9 @@
+from __future__ import absolute_import
+
+# flake8: noqa
+
+# import apis into api package
+from patch_api.api.estimates_api import EstimatesApi
+from patch_api.api.orders_api import OrdersApi
+from patch_api.api.preferences_api import PreferencesApi
+from patch_api.api.projects_api import ProjectsApi
diff --git a/patch_api/api/estimates_api.py b/patch_api/api/estimates_api.py
@@ -18,7 +18,6 @@
 # python 2 and python 3 compatibility library
 import six
 
-from patch_api.api_client import ApiClient
 from patch_api.exceptions import ApiTypeError, ApiValueError
 
 
@@ -30,8 +29,6 @@ class EstimatesApi(object):
     """
 
     def __init__(self, api_client=None):
-        if api_client is None:
-            api_client = ApiClient()
         self.api_client = api_client
 
     def create_mass_estimate(
diff --git a/patch_api/api/orders_api.py b/patch_api/api/orders_api.py
@@ -18,7 +18,6 @@
 # python 2 and python 3 compatibility library
 import six
 
-from patch_api.api_client import ApiClient
 from patch_api.exceptions import ApiTypeError, ApiValueError
 
 
@@ -30,8 +29,6 @@ class OrdersApi(object):
     """
 
     def __init__(self, api_client=None):
-        if api_client is None:
-            api_client = ApiClient()
         self.api_client = api_client
 
     def cancel_order(self, opts={}, id={}, **kwargs):  # noqa: E501
diff --git a/patch_api/api/preferences_api.py b/patch_api/api/preferences_api.py
@@ -18,7 +18,6 @@
 # python 2 and python 3 compatibility library
 import six
 
-from patch_api.api_client import ApiClient
 from patch_api.exceptions import ApiTypeError, ApiValueError
 
 
@@ -30,8 +29,6 @@ class PreferencesApi(object):
     """
 
     def __init__(self, api_client=None):
-        if api_client is None:
-            api_client = ApiClient()
         self.api_client = api_client
 
     def create_preference(
diff --git a/patch_api/api/projects_api.py b/patch_api/api/projects_api.py
@@ -18,7 +18,6 @@
 # python 2 and python 3 compatibility library
 import six
 
-from patch_api.api_client import ApiClient
 from patch_api.exceptions import ApiTypeError, ApiValueError
 
 
@@ -30,8 +29,6 @@ class ProjectsApi(object):
     """
 
     def __init__(self, api_client=None):
-        if api_client is None:
-            api_client = ApiClient()
         self.api_client = api_client
 
     def retrieve_project(self, opts={}, id={}, **kwargs):  # noqa: E501
diff --git a/patch_api/api_client.py b/patch_api/api_client.py
@@ -25,6 +25,10 @@
 
 from patch_api.configuration import Configuration
 import patch_api.models
+from patch_api.api.projects_api import ProjectsApi
+from patch_api.api.orders_api import OrdersApi
+from patch_api.api.preferences_api import PreferencesApi
+from patch_api.api.estimates_api import EstimatesApi
 from patch_api import rest
 from patch_api.exceptions import ApiValueError
 
@@ -94,6 +98,15 @@ def __del__(self):
             self._pool.join()
             self._pool = None
 
+    def __getattr__(self, method):
+        resource = {
+            "projects": ProjectsApi,
+            "orders": OrdersApi,
+            "preferences": PreferencesApi,
+            "estimates": EstimatesApi,
+        }[method]
+        return resource(api_client=self)
+
     @property
     def pool(self):
         """Create thread pool on first request
diff --git a/requirements.txt b/requirements.txt
@@ -4,5 +4,3 @@ python_dateutil >= 2.5.3
 setuptools >= 21.0.0
 urllib3 >= 1.15.1
 pre-commit >= 2.9.3
-autopep8 >= 1.5.4
-flake8 >= 3.8.4
diff --git a/setup.cfg b/setup.cfg
@@ -1,7 +1,4 @@
 [flake8]
-max-line-length=99
-
-# E501 is the "Line too long" error. We disable it because we use Black for
-# code formatting. Black makes a best effort to keep lines under the max
-# length, but can go over in some cases.
-ignore = E501
+# E501 is the "Line too long" error and is disabled since we use black code formatter.
+# W503 is disabled by default, but must be disabled explicitly when using `ignore`.
+ignore = E501, W503, W504
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -1,6 +1,3 @@
-coverage>=4.0.3
-nose>=1.3.7
-pluggy>=0.3.1
-py>=1.4.31
-randomize>=0.13
-factory_boy>=2.12.0
+pytest~=4.6.7 # needed for python 2.7+3.4
+pytest-cov>=2.8.1
+pytest-randomly==1.2.3 # needed for python 2.7+3.4
diff --git a/test/test_estimates_api.py b/test/test_estimates_api.py
@@ -16,16 +16,15 @@
 import unittest
 import os
 
-import patch_api
-from patch_api.api.estimates_api import EstimatesApi  # noqa: E501
+from patch_api.api_client import ApiClient
 
 
 class TestEstimatesApi(unittest.TestCase):
     """EstimatesApi unit test stubs"""
 
     def setUp(self):
-        api_client = patch_api.ApiClient(api_key=os.environ.get("SANDBOX_API_KEY"))
-        self.api = EstimatesApi(api_client=api_client)  # noqa: E501
+        api_client = ApiClient(api_key=os.environ.get("SANDBOX_API_KEY"))
+        self.api = api_client.estimates  # noqa: E501
 
     def tearDown(self):
         self.api = None
diff --git a/test/test_orders_api.py b/test/test_orders_api.py
@@ -16,19 +16,18 @@
 import unittest
 import os
 
-import patch_api
-from patch_api.api.orders_api import OrdersApi  # noqa: E501
+from patch_api.api_client import ApiClient
 
 
 class TestOrdersApi(unittest.TestCase):
     """OrdersApi unit test stubs"""
 
     def setUp(self):
-        api_client = patch_api.ApiClient(api_key=os.environ.get("SANDBOX_API_KEY"))
-        self.api = OrdersApi(api_client=api_client)  # noqa: E501
+        api_client = ApiClient(api_key=os.environ.get("SANDBOX_API_KEY"))
+        self.api = api_client.orders  # noqa: E501
 
     def tearDown(self):
-        pass
+        self.api = None
 
     def test_interactions_with_an_order(self):
         """Test case for create_order, retrieve_order, cancel_order"""
diff --git a/test/test_preferences_api.py b/test/test_preferences_api.py
@@ -16,19 +16,18 @@
 import unittest
 import os
 
-import patch_api
-from patch_api.api.preferences_api import PreferencesApi  # noqa: E501
+from patch_api.api_client import ApiClient
 
 
 class TestPreferencesApi(unittest.TestCase):
     """PreferencesApi unit test stubs"""
 
     def setUp(self):
-        api_client = patch_api.ApiClient(api_key=os.environ.get("SANDBOX_API_KEY"))
-        self.api = PreferencesApi(api_client=api_client)  # noqa: E501
+        api_client = ApiClient(api_key=os.environ.get("SANDBOX_API_KEY"))
+        self.api = api_client.preferences  # noqa: E501
 
     def tearDown(self):
-        pass
+        self.api = None
 
     def test_retrieve_preferences_and_preference(self):
         """Test case for retrieve_preferences and retrieve_preference
diff --git a/test/test_projects_api.py b/test/test_projects_api.py
@@ -16,17 +16,15 @@
 import unittest
 import os
 
-import patch_api
-from patch_api.api.projects_api import ProjectsApi  # noqa: E501
-from patch_api.rest import ApiException
+from patch_api.api_client import ApiClient
 
 
 class TestProjectsApi(unittest.TestCase):
     """ProjectsApi unit test stubs"""
 
     def setUp(self):
-        api_client = patch_api.ApiClient(api_key=os.environ.get("SANDBOX_API_KEY"))
-        self.api = ProjectsApi(api_client=api_client)  # noqa: E501
+        api_client = ApiClient(api_key=os.environ.get("SANDBOX_API_KEY"))
+        self.api = api_client.projects  # noqa: E501
 
     def tearDown(self):
         self.api = None
@@ -37,8 +35,10 @@ def test_retrieve_project(self):
         Retrieves a project  # noqa: E501
         """
         project_id = "pro_test_2b67b11a030b66e0a6dd61a56b49079a"
-        project = self.api.retrieve_project(id=project_id)
+        project = self.api.retrieve_project(id=project_id).data
         self.assertTrue(project)
+        self.assertEqual(project.production, False)
+        self.assertTrue(isinstance(project.photos, list))
 
     def test_retrieve_projects(self):
         """Test case for retrieve_projects
