Skip to content

feat(resolvers,wire): pluggable resolvers + wire-layer codec (step 4)#7

Open
estebanzimanyi wants to merge 3 commits into
MobilityDB:masterfrom
estebanzimanyi:feat/step4-resolvers-and-wire
Open

feat(resolvers,wire): pluggable resolvers + wire-layer codec (step 4)#7
estebanzimanyi wants to merge 3 commits into
MobilityDB:masterfrom
estebanzimanyi:feat/step4-resolvers-and-wire

Conversation

@estebanzimanyi
Copy link
Copy Markdown
Member

Stacks on #6 (catalog-driven dispatcher foundation). Adds the two layers a production endpoint migration needs alongside the dispatcher:

What ships

File Role
mobilityapi/resolvers.py stub_resolver(registry) / pymeos_resolver() / default_resolver(prefer_pymeos=True) — pick the MEOS function implementation. PyMEOS is lazy-imported on first call so MobilityAPI can be installed without it.
mobilityapi/wire.py WireCodec keyed by encoding name (mfjson / text / wkb / hexwkb) — decode HTTP wire values to PyMEOS objects, encode PyMEOS results back. stub_codec for tests; pymeos_codec() for production.
mobilityapi/__init__.py Re-exports Dispatcher, FunctionSignature, stub_resolver, pymeos_resolver, default_resolver, WireCodec, stub_codec, pymeos_codec, and the ENCODING_* constants. Endpoint migrations import from one module.
tests/test_resolvers.py 7 tests covering: stub registry hit/miss, pymeos_resolver lazy-import contract, default_resolver fallback path, prefer_pymeos=False short-circuit.
tests/test_wire.py 8 tests covering: encoding constants, stub codec round-trip, missing-encoding error, has_decoder/has_encoder, pymeos_codec lazy-import contract.
.github/workflows/python.yml Pytest job extended to run all three test files together (the existing 12 dispatcher tests + 7 resolver tests + 8 wire tests = 27 unit tests).

All 15 new tests pass locally (python3 -m pytest tests/test_resolvers.py tests/test_wire.py -v).

Migration plan unlocked

With #6 + this PR in place, each of the 5 endpoint migrations becomes the same ~50-100 LoC pattern:

from mobilityapi import Dispatcher, default_resolver, pymeos_codec, ENCODING_MFJSON

_DISPATCHER = Dispatcher(resolver=default_resolver())
_CODEC      = pymeos_codec()

def get_velocity(self, collection_id, feature_id, geometry_id, connection, cursor):
    # 1. fetch the trajectory from the DB
    cursor.execute("SELECT asMfjson(trajectory) FROM temporal_geometries WHERE id = %s", (geometry_id,))
    traj_mfjson = cursor.fetchone()[0]

    # 2. dispatch to MEOS via PyMEOS
    traj  = _CODEC.decode(ENCODING_MFJSON, traj_mfjson)
    speed = _DISPATCHER.dispatch("tpoint_speed", {"temp": traj})

    # 3. encode back to MF-JSON for the HTTP response
    return send_json_response(self, _CODEC.encode(ENCODING_MFJSON, speed))

Production wiring

Production runs install PyMEOS via requirements.txt (not added in this PR — the migration PR that flips the first endpoint adds it). Until then, default_resolver() returns a stub that raises NotImplementedError on first dispatch with an actionable message, so MobilityAPI can be installed and unit-tested without PyMEOS.

Dependency chain

Stacks on Status
#6 (dispatcher foundation) OPEN, green (12 dispatcher tests in CI)

Next stacked PRs

Step Scope
#N+1 Add pymeos>=1.4 to requirements.txt; flip the first endpoint to use the dispatcher (recommended: temporal_geom_query/velocity.pyDispatcher.dispatch("tpoint_speed", …)).
#N+2 Remaining 4 endpoint migrations (acceleration.py, distance.py, temporal_geom_seq/, temporal_properties/).
#N+3 (step 5 of ingestion plan) Swap the dispatcher routes for the OGC API – Moving Features paths exposed by MEOS-API #13.

Vendor MobilityAPI's read-only copy of MEOS-API's published catalog +
projection artefacts under `vendor/meos-api/`, plus a Makefile target
`make vendor-meos-api` that regenerates them from upstream.

Files added:

  vendor/meos-api/
    PROVENANCE.json              -- per-artefact source URLs + regenerate cmd
    README.md                    -- refresh procedure
    meos-idl.json                -- 3546 fns / 70 structs / 16 enums
                                    (generated by MEOS-API run.py over
                                    MobilityDB master meos/include headers)
    meos-coverage.json           -- structural worklist (from open PR MobilityDB#4)
    meos-object-model-parity.json -- 29-pair portable-parity (from open PR #10)

The Makefile target clones MEOS-API + MobilityDB shallowly, installs
libclang, runs MEOS-API's `run.py` against MobilityDB's MEOS headers,
and copies the produced JSON artefacts into `vendor/meos-api/`.

Two of the four artefacts (`meos-coverage.json`,
`meos-object-model-parity.json`) currently come from open MEOS-API PR
branches because their generators are not yet on master; PROVENANCE.json
makes that explicit. The Makefile gracefully skips them if absent.

Step 2 of `docs/MEOS_API_INGESTION_PLAN.md`. The drift gate workflow
that fails on stale artefacts is step 3 (separate stacked PR).
…ndation)

Step 4 of docs/MEOS_API_INGESTION_PLAN.md — the catalog-driven
dispatcher that the 5 'REPLACE' resource modules will delegate to in
follow-up PRs.

mobilityapi/dispatcher.py:

- Loads vendor/meos-api/meos-idl.json at construction; honours an
  explicit catalog_path= for tests.
- Filters to network.exposable functions only when enrichment fields
  are present; otherwise treats every function as exposable.
- FunctionSignature dataclass: name / category / params / return_type
  / decode_per_param / encode_return / description, all populated
  from the catalog (enriched or bare).
- dispatch(function_name, params) -> Any:
  * validates the parameter set against the catalog signature
    (missing or unexpected names raise TypeError)
  * resolves the MEOS function via an injected resolver callable
    (production: getattr(pymeos.functions, name); tests: stub
    registry)
  * invokes it with the validated keyword args
  * returns the result; the caller owns encoding to JSON / WKB

tests/test_dispatcher.py (12 tests, all passing locally):

- catalog load (default path, explicit path, FileNotFoundError)
- FunctionSignature.from_catalog_entry (basic fields, enriched wire
  metadata, fallback when wire absent, non-exposable filtering)
- dispatch contract (resolver invocation, unknown function, missing
  param, unexpected param, default stub resolver)
- integration sanity (the 5 MovFeat dispatch candidates named in the
  ingestion plan are present in the vendored catalog)

What this PR does NOT change:

- Existing hand-written endpoint modules in resource/* remain
  unchanged. The plan's 5 REPLACE candidates migrate to the
  dispatcher module-by-module in follow-up PRs:
  temporal_geom_seq/, temporal_geom_query/{velocity,acceleration,
  distance}, temporal_properties/.
- PyMEOS is not yet a dependency (the dispatcher is resolver-
  agnostic; the production resolver lands when the first endpoint
  migrates).

Stacks on MobilityDB#4 (vendor MEOS-API artefacts) so vendor/meos-api/meos-idl.json
is in the tree.
Stacks on the MobilityDB#6 dispatcher foundation.  Adds the two layers a
production endpoint migration needs alongside the dispatcher:

mobilityapi/resolvers.py:
  - stub_resolver(registry)    — explicit name->callable map for tests
  - pymeos_resolver()          — production resolver that looks up
                                 functions in pymeos.functions; lazy-
                                 imports PyMEOS, raises ImportError
                                 with an actionable message when it's
                                 absent
  - default_resolver(prefer_pymeos=True) — production-first probe
                                 with a stub fallback that raises
                                 NotImplementedError on first call

mobilityapi/wire.py:
  - WireCodec                  — keyed by encoding name (mfjson, text,
                                 wkb, hexwkb); decode wire-value to
                                 PyMEOS obj; encode PyMEOS obj back
  - stub_codec(decoders, encoders) — explicit-map constructor for tests
  - pymeos_codec()             — production codec bridging to PyMEOS
                                 factory entry points
  - ENCODING_{MFJSON,TEXT,WKB,HEXWKB} — canonical encoding-name
                                 constants matching the catalog's
                                 x-meos-{decode,encode} fields

mobilityapi/__init__.py re-exports all three names so endpoint
migrations import from one module.

15 new unit tests (tests/test_resolvers.py + tests/test_wire.py),
all passing locally.  CI workflow's pytest job is extended to cover
all three test files together.

Production wiring lands when the first endpoint migrates: install
pymeos, replace getattr(pymeos.functions, name) plumbing with
default_resolver(), point WireCodec at pymeos_codec().  The
intervening migration PRs are bounded ~50-100 LoC each.
estebanzimanyi added a commit to estebanzimanyi/MobilityAPI that referenced this pull request May 21, 2026
Adds mobilityapi/app.py + two routers that expose the catalog-driven
Dispatcher (PR MobilityDB#6) and WireCodec (PR MobilityDB#7) as HTTP endpoints:

  - GET  /catalog          -> list dispatcher-exposable functions
  - GET  /catalog/{name}   -> full signature for one function
  - POST /functions/{name} -> invoke with JSON body, decode/encode
                              opaque MEOS types via the WireCodec

The app is built by create_app(dispatcher, codec) — both dependencies
are explicit; no global singletons. Production wires both to PyMEOS;
tests pass stubs.

The POST /functions/{name} flow:
  1. Decode opaque-type params via codec.decode(encoding, wire_value).
  2. Dispatch via Dispatcher.dispatch(name, params).
  3. Encode the result via codec.encode(encoding, value) if the catalog
     marks the return as serialised.

Error mapping:
  - Unknown function           -> 404
  - Missing / extra parameters -> 400
  - Param encoding has no codec decoder -> 400
  - Result encoding has no codec encoder -> 500

tests/test_app.py: 11 HTTP-level tests against a tiny in-test catalog
covering scalar, serialised-in / scalar-out, and serialised-in /
serialised-out shapes, plus the four error paths. All 38 framework
tests pass.
estebanzimanyi added a commit to estebanzimanyi/MobilityAPI that referenced this pull request May 21, 2026
Adds mobilityapi/app.py + two routers that expose the catalog-driven
Dispatcher (PR MobilityDB#6) and WireCodec (PR MobilityDB#7) as HTTP endpoints:

  - GET  /catalog          -> list dispatcher-exposable functions
  - GET  /catalog/{name}   -> full signature for one function
  - POST /functions/{name} -> invoke with JSON body, decode/encode
                              opaque MEOS types via the WireCodec

The app is built by create_app(dispatcher, codec) — both dependencies
are explicit; no global singletons. Production wires both to PyMEOS;
tests pass stubs.

The POST /functions/{name} flow:
  1. Decode opaque-type params via codec.decode(encoding, wire_value).
  2. Dispatch via Dispatcher.dispatch(name, params).
  3. Encode the result via codec.encode(encoding, value) if the catalog
     marks the return as serialised.

Error mapping:
  - Unknown function           -> 404
  - Missing / extra parameters -> 400
  - Param encoding has no codec decoder -> 400
  - Result encoding has no codec encoder -> 500

tests/test_app.py: 11 HTTP-level tests against a tiny in-test catalog
covering scalar, serialised-in / scalar-out, and serialised-in /
serialised-out shapes, plus the four error paths. All 38 framework
tests pass.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant