Skip to content
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

[jormungandr] call kraken to compute fare only when pt_planner=loki #4129

Merged
merged 3 commits into from
Oct 6, 2023
Merged

[jormungandr] call kraken to compute fare only when pt_planner=loki #4129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
605db8b
make the compute fare calls only for pt_planner=loki
pbench Oct 5, 2023
5021426
try to fix test
pbench Oct 6, 2023
e9e75f4
typo
pbench Oct 6, 2023
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
4 changes: 2 additions & 2 deletions source/jormungandr/jormungandr/scenarios/distributed.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ def finalise_journeys(self, future_manager, request, responses, context, instanc
for journey in journeys_to_complete:
transfer_pool.async_compute_transfer(journey.pt_journeys.sections)

if request['_loki_compute_pt_journey_fare'] is True:
if request['_loki_compute_pt_journey_fare'] is True and request['_pt_planner'] == "loki":
for response in responses:
pt_journey_fare_pool.async_compute_fare(response, request_id)

Expand All @@ -346,7 +346,7 @@ def finalise_journeys(self, future_manager, request, responses, context, instanc
journeys=journeys_to_complete,
request_id="{}_complete_pt_journey".format(request_id),
)
if request['_loki_compute_pt_journey_fare'] is True:
if request['_loki_compute_pt_journey_fare'] is True and request['_pt_planner'] == "loki":
wait_and_complete_pt_journey_fare(
pt_elements=journeys_to_complete, pt_journey_fare_pool=pt_journey_fare_pool
)
Expand Down
4 changes: 3 additions & 1 deletion source/jormungandr/tests/routing_tests_experimental.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,9 @@ def test_journey_tickets_pt_journey_fare(self):
assert default_tickets[0]['id'] == response['journeys'][1]['fare']['links'][0]['id']
assert default_tickets[1]['id'] == response['journeys'][0]['fare']['links'][0]['id']

query_pt_journey_fare = query + "&_loki_pt_journey_fare=kraken&_loki_compute_pt_journey_fare=true"
query_pt_journey_fare = (
query + "&_loki_pt_journey_fare=kraken&_loki_compute_pt_journey_fare=true&_pt_planner=loki"
)
response = self.query_region(query_pt_journey_fare)

new_tickets = response['tickets']
Expand Down
11 changes: 10 additions & 1 deletion source/jormungandr/tests/tests_mechanism.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,16 @@ def kill_all_krakens(cls):
@classmethod
def create_dummy_json(cls):
for name in cls.krakens_pool:
instance_config = {"key": name, "zmq_socket": cls._get_zmq_socket_name(name)}
instance_config = {
"key": name,
"zmq_socket": cls._get_zmq_socket_name(name),
"pt_planners": {
"loki": {
"class": "jormungandr.pt_planners.loki.Loki",
"args": {"timeout": 10000, "zmq_socket": cls._get_zmq_socket_name(name)},
}
},
}
instance_config.update(cls.data_sets[name].get('instance_config', {}))
with open(os.path.join(krakens_dir, name) + '.json', 'w') as f:
logging.debug("writing ini file {} for {}".format(f.name, name))
Expand Down
2 changes: 1 addition & 1 deletion source/navitiacommon/navitiacommon/default_values.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@

# loki pt journey fare
loki_pt_journey_fare = 'kraken'
loki_compute_pt_journey_fare = False
loki_compute_pt_journey_fare = True
loki_pt_journey_fare_configurations = dict() # type: dict


Expand Down