Skip to content

Commit 048f16f

Browse files
committed
Handle newer jupyter_events wants string version
1 parent e544fa1 commit 048f16f

File tree

7 files changed

+14
-14
lines changed

7 files changed

+14
-14
lines changed

jupyter_server/event_schemas/contents_service/v1.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"$id": https://events.jupyter.org/jupyter_server/contents_service/v1
2-
version: 1
2+
version: "1"
33
title: Contents Manager activities
44
personal-data: true
55
description: |

jupyter_server/event_schemas/gateway_client/v1.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"$id": https://events.jupyter.org/jupyter_server/gateway_client/v1
2-
version: 1
2+
version: "1"
33
title: Gateway Client activities.
44
personal-data: true
55
description: |

jupyter_server/event_schemas/kernel_actions/v1.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"$id": https://events.jupyter.org/jupyter_server/kernel_actions/v1
2-
version: 1
2+
version: "1"
33
title: Kernel Manager activities
44
personal-data: true
55
description: |

jupyter_server/services/events/handlers.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ def validate_model(
8686
# jupyter_events raises a useful error, so there's no need to
8787
# handle that case here.
8888
schema = registry.get(schema_id)
89-
version = int(cast(int, data.get("version")))
89+
version = str(cast(str, data.get("version")))
9090
if schema.version != version:
91-
message = f"Unregistered version: {version}{schema.version} for `{schema_id}`"
91+
message = f"Unregistered version: {version!r}{schema.version!r} for `{schema_id}`"
9292
raise Exception(message)
9393

9494

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ dependencies = [
4040
"tornado>=6.2.0",
4141
"traitlets>=5.6.0",
4242
"websocket-client>=1.7",
43-
"jupyter_events>=0.9.0",
43+
"jupyter_events>=0.11.0",
4444
"overrides>=5.0"
4545
]
4646

tests/services/events/mock_event.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
$id: http://event.mock.jupyter.org/message
2-
version: 1
2+
version: "1"
33
title: Message
44
description: |
55
Emit a message

tests/services/events/test_api.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ async def test_subscribe_websocket(event_logger, jp_ws_fetch):
4545
payload_1 = """\
4646
{
4747
"schema_id": "http://event.mock.jupyter.org/message",
48-
"version": 1,
48+
"version": "1",
4949
"data": {
5050
"event_message": "Hello, world!"
5151
},
@@ -56,7 +56,7 @@ async def test_subscribe_websocket(event_logger, jp_ws_fetch):
5656
payload_2 = """\
5757
{
5858
"schema_id": "http://event.mock.jupyter.org/message",
59-
"version": 1,
59+
"version": "1",
6060
"data": {
6161
"event_message": "Hello, world!"
6262
}
@@ -92,7 +92,7 @@ async def test_post_event(jp_fetch, event_logger_sink, payload):
9292

9393
payload_4 = """\
9494
{
95-
"version": 1,
95+
"version": "1",
9696
"data": {
9797
"event_message": "Hello, world!"
9898
}
@@ -102,14 +102,14 @@ async def test_post_event(jp_fetch, event_logger_sink, payload):
102102
payload_5 = """\
103103
{
104104
"schema_id": "http://event.mock.jupyter.org/message",
105-
"version": 1
105+
"version": "1"
106106
}
107107
"""
108108

109109
payload_6 = """\
110110
{
111111
"schema_id": "event.mock.jupyter.org/message",
112-
"version": 1,
112+
"version": "1",
113113
"data": {
114114
"event_message": "Hello, world!"
115115
},
@@ -120,7 +120,7 @@ async def test_post_event(jp_fetch, event_logger_sink, payload):
120120
payload_7 = """\
121121
{
122122
"schema_id": "http://event.mock.jupyter.org/UNREGISTERED-SCHEMA",
123-
"version": 1,
123+
"version": "1",
124124
"data": {
125125
"event_message": "Hello, world!"
126126
}
@@ -130,7 +130,7 @@ async def test_post_event(jp_fetch, event_logger_sink, payload):
130130
payload_8 = """\
131131
{
132132
"schema_id": "http://event.mock.jupyter.org/message",
133-
"version": 1,
133+
"version": "1",
134134
"data": {
135135
"message": "Hello, world!"
136136
}

0 commit comments

Comments
 (0)