Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
7ef9f36
refactor: Reimplement SQL-to-ARC conversion with dedicated modules fo…
Zalfsten Feb 2, 2026
8a086b9
feat: add syncing of Python dependencies with uv in load-env script
Zalfsten Feb 2, 2026
af61c55
fix: update import statements for ARC to include 'import-not-found' t…
Zalfsten Feb 2, 2026
88b6554
test: add assertions to verify assay measurement, technology type, an…
Zalfsten Feb 2, 2026
173a9a5
feat: Refactor ARC generation to use batched streaming, concurrent pr…
Zalfsten Feb 2, 2026
2560a13
Merge branch 'main' into feature/transfer_optimizations
Zalfsten Feb 2, 2026
5eab944
fix: enhance assertions in assay tests to check for None before acces…
Zalfsten Feb 2, 2026
c621667
feat: update data models and tests to use Pydantic for improved type …
Zalfsten Feb 2, 2026
70a78fe
feat: optimize data fetching by using streaming and grouping for rela…
Zalfsten Feb 2, 2026
e77f5e6
feat: refactor data models and mapping functions to use Pydantic for …
Zalfsten Feb 2, 2026
37d8c33
refactor: replace SQLAlchemy Table constructs with raw SQL queries fo…
Zalfsten Feb 2, 2026
d8a3c3b
feat: refactor models to use NamedTuple for ArcBuildData and RelatedD…
Zalfsten Feb 3, 2026
f8d55c4
Merge branch 'main' into feature/merge_main_into_new_view_spec
Zalfsten Feb 3, 2026
f36f0de
feat: pin actions-runner and dotnet versions in devcontainers and fix…
Zalfsten Feb 3, 2026
e4dde57
refactor: Centralize `SETUPTOOLS_SCM_PRETEND_VERSION` and remove `HAT…
Zalfsten Feb 4, 2026
90f7888
Merge branch 'main' into feature/transfer_new_view_spec_branch
Zalfsten Feb 24, 2026
f81c950
Add mypy overrides for middleware.api_client and middleware.shared mo…
Zalfsten Feb 24, 2026
3a10842
Refactor code structure for improved readability and maintainability
Zalfsten Mar 2, 2026
de04fae
Add error handling tests for missing database tables and views
Zalfsten Mar 2, 2026
d66b625
Refactor SQL-to-ARC conversion process with enhanced validation and e…
Zalfsten Mar 3, 2026
7ab1c10
Update default values in data models to use PydanticUndefined and adj…
Zalfsten Mar 3, 2026
65e0e5a
Refactor data models and mapper for improved role handling and valida…
Zalfsten Mar 3, 2026
98d91fb
Fix assay and contact role mappings to use JSON strings for study_ref…
Zalfsten Mar 3, 2026
8ba4118
feat: Add database schema validation and refactor streaming queries t…
Zalfsten Mar 4, 2026
606a107
feat: Update environment configurations and enhance SQL handling with…
Zalfsten Mar 19, 2026
f4562be
Merge branch 'main' into feature/transfer_new_view_spec_branch
Zalfsten Mar 25, 2026
1b0502e
Refactor code structure for improved readability and maintainability
Zalfsten Mar 31, 2026
6ccff44
Enhance pre-commit configuration to support markdown formatting and u…
Zalfsten Mar 31, 2026
f018657
Refactor environment variable definitions for consistency and update …
Zalfsten Mar 31, 2026
9fda685
Refactor type annotations for improved clarity and consistency across…
Zalfsten Mar 31, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .devcontainer/antigravity/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,11 @@
"ms-python.autopep8",
"ms-python.vscode-python-envs",
"ms-python.pylint",
"ms-python.mypy-type-checker",
"mhutchie.git-graph",
"donjayamanne.githistory",
"codezombiech.gitignore",
"github.copilot",
"github.copilot-chat",
"matangover.mypy",
"charliermarsh.ruff",
"tim-koehler.helm-intellisense",
"vadzimnestsiarenka.helm-template-preview-and-more"
Expand Down
3 changes: 1 addition & 2 deletions .devcontainer/vscode/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,11 @@
"ms-python.autopep8",
"ms-python.vscode-python-envs",
"ms-python.pylint",
"ms-python.mypy-type-checker",
"mhutchie.git-graph",
"donjayamanne.githistory",
"codezombiech.gitignore",
"github.copilot",
"github.copilot-chat",
"matangover.mypy",
"charliermarsh.ruff",
"tim-koehler.helm-intellisense",
"vadzimnestsiarenka.helm-template-preview-and-more"
Expand Down
14 changes: 7 additions & 7 deletions .env.integration.enc
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"data": "ENC[AES256_GCM,data:uqozLcaDoElJ1C3+Lm31Z/YeAevk7/Iwk5cdzrUEiUNqgf59f8M3fxgcpd1IUI1MB6C17Eg7vn67fZ+X3+y8Dw5rmZXDg6oKqhOcYTeQfOoj1BsatazM62xGer0ppa7DSD72aA==,iv:2Q2XtwWzWzhQa9Xf9n3RVjeGzld2OVjVBzCA0m/3plo=,tag:TkyzfNqVM5T4GyT0lYEgIg==,type:str]",
"data": "ENC[AES256_GCM,data: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,iv:a5ZAZ8sWFNO26CxwbHnClux1Ha1HyZytj3DwUoDanjM=,tag:AeQKLWvJKkebCIqzMjkMwQ==,type:str]",
"sops": {
"lastmodified": "2026-01-06T12:31:47Z",
"mac": "ENC[AES256_GCM,data:Lj3bBLfsBt3Xpv9NiLQvFSO7VXo1MH1IBmV78asCIwf6smCpl1zgwuCkJyfnGRn02DT+OjrpFsYCtZ0NsGoMYhAtA1Ztq81cEmfqEmKeOdnpMlH2CB82W7Kk4MdeoKevUcrNxnO84ZtBDd3bKnwBRAyu4UDeeOZqJA6em+KMNxE=,iv:2FNikX0kGVp8JdH2merctM5XFL7patHtq0OtTsDt6jI=,tag:02yK5764SP/1BlazVoyICQ==,type:str]",
"lastmodified": "2026-03-18T16:08:54Z",
"mac": "ENC[AES256_GCM,data:tZktiCSC2x52QXIKXGitU9WV77qAzK5AvV3J+AROhmpomyM28bXw2XJLKVYj/5kRraumHXRCJnsV1F4bwQiqeOJW0XUyUP1erwmD9kG8yO5ggISzXWmK2fuSnhSaI4EON0NazxtKk+i63zgE+aOY3vnAdqkycbvc1xkCvSx3MXM=,iv:X9M4nwRAnQA32F3CkAGHCxOqOxpSNOQAYoYBtV+Zsw4=,tag:5otZTGkbco783kpfjsKMPg==,type:str]",
"pgp": [
{
"created_at": "2026-01-06T12:31:47Z",
"enc": "-----BEGIN PGP MESSAGE-----\n\nhF4Df+t0WwSeCuMSAQdAraNGOzVhXDFVWZkr2HlmEGD0raVpOBzSUeBn6f7PfUsw\n9b4yepTfAYhU5hXj6XC1RDFK6iUs2cbSScFNbilFD84BbbmZ1WGgv/X9DhYewcE9\n0l4BtCMO7rhYDYOInEpBIHrZhApy8AipvKL/utJEBDBUGsrJZ0gD2d1ZRk6oW9zP\n8AR5vV3xLr2DaVQeZ3YPC94JKHUkRDgbp79BiXbU5hP17xIBqMjIUXa6e8Ghq7OD\n=6ADv\n-----END PGP MESSAGE-----",
"created_at": "2026-03-18T16:08:54Z",
"enc": "-----BEGIN PGP MESSAGE-----\n\nhF4Df+t0WwSeCuMSAQdAH7Bp/SMJIvD51M1rgdp0Vg+K7ldmBq86cWQxwqBhdQcw\ngpcUYdzpvF5JB390ROkc1mUrrfl5L9CL6nGlCqCQ20MI5qBlX3Jvlr2HVcK/j5aL\n0l4B1wv2Gccag5vvBjX/9Q9XpVO2ejZRzka7L051oQw5aZMQOmqj/vi6Yhd0FtBu\nqJryo1KKOqZWzHvqZ0bYYja9oZfTIR7mCqI1df6/9fGPZdpdH8J+G72IwyRgmul2\n=wIls\n-----END PGP MESSAGE-----",
"fp": "37D38A6C0248214B007B6C5685E825F3377228D6"
},
{
"created_at": "2026-01-06T12:31:47Z",
"enc": "-----BEGIN PGP MESSAGE-----\n\nhF4D5jdJleHfCY0SAQdANXQOT4vH5jfo9g+W5TYl9PRrUXB4LJ4UTQG08ttu0D0w\nIe1YvxnOXstMDPM7y6qPRxfaYQopqqHdrcVF5l+8+xilQ95u0OFUwEnGQhLnbZnX\n0l4BHYe0MdAt7Lefl/Zm3MUMwm9h2sYsi2xYDA2L45PRJbRZM5jleByRg+YEYnJN\nC48t4J21IQm/IHP1lU99P+q4LIb2rOiM5z8VSxopGluB7jdp/uOrpADdaTSSa9G6\n=IUVG\n-----END PGP MESSAGE-----",
"created_at": "2026-03-18T16:08:54Z",
"enc": "-----BEGIN PGP MESSAGE-----\n\nhF4D5jdJleHfCY0SAQdAbvs5ko+XMNfB++a0WZNX0+S1NE/BbeFO5P9v0FCaixgw\n5IkvY3GDkTlZcrNPpphIVzILBcY3LiVymlbAgL43/jZVoMjon89FIkpoQqV2wUT0\n0l4B3QSpNdDQb615oalHQkLL/gIkC0/gvefm1dK1Czl/aKmG55bVo8+8C7e3aMKw\nT39TTSvEI8/ZTZIi3qFun/Lp1+mFBfhlFB2rML4FTX+0fq6yJNaYuG/K6usiqo/n\n=QItZ\n-----END PGP MESSAGE-----",
"fp": "CC7B10CE8D78010ABB043F8DB1C462E90012ECFE"
}
],
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:

- name: Type checking with mypy
run: |
uv run mypy middleware/ --ignore-missing-imports --strict-optional
uv run mypy middleware/
continue-on-error: false

- name: Security check with bandit
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ scratch/

# Cryptographic keys and certificates for testing that are not meant to be committed
helmchart/**/*.crt
helmchart/**/*.key
**/*.key
helmchart/**/*.csr
helmchart/**/*.srl
helmchart/**/server.conf
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ repos:
name: ruff format
entry: uv run ruff format
language: system
types: [python]
types_or: [python, markdown]
args: [--check]

# mypy - Type checking
Expand Down
3 changes: 1 addition & 2 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@
"mhutchie.git-graph",
"donjayamanne.githistory",
"codezombiech.gitignore",
"github.copilot",
"github.copilot-chat",
"matangover.mypy",
"ms-python.mypy-type-checker",
"charliermarsh.ruff",
"tim-koehler.helm-intellisense",
"vadzimnestsiarenka.helm-template-preview-and-more",
Expand Down
4 changes: 2 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
"request": "launch",
"program": "${workspaceFolder}/middleware/sql_to_arc/src/middleware/sql_to_arc/main.py",
"console": "integratedTerminal",
"envFile": "${workspaceFolder}/dev_environment/.env",
"envFile": "${workspaceFolder}/.env",
"args": [
"-c",
"${workspaceFolder}/dev_environment/config.yaml"
"${workspaceFolder}/dev_environment/debug_config.yaml"
]
},
{
Expand Down
15 changes: 13 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
// For AI assistant instructions, see: copilot-instructions.md
// For detailed project context, see: AGENTS.md

"python.testing.pytestArgs": [],
"python.testing.pytestArgs": [
"middleware"
],
"python.testing.unittestEnabled": false,
"python.testing.pytestEnabled": true,
"python.testing.autoTestDiscoverOnSaveEnabled": true,
Expand All @@ -20,12 +22,21 @@
"source.fixAll.ruff": "explicit"
}
},
"[markdown]": {
"editor.defaultFormatter": "charliermarsh.ruff",
"editor.formatOnSave": true
},
"python.defaultInterpreterPath": "${workspaceFolder}/.venv/bin/python",

"sops-edit.onlyUseButtons": false,
"sops-edit.tempFilePreExtension": "decrypted",

"mypy.dmypyExecutable": "${workspaceFolder}/.venv/bin/dmypy",
"mypy-type-checker.importStrategy": "fromEnvironment",
"mypy-type-checker.preferDaemon": true,
"mypy-type-checker.args": [
"--config-file",
"${workspaceFolder}/pyproject.toml"
],

// Ruff Extension Settings - ensure consistency with script
"ruff.configuration": "./pyproject.toml",
Expand Down
4 changes: 2 additions & 2 deletions dev_environment/FAIRagro.sql
Git LFS file not shown
20 changes: 0 additions & 20 deletions dev_environment/client.key

This file was deleted.

30 changes: 20 additions & 10 deletions dev_environment/compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ services:
image: postgres:15
restart: unless-stopped
environment:
POSTGRES_USER: ${POSTGRES_USER:-postgres}
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-postgres}
POSTGRES_USER: ${POSTGRES_USER}
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
POSTGRES_DB: postgres
ports:
- "5432:5432"
Expand All @@ -24,9 +24,11 @@ services:
condition: service_healthy
environment:
PGHOST: postgres
PGUSER: ${POSTGRES_USER:-postgres}
PGPASSWORD: ${POSTGRES_PASSWORD:-postgres}
PGUSER: ${POSTGRES_USER}
PGPASSWORD: ${POSTGRES_PASSWORD}
PGDATABASE: postgres
volumes:
- ./FAIRagro.sql:/tmp/FAIRagro.sql:ro
entrypoint: /bin/bash
command:
- -c
Expand All @@ -39,9 +41,17 @@ services:
psql -c "DROP DATABASE IF EXISTS edaphobase;"
psql -c "CREATE DATABASE edaphobase;"
echo "Downloading and importing Edaphobase dump..."
wget -q -O - https://repo.edaphobase.org/rep/dumps/FAIRagro.sql | \
PGDATABASE=edaphobase psql
echo "Attempting to download Edaphobase dump..."
if wget -q -O /tmp/downloaded_FAIRagro.sql https://repo.edaphobase.org/rep/dumps/FAIRagro.sql; then
echo "Importing downloaded dump..."
PGDATABASE=edaphobase psql < /tmp/downloaded_FAIRagro.sql
elif [ -f /tmp/FAIRagro.sql ]; then
echo "Download failed. Importing local FAIRagro.sql fallback..."
PGDATABASE=edaphobase psql < /tmp/FAIRagro.sql
else
echo "Error: Could not download dump and no local fallback found."
exit 1
fi
echo "Database initialization complete."
Expand All @@ -54,15 +64,15 @@ services:
db-init:
condition: service_completed_successfully
environment:
SQL_TO_ARC_DB_PASSWORD: ${POSTGRES_PASSWORD:-postgres}
CLIENT_KEY_DATA: ${data}
SQL_TO_ARC_CONNECTION_STRING: ${CONNECTION_STRING}
SQL_TO_ARC_CLIENT_KEY_DATA: ${CLIENT_KEY}
tmpfs:
- /run/secrets:mode=1777
volumes:
- ./config.yaml:/etc/sql_to_arc/config.yaml:ro
- ./client.crt:/etc/sql_to_arc/client.crt:ro
command: >
sh -c "printf '%s' \"$$CLIENT_KEY_DATA\" > /run/secrets/client.key &&
sh -c "printf '%s' \"$$SQL_TO_ARC_CLIENT_KEY_DATA\" > /run/secrets/client.key &&
/middleware/sql_to_arc/sql_to_arc -c /etc/sql_to_arc/config.yaml"
restart: no

Expand Down
7 changes: 0 additions & 7 deletions dev_environment/config.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
log_level: INFO

db_name: edaphobase
db_user: postgres
db_password: ~
db_host: postgres # Docker service name
db_port: 5432

rdi: edaphobase
rdi_url: https://edaphobase.org
max_concurrent_arc_builds: 12

api_client:
# NOTE: Change this to the external Middleware API URL
api_url: "https://middleware.fairagro.net"
timeout: 600
client_cert_path: "/etc/sql_to_arc/client.crt"
Expand Down
16 changes: 16 additions & 0 deletions dev_environment/debug_config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
log_level: DEBUG

rdi: edaphobase
rdi_url: https://edaphobase.org
max_concurrent_arc_builds: 12

api_client:
# NOTE: Change this to the external Middleware API URL
api_url: "https://middleware.fairagro.net"
timeout: 600
client_cert_path: "dev_environment/client.crt"
client_key_path: "dev_environment/client.key"
verify_ssl: true

otel:
log_console_spans: false
Loading
Loading