Skip to content

Commit dd82d11

Browse files
authored
Merge pull request #235 from rkvst/mmwilder26/jpn_createartist_albuminfo
Renaming Create Asset and Events Notebook
2 parents 447b58c + 5bd6432 commit dd82d11

File tree

4 files changed

+47
-53
lines changed

4 files changed

+47
-53
lines changed

archivist/notebooks/Create Asset and Events.ipynb renamed to archivist/notebooks/Create Artist and Album Release Info.ipynb

Lines changed: 37 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"id": "2370bfb7",
66
"metadata": {},
77
"source": [
8-
"## Create Asset and Events"
8+
"## Create Artist and Album Release Info"
99
]
1010
},
1111
{
@@ -186,30 +186,30 @@
186186
"output_type": "stream",
187187
"text": [
188188
"Asset {\n",
189-
" \"identity\": \"assets/cbd21a61-c126-4c02-b525-add1a74fb802\",\n",
189+
" \"identity\": \"assets/63b6c2ae-c8f8-4e3b-93ae-e78339f56647\",\n",
190190
" \"behaviours\": [\n",
191191
" \"RecordEvidence\",\n",
192192
" \"Builtin\",\n",
193193
" \"AssetCreator\",\n",
194194
" \"Attachments\"\n",
195195
" ],\n",
196196
" \"attributes\": {\n",
197+
" \"arc_description\": \"British Soul Singer\",\n",
198+
" \"arc_display_name\": \"Adele Laurie Blue Adkins\",\n",
197199
" \"arc_display_type\": \"Artists\",\n",
198-
" \"artistid\": \"666769323\",\n",
200+
" \"artistid\": \"973434267\",\n",
199201
" \"genre\": \"Soul\",\n",
200-
" \"stage_name\": \"Adele\",\n",
201-
" \"arc_description\": \"British Soul Singer\",\n",
202-
" \"arc_display_name\": \"Adele Laurie Blue Adkins\"\n",
202+
" \"stage_name\": \"Adele\"\n",
203203
" },\n",
204204
" \"confirmation_status\": \"CONFIRMED\",\n",
205205
" \"tracked\": \"TRACKED\",\n",
206-
" \"owner\": \"0xe889E67FdBa658C6f27ccBDa98D9d1B5500Dbbce\",\n",
207-
" \"at_time\": \"2023-01-16T11:50:50Z\",\n",
206+
" \"owner\": \"0x5284e740A744F075E402f7fB0c4485532ddf4Af8\",\n",
207+
" \"at_time\": \"2023-06-01T19:55:06Z\",\n",
208208
" \"storage_integrity\": \"TENANT_STORAGE\",\n",
209209
" \"proof_mechanism\": \"SIMPLE_HASH\",\n",
210-
" \"chain_id\": \"827586838445807967\",\n",
210+
" \"chain_id\": \"8275868384\",\n",
211211
" \"public\": false,\n",
212-
" \"tenant_identity\": \"tenant/9bfb80ee-81f6-40dc-b5c7-1c7fb2fb9866\"\n",
212+
" \"tenant_identity\": \"tenant/0a62f7c9-fd7b-4791-8041-01218d839ec1\"\n",
213213
"}\n"
214214
]
215215
}
@@ -239,72 +239,72 @@
239239
"text": [
240240
"Creating Events\n",
241241
"Event for Album 19 {\n",
242-
" \"identity\": \"assets/cbd21a61-c126-4c02-b525-add1a74fb802/events/dff5e8e1-0933-4dbb-a122-a6a422b5a27e\",\n",
243-
" \"asset_identity\": \"assets/cbd21a61-c126-4c02-b525-add1a74fb802\",\n",
242+
" \"identity\": \"assets/63b6c2ae-c8f8-4e3b-93ae-e78339f56647/events/58483156-1c9c-4e9e-be57-d65672ea70d9\",\n",
243+
" \"asset_identity\": \"assets/63b6c2ae-c8f8-4e3b-93ae-e78339f56647\",\n",
244244
" \"event_attributes\": {\n",
245-
" \"relase_year\": \"2008\",\n",
246245
" \"album_name\": \"19\",\n",
247246
" \"arc_description\": \"Artist Information\",\n",
248-
" \"arc_display_type\": \"Album Release\"\n",
247+
" \"arc_display_type\": \"Album Release\",\n",
248+
" \"relase_year\": \"2008\"\n",
249249
" },\n",
250250
" \"asset_attributes\": {},\n",
251251
" \"operation\": \"Record\",\n",
252252
" \"behaviour\": \"RecordEvidence\",\n",
253-
" \"timestamp_declared\": \"2023-01-16T11:50:56Z\",\n",
254-
" \"timestamp_accepted\": \"2023-01-16T11:50:56Z\",\n",
255-
" \"timestamp_committed\": \"2023-01-16T11:50:56.619910777Z\",\n",
253+
" \"timestamp_declared\": \"2023-06-01T19:55:12Z\",\n",
254+
" \"timestamp_accepted\": \"2023-06-01T19:55:12Z\",\n",
255+
" \"timestamp_committed\": \"2023-06-01T19:55:12.467938549Z\",\n",
256256
" \"principal_declared\": {\n",
257257
" \"issuer\": \"https://app.rkvst.io/appidpv1\",\n",
258-
" \"subject\": \"437bd138-dade-4346-aadd-dfdfee51ddf4\",\n",
259-
" \"display_name\": \"Test Notebooks\",\n",
258+
" \"subject\": \"43a271b9-5b25-4740-aa9f-1cbd51ed3625\",\n",
259+
" \"display_name\": \"mwilder26\",\n",
260260
" \"email\": \"\"\n",
261261
" },\n",
262262
" \"principal_accepted\": {\n",
263263
" \"issuer\": \"https://app.rkvst.io/appidpv1\",\n",
264-
" \"subject\": \"437bd138-dade-4346-aadd-dfdfee51ddf4\",\n",
265-
" \"display_name\": \"Test Notebooks\",\n",
264+
" \"subject\": \"43a271b9-5b25-4740-aa9f-1cbd51ed3625\",\n",
265+
" \"display_name\": \"mwilder26\",\n",
266266
" \"email\": \"\"\n",
267267
" },\n",
268268
" \"confirmation_status\": \"CONFIRMED\",\n",
269269
" \"transaction_id\": \"\",\n",
270270
" \"block_number\": 0,\n",
271271
" \"transaction_index\": 0,\n",
272-
" \"from\": \"0xe889E67FdBa658C6f27ccBDa98D9d1B5500Dbbce\",\n",
273-
" \"tenant_identity\": \"tenant/9bfb80ee-81f6-40dc-b5c7-1c7fb2fb9866\"\n",
272+
" \"from\": \"0x5284e740A744F075E402f7fB0c4485532ddf4Af8\",\n",
273+
" \"tenant_identity\": \"tenant/0a62f7c9-fd7b-4791-8041-01218d839ec1\"\n",
274274
"}\n",
275275
"Event for Album 21 {\n",
276-
" \"identity\": \"assets/cbd21a61-c126-4c02-b525-add1a74fb802/events/f74099ab-aab4-48aa-9654-0a09ad324d9b\",\n",
277-
" \"asset_identity\": \"assets/cbd21a61-c126-4c02-b525-add1a74fb802\",\n",
276+
" \"identity\": \"assets/63b6c2ae-c8f8-4e3b-93ae-e78339f56647/events/c637cfca-df4e-48ae-b434-6a04e9bf2a50\",\n",
277+
" \"asset_identity\": \"assets/63b6c2ae-c8f8-4e3b-93ae-e78339f56647\",\n",
278278
" \"event_attributes\": {\n",
279-
" \"arc_description\": \"Artist Information\",\n",
280279
" \"arc_display_type\": \"Album Release\",\n",
281280
" \"relase_year\": \"2011\",\n",
282-
" \"album_name\": \"21\"\n",
281+
" \"album_name\": \"21\",\n",
282+
" \"arc_description\": \"Artist Information\"\n",
283283
" },\n",
284284
" \"asset_attributes\": {},\n",
285285
" \"operation\": \"Record\",\n",
286286
" \"behaviour\": \"RecordEvidence\",\n",
287-
" \"timestamp_declared\": \"2023-01-16T11:50:57Z\",\n",
288-
" \"timestamp_accepted\": \"2023-01-16T11:50:57Z\",\n",
289-
" \"timestamp_committed\": \"2023-01-16T11:50:57.963815260Z\",\n",
287+
" \"timestamp_declared\": \"2023-06-01T19:55:13Z\",\n",
288+
" \"timestamp_accepted\": \"2023-06-01T19:55:13Z\",\n",
289+
" \"timestamp_committed\": \"2023-06-01T19:55:13.931375941Z\",\n",
290290
" \"principal_declared\": {\n",
291291
" \"issuer\": \"https://app.rkvst.io/appidpv1\",\n",
292-
" \"subject\": \"437bd138-dade-4346-aadd-dfdfee51ddf4\",\n",
293-
" \"display_name\": \"Test Notebooks\",\n",
292+
" \"subject\": \"43a271b9-5b25-4740-aa9f-1cbd51ed3625\",\n",
293+
" \"display_name\": \"mwilder26\",\n",
294294
" \"email\": \"\"\n",
295295
" },\n",
296296
" \"principal_accepted\": {\n",
297297
" \"issuer\": \"https://app.rkvst.io/appidpv1\",\n",
298-
" \"subject\": \"437bd138-dade-4346-aadd-dfdfee51ddf4\",\n",
299-
" \"display_name\": \"Test Notebooks\",\n",
298+
" \"subject\": \"43a271b9-5b25-4740-aa9f-1cbd51ed3625\",\n",
299+
" \"display_name\": \"mwilder26\",\n",
300300
" \"email\": \"\"\n",
301301
" },\n",
302302
" \"confirmation_status\": \"CONFIRMED\",\n",
303303
" \"transaction_id\": \"\",\n",
304304
" \"block_number\": 0,\n",
305305
" \"transaction_index\": 0,\n",
306-
" \"from\": \"0xe889E67FdBa658C6f27ccBDa98D9d1B5500Dbbce\",\n",
307-
" \"tenant_identity\": \"tenant/9bfb80ee-81f6-40dc-b5c7-1c7fb2fb9866\"\n",
306+
" \"from\": \"0x5284e740A744F075E402f7fB0c4485532ddf4Af8\",\n",
307+
" \"tenant_identity\": \"tenant/0a62f7c9-fd7b-4791-8041-01218d839ec1\"\n",
308308
"}\n"
309309
]
310310
}
@@ -317,14 +317,6 @@
317317
"event_two = create_release(arch, asset, album_name=\"21\", release=\"2011\")\n",
318318
"print(\"Event for Album 21\", json_dumps(event_two, indent=4))"
319319
]
320-
},
321-
{
322-
"cell_type": "code",
323-
"execution_count": 10,
324-
"id": "fe9cdd06",
325-
"metadata": {},
326-
"outputs": [],
327-
"source": []
328320
}
329321
],
330322
"metadata": {
@@ -343,7 +335,7 @@
343335
"name": "python",
344336
"nbconvert_exporter": "python",
345337
"pygments_lexer": "ipython3",
346-
"version": "3.9.5 (v3.9.5:0a7dcbdb13, May 3 2021, 13:17:02) \n[Clang 6.0 (clang-600.0.57)]"
338+
"version": "3.8.15"
347339
},
348340
"vscode": {
349341
"interpreter": {

docs/notebooks.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Download the notebooks into a suitable folder:
5454
:maxdepth: 2
5555
:caption: Basic Asset and Event Examples
5656

57-
notebooks/Create Asset and Events
57+
notebooks/Create Artist and Album Release Info
5858
notebooks/Find Asset and Event Creation
5959
notebooks/Find Asset and Create Attachment
6060
notebooks/Create Event with Verified Domain

functests/execnotebooks.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,15 @@ def check_notebook_cell(self, notebook, cellno):
7474
)
7575
LOGGER.debug(out)
7676

77-
def test_01_create_asset_and_events(self):
77+
def test_01_create_artist_albuminfo(self):
7878
"""
79-
Test create_asset_and_events
79+
Test create_artist_albuminfo
8080
"""
8181
with testbook(
82-
"archivist/notebooks/Create Asset and Events.ipynb", execute=True
82+
"archivist/notebooks/Create Artist and Album Release Info.ipynb",
83+
execute=True,
8384
) as notebook:
84-
LOGGER.debug("\ncreate_asset_and_events")
85+
LOGGER.debug("\ncreate_artist_albuminfo")
8586
self.basic_notebook_test(notebook)
8687
self.assertGreater(
8788
int(notebook.ref("RKVST_UNIQUE_ID")),

unittests/testnotebooks.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,13 @@ def basic_notebook_test(self, notebook):
146146
msg="Incorrect cell output",
147147
)
148148

149-
def test_create_asset_and_events(self):
149+
def test_create_artist_albuminfo(self):
150150
"""
151-
Test create_asset_and_events
151+
Test create_artist_albuminfo
152152
"""
153153
with testbook(
154-
"archivist/notebooks/Create Asset and Events.ipynb", execute=(1, 2, 4, 5)
154+
"archivist/notebooks/Create Artist and Album Release Info.ipynb",
155+
execute=(1, 2, 4, 5),
155156
) as notebook:
156157
self.basic_notebook_test(notebook)
157158

0 commit comments

Comments
 (0)