Merge branch 'develop'

unfoldingWord · Aug 31, 2023 · 1d9d30c · 1d9d30c
2 parents eb08dd1 + fb74351
commit 1d9d30c
Show file tree

Hide file tree

Showing 10 changed files with 3,902 additions and 9 deletions.
diff --git a/app_settings/app_settings.py b/app_settings/app_settings.py
@@ -3,7 +3,6 @@
 import logging
 import re
 import dcs_api_client
-import dcs_catalog_client
 import boto3
 import watchtower
 
@@ -127,12 +126,13 @@ def init(cls, reset=True, **kwargs):
             cls.dcs_url = os.getenv('DCS_URL', default='https://develop.door43.org' if cls.prefix else 'https://git.door43.org')
 
         api_config = dcs_api_client.Configuration()
+        access_token = os.getenv('DCS_ACCESS_TOKEN')
+        if access_token:
+            api_config.api_key['access_token'] = access_token
         api_config.host = f"{cls.dcs_url}/api/v1"
-        cls.repo_api = dcs_api_client.RepositoryApi(dcs_api_client.ApiClient(api_config))
 
-        catalog_config = dcs_catalog_client.Configuration()
-        catalog_config.host = f"{cls.dcs_url}/api/catalog"
-        cls.catalog_api = dcs_catalog_client.V5Api(dcs_catalog_client.ApiClient(catalog_config))
+        cls.repo_api = dcs_api_client.RepositoryApi(dcs_api_client.ApiClient(api_config))
+        cls.catalog_api = dcs_api_client.CatalogApi(dcs_api_client.ApiClient(api_config))
 
         test_mode_flag = os.getenv('TEST_MODE', '')
         travis_flag = os.getenv('TRAVIS_BRANCH', '')

diff --git a/converters/pdf/pdf_converter.py b/converters/pdf/pdf_converter.py
@@ -20,7 +20,7 @@
 import general_tools.html_tools as html_tools
 import googletrans
 import json
-from dcs_catalog_client.rest import ApiException
+from dcs_api_client.rest import ApiException
 from collections import Counter
 from cssutils import parseStyle
 from cssutils.css import CSSStyleDeclaration
@@ -211,7 +211,6 @@ def project(self):
                     self.project_id)
                 if not self._project:
                     self.log.error(f'Project not found: {self.project_id}')
-                    exit(1)
             return self._project
 
     @property