Merge pull request #68 from uktrade/feature/add-model-api-2

Add API endpoints for models and results

.vscode/launch.json

@@ -1,5 +1,5 @@
 {
-    "version": "0.2.0",
+    "version": "0.2.1",
     "configurations": [
         {
             "name": "Matchbox: Debug",

docs/contributing.md

@@ -54,8 +54,8 @@ docker compose up -d --wait
 
 We have a VSCode default debugging profile called "API debug", which allows to e.g. set breakpoints on the API when running tests. After running this profile, change your `.env` file  as follows:
 
-- change the `MB__CLIENT__API_ROOT` variable to redirect tests to use the debug port (8080)
-- disable time-outs by commenting out the `MB__CLIENT__TIMEOUT` variable
+- Change the `MB__CLIENT__API_ROOT` variable to redirect tests to use the debug port (8080)
+- Disable time-outs by commenting out the `MB__CLIENT__TIMEOUT` variable
 
 ## Standards
 

environments/dev_docker.env

@@ -17,4 +17,5 @@ MB__POSTGRES__DATABASE=matchbox
 MB__POSTGRES__DB_SCHEMA=mb
 
 MB__CLIENT__API_ROOT=http://localhost:8000
-MB__CLIENT__TIMEOUT=10
+MB__CLIENT__TIMEOUT=10
+MB__CLIENT__RETRY_DELAY=2

environments/dev_local.env

@@ -17,4 +17,5 @@ MB__POSTGRES__DATABASE=matchbox
 MB__POSTGRES__DB_SCHEMA=mb
 
 MB__CLIENT__API_ROOT=http://localhost:8000
-MB__CLIENT__TIMEOUT=10
+MB__CLIENT__TIMEOUT=10
+MB__CLIENT__RETRY_DELAY=2

environments/sample.env

@@ -17,4 +17,5 @@ MB__POSTGRES__DATABASE=
 MB__POSTGRES__DB_SCHEMA=
 
 MB__CLIENT__API_ROOT=
-MB__CLIENT__TIMEOUT=
+MB__CLIENT__TIMEOUT=
+MB__CLIENT__RETRY_DELAY=

pyproject.toml

@@ -107,3 +107,9 @@ log_cli = false
 log_cli_level = "INFO"
 log_cli_format = "%(asctime)s [%(levelname)8s] %(message)s (%(filename)s:%(lineno)s)"
 log_cli_date_format = "%Y-%m-%d %H:%M:%S"
+asyncio_mode = "strict"
+asyncio_default_fixture_loop_scope = "function"
+filterwarnings = [
+    'ignore:.*__fields.*:pydantic.PydanticDeprecatedSince20:unittest.mock',
+    'ignore:.*__fields_set__.*:pydantic.PydanticDeprecatedSince20:unittest.mock'
+]

src/matchbox/__init__.py

@@ -1,11 +1,13 @@
 from dotenv import find_dotenv, load_dotenv
 
-from matchbox.client.helpers.cleaner import process
-from matchbox.client.helpers.index import index
-from matchbox.client.helpers.selector import match, query
-from matchbox.client.models.models import make_model
-
-__all__ = ("make_model", "process", "query", "match", "index")
-
 dotenv_path = find_dotenv(usecwd=True)
 load_dotenv(dotenv_path)
+
+# Environment variables must be loaded first for other imports to work
+
+from matchbox.client.helpers.cleaner import process  # NoQA: E402
+from matchbox.client.helpers.index import index  # NoQA: E402
+from matchbox.client.helpers.selector import match, query  # NoQA: E402
+from matchbox.client.models.models import make_model  # NoQA: E402
+
+__all__ = ("make_model", "process", "query", "match", "index")