Plugin schemas

.circleci/config.yml

@@ -414,6 +414,8 @@ jobs:
           name: Install graphviz
           command: sudo apt-get install -y xvfb libgraphviz-dev graphviz
       - run: *wait_for_flowdb
+      # Ensure that flowmachine's .egg-info is created so that entry points are available
+      - run: pipenv install --dev
       - run:
           name: Run tests
           command: |

flowmachine/Pipfile

@@ -42,6 +42,7 @@ cachey = "*"
 approvaltests = "*"
 watchdog = "*"
 ipdb = "*"
+flowmachine = {editable = true,path = "."}
 
 [requires]
 python_version = "3.7"

flowmachine/flowmachine/core/server/action_handlers.py

@@ -32,8 +32,8 @@
 from flowmachine.core.query_state import QueryStateMachine, QueryState
 from flowmachine.utils import convert_dict_keys_to_strings
 from .exceptions import FlowmachineServerError
-from .query_schemas import FlowmachineQuerySchema, GeographySchema
-from .query_schemas.flowmachine_query import get_query_schema
+from .query_schemas.flowmachine_query import get_query_schema, FlowmachineQuerySchema
+from .query_schemas.geography import GeographySchema
 from .zmq_helpers import ZMQReply
 
 __all__ = ["perform_action"]

flowmachine/flowmachine/core/server/query_schemas/__init__.py

@@ -1,7 +1,3 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-from .base_exposed_query import BaseExposedQuery
-from .flowmachine_query import FlowmachineQuerySchema
-from .geography import GeographySchema

flowmachine/flowmachine/core/server/query_schemas/active_at_reference_location_counts.py

@@ -15,13 +15,13 @@
     RedactedActiveAtReferenceLocationCounts,
 )
 
-from . import BaseExposedQuery
-
 __all__ = [
     "ActiveAtReferenceLocationCountsSchema",
     "ActiveAtReferenceLocationCountsExposed",
 ]
 
+from .base_exposed_query import BaseExposedQuery
+
 from .base_schema import BaseSchema
 
 from .reference_location import ReferenceLocationSchema

flowmachine/flowmachine/core/server/query_schemas/consecutive_trips_od_matrix.py

@@ -12,7 +12,7 @@
 from flowmachine.features.location.consecutive_trips_od_matrix import (
     ConsecutiveTripsODMatrix,
 )
-from . import BaseExposedQuery
+from .base_exposed_query import BaseExposedQuery
 from .base_schema import BaseSchema
 from .custom_fields import SubscriberSubset, ISODateTime
 from .aggregation_unit import AggregationUnit, get_spatial_unit_obj