Skip to content

feat(datasource): mars-style date matching #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
peshence merged 14 commits into from
Mar 16, 2026
Merged

feat(datasource): mars-style date matching #168

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5560cfa
feat(datasource): mars-style date matching
peshence Mar 10, 2026
6f91d09
fix(date_check): enforce rule style matching
peshence Mar 11, 2026
3b83ad0
feat(date_check): cleaner date matching
peshence Mar 11, 2026
c9af09a
chore(date_check): docstrings, type hints, funciton names and visibility
peshence Mar 11, 2026
54c3185
fix(date_check): rule issues raise ServerError
peshence Mar 16, 2026
0adfdc0
test(date_check): list rules incorrectly allow ranges
peshence Mar 16, 2026
574adc6
fix(date_check): list rules no longer allow range matches
peshence Mar 16, 2026
2c944b5
fix(test): add missed assert
peshence Mar 16, 2026
8443461
chore: update schema
peshence Mar 16, 2026
5df11a9
chore(date_check): consistently raise/pass instead of return true/false
peshence Mar 16, 2026
9e31583
fix(date_check): ranges have 3 string parts
peshence Mar 16, 2026
c1edd3b
fix: return None
peshence Mar 16, 2026
923356d
chore(date_check): input sequence
peshence Mar 16, 2026
6106fb1
isort
peshence Mar 16, 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
79 changes: 67 additions & 12 deletions docs/source/schemas/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@
},
"match": {
"$ref": "#/definitions/DatasourcesConfig-Datasource-MARS-Match",
"description": "filters requests based on presence of specific key=value pair in user request"
"description": "filters requests based on request keys and values. Non-date keys accept scalar or list values. Date supports comparative rules (e.g. >30d, <40d) or MARS date rules (single/list/range). MARS rules do not support by-step."
},
"patch": {
"$ref": "#/definitions/DatasourcesConfig-Datasource-MARS-Patch",
Expand Down Expand Up @@ -455,7 +455,7 @@
},
"match": {
"$ref": "#/definitions/DatasourcesConfig-Datasource-MARS-Match",
"description": "filters requests based on presence of specific key=value pair in user request"
"description": "filters requests based on request keys and values. Non-date keys accept scalar or list values. Date supports comparative rules (e.g. >30d, <40d) or MARS date rules (single/list/range). MARS rules do not support by-step."
},
"patch": {
"$ref": "#/definitions/DatasourcesConfig-Datasource-MARS-Patch",
Expand All @@ -474,26 +474,81 @@
},
"DatasourcesConfig-Datasource-MARS-Match": {
"type": "object",
"description": "Datasource match rules keyed by request parameter. For non-date keys, scalar and list forms are supported. For date, use either comparative rules (all rules must pass) or MARS date rules (no mixing with comparative rules).",
"properties": {
"date": {
"$ref": "#/definitions/DatasourcesConfig-Datasource-MARS-Match-DateValue",
"description": "Date matching rules. Comparative style (all rules must pass): >30d, <40d. MARS style (no mixing with comparative rules): single/list/range rules without by-step, e.g. -1/-5/-10 or -1/to/-20. User-supplied date ranges may include /by/N.",
"examples": [
">30d",
[
">30d",
"<40d"
],
"-1/to/-20",
[
"-1/-5/-10",
"-20/to/-30"
],
[
"2024-02-21/to/2025-03-01",
"-1/-5/-10"
]
]
},
"key1": {
"$ref": "#/definitions/DatasourcesConfig-Datasource-MARS-Match-Value",
"description": "Example non-date match key. Request values must be a subset of the allowed values."
},
"key2": {
"$ref": "#/definitions/DatasourcesConfig-Datasource-MARS-Match-Value"
}
},
"preferredOrder": [
"date",
"key1",
"key2"
],
"additionalProperties": {
"$ref": "#/definitions/DatasourcesConfig-Datasource-MARS-Match-Value"
}
},
"DatasourcesConfig-Datasource-MARS-Match-Value": {
"oneOf": [
{
"type": "string"
},
{
"type": "number"
},
{
"type": "array",
"items": {
"type": "string"
"oneOf": [
{
"type": "string"
},
{
"type": "number"
}
]
},
"default": "[]",
"description": "value matches any in list"
"default": []
}
]
},
"DatasourcesConfig-Datasource-MARS-Match-DateValue": {
"oneOf": [
{
"type": "string"
},
"key2": {
{
"type": "array",
"items": {
"type": "string"
},
"default": "[]"
"default": []
}
},
"preferredOrder": [
"key1",
"key2"
]
},
"DatasourcesConfig-Datasource-MARS-Patch": {
Expand Down Expand Up @@ -1239,7 +1294,7 @@
"default": 6379
},
"db": {
"type": "interger",
"type": "integer",
"description": "id of the database to use",
"default": 0
}
Expand Down
4 changes: 2 additions & 2 deletions polytope_server/common/datasource/datasource.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
from ..config import polytope_config
from ..request import PolytopeRequest, Verb
from ..user import User
from .date_check import DateError, date_check
from .date_check import DateError, validate_date_match

#######################################################

Expand Down Expand Up @@ -112,7 +112,7 @@ def match(ds_config, coerced_ur: Dict[str, Any], user: User) -> str:
# Process date rules
if rule_key == "date":
try:
date_check(coerced_ur_copy["date"], allowed_values)
validate_date_match(coerced_ur_copy["date"], allowed_values)
except DateError as e:
return f"Skipping datasource {DataSource.repr(ds_config)}: {e}."
except Exception as e:
Expand Down
Loading
Loading