From 04d1cf99215d13ab83c7368432021d7e9aeee2c6 Mon Sep 17 00:00:00 2001 From: ciioprof0 <116185051+ciioprof0@users.noreply.github.com> Date: Sat, 17 Aug 2024 05:38:52 -0700 Subject: [PATCH] Update api route --- ling508/api.py | 2 +- ling508/demos/demo_clex_importer.ipynb | 383 +++++++++++++------------ ling508/tests/test_90_e2e_local.py | 2 +- ling508/tests/test_95_e2e_ci.py | 2 +- ling508/web/stixd.html | 29 +- 5 files changed, 214 insertions(+), 204 deletions(-) diff --git a/ling508/api.py b/ling508/api.py index 467a787..85bc179 100644 --- a/ling508/api.py +++ b/ling508/api.py @@ -27,7 +27,7 @@ app = Flask(__name__, static_folder='D:/OneDrive/Code/hltms/stixd/ling508/web') -@app.route('/ling508/web/stixd.html') +@app.route('/') def serve_form(): """Serves the form for importing Clex entries.""" return app.send_static_file('stixd.html') diff --git a/ling508/demos/demo_clex_importer.ipynb b/ling508/demos/demo_clex_importer.ipynb index 99f0ceb..6689900 100644 --- a/ling508/demos/demo_clex_importer.ipynb +++ b/ling508/demos/demo_clex_importer.ipynb @@ -29,7 +29,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "The STIX-D Use Case L1 involves seeding the `stixd_corpus.lexicon` database table with lexical entries from the ACE Common Lexicon (Clex) or similar files. An administrator provides a URI to the lexicon file, and the system connects to the local database via the `mysql_repository.py` module. For each line in the lexicon file, the system extracts relevant character strings to create a word tag and form, generates a SHA256 hash of these components, and checks for the hash in the `lexicon` table. If the hash exists, it links the existing entry with a source ID; if not, it creates a new entry. The system also imports additional arguments into appropriate fields and outputs summary information or error messages as necessary." + "The STIX-D Use Case L1 involves seeding the `stixd_corpus.lexicon` database table with lexical entries from the ACE Common Lexicon (Clex) or similar files. An administrator provides a URI to the lexicon file, and the system connects to the local database via the `mysql_repository.py` module. For each line in the lexicon file, the system extracts relevant character strings to create a word tag and form, generates a SHA256 hash of these components, and checks for the hash in the `lexicon` table. If the hash exists, it links the existing entry with an existing source ID; if not, it creates a new entry. The system also imports additional arguments into appropriate fields and outputs summary information or error messages as necessary." ] }, { @@ -142,7 +142,7 @@ }, { "cell_type": "code", - "execution_count": 1, + "execution_count": 6, "metadata": {}, "outputs": [], "source": [ @@ -158,9 +158,18 @@ }, { "cell_type": "code", - "execution_count": 2, + "execution_count": 7, "metadata": {}, - "outputs": [], + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "The sql extension is already loaded. To reload it, use:\n", + " %reload_ext sql\n" + ] + } + ], "source": [ "# Import Standard Libraries\n", "import os\n", @@ -193,7 +202,7 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": 8, "metadata": {}, "outputs": [], "source": [ @@ -219,7 +228,7 @@ }, { "cell_type": "code", - "execution_count": 4, + "execution_count": 9, "metadata": {}, "outputs": [ { @@ -254,7 +263,7 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": 10, "metadata": {}, "outputs": [ { @@ -302,222 +311,222 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": 11, "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ - "Saved STIX object with ID: x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Saved STIX object with ID: x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: 67e9b1c5cbd53045919deda792be49b18b41a09b3bd328f9cc406bb27d951f62 for adv - fast\n", "Inserted entry with lex_id: 1 into lexicon\n", - "Linking lex_id 1 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 1 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 1 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 1 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: 38a31bf0527ff6fd23c6be74bfba58c46dbad709ce90b6d09b9a26f103a326b5 for adv_comp - faster\n", "Inserted entry with lex_id: 2 into lexicon\n", - "Linking lex_id 2 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 2 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 2 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 2 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: 55fee0f355e343b2c6a4d63b72a8ea8bcaa1a71698ada04e01533a8dc98fb4ee for adv_sup - fastest\n", "Inserted entry with lex_id: 3 into lexicon\n", - "Linking lex_id 3 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 3 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 3 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 3 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: b0a248290b9aa18bfbbbfd5367dc0cc0dc82a9e90dd83b88cce59361b8d67e8a for adv - quickly\n", "Inserted entry with lex_id: 4 into lexicon\n", - "Linking lex_id 4 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 4 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 4 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 4 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: bbe9bafa7a2a6e250fdf482a7c46217d7c63ccee917b3ae48324b61659c7e32d for adj_itr - large\n", "Inserted entry with lex_id: 5 into lexicon\n", - "Linking lex_id 5 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 5 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 5 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 5 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: bf10c6415fdedfef6bb41e276ee11b5411b9735e04279a725fd1e10f73efd5a3 for adj_itr_comp - larger\n", "Inserted entry with lex_id: 6 into lexicon\n", - "Linking lex_id 6 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 6 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 6 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 6 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: 272e32e00264453eae65c42e85ebd4e63d2050652adf2a83e6251f58d44c1f80 for adj_itr_sup - largest\n", "Inserted entry with lex_id: 7 into lexicon\n", - "Linking lex_id 7 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 7 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 7 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 7 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: 0a071608bacedfe582720a7eac91a086c2fd4b8310886756596e55a19831f1b2 for adj_itr - expensive\n", "Inserted entry with lex_id: 8 into lexicon\n", - "Linking lex_id 8 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 8 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 8 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 8 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: 3185ec15fd8fee48b0ce5f3cf0702e7342b8a79e924b9560672d46f85b57cf0d for adj_tr - valid-for\n", "Inserted entry with lex_id: 9 into lexicon\n", - "Linking lex_id 9 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 9 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 9 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 9 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: bea4050ddc4a98586180049a5701670bfda43dfb33a9e9d439e09ea6658d8b49 for adj_tr - fond-of\n", "Inserted entry with lex_id: 10 into lexicon\n", - "Linking lex_id 10 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 10 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 10 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 10 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: f9af59d37b5027585c5c367ff09c9ae6c9a9c2a572f0c2c6e31cb7a477803f70 for adj_tr_comp - fonder-of\n", "Inserted entry with lex_id: 11 into lexicon\n", - "Linking lex_id 11 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 11 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 11 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 11 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: 0593075d289bc5204293471f2179dcb02b688666ab3f0609dc0707038bda6c19 for adj_tr_sup - fondest-of\n", "Inserted entry with lex_id: 12 into lexicon\n", - "Linking lex_id 12 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 12 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 12 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 12 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: ad8d6c20f19057bc423efd798ab1b7969e8d16b84175a5e1c8d6327f301c3555 for adj_tr - pessimistic-about\n", "Inserted entry with lex_id: 13 into lexicon\n", - "Linking lex_id 13 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 13 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 13 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 13 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: 81a4335048050be30cbe511f20aa06edd43edeace4e509c9dbe295d91f3d7c67 for noun_sg - woman\n", "Inserted entry with lex_id: 14 into lexicon\n", - "Linking lex_id 14 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 14 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 14 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 14 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: d94e7754776de6a607bd1401e97542788b8a5bcdd770a6743029ba3cb9281e9b for noun_pl - women\n", "Inserted entry with lex_id: 15 into lexicon\n", - "Linking lex_id 15 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 15 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 15 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 15 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: 3e750200b57ae141249f9a284aa994912f051b9cdaaabce0eab54d8f709786b4 for noun_sg - credit-card\n", "Inserted entry with lex_id: 16 into lexicon\n", - "Linking lex_id 16 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 16 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 16 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 16 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: ba1d673f62b614589363b57193e41fff0a55c16496de3390cd4bdebe05b66a5f for noun_pl - credit-cards\n", "Inserted entry with lex_id: 17 into lexicon\n", - "Linking lex_id 17 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 17 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 17 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 17 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: 7dd815d8b271ce4a800d0709cc47e4542ae83c20580fad16f0ce0ac47ab825cb for noun_sg - month\n", "Inserted entry with lex_id: 18 into lexicon\n", - "Linking lex_id 18 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 18 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 18 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 18 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: 6e7ab17fe3f242d10f360197f40646b443db6079d730e9d746c96824a2606336 for noun_pl - months\n", "Inserted entry with lex_id: 19 into lexicon\n", - "Linking lex_id 19 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 19 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 19 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 19 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: ab4b87413dcf986e3987394af66d8cd5b721d6e2e3414f0bf79b7180c496cffc for noun_mass - water\n", "Inserted entry with lex_id: 20 into lexicon\n", - "Linking lex_id 20 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 20 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 20 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 20 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: 1f47f35dd555019a4069f9ccbd73b6ca9aba50e65cba190c6c2234a0ec959550 for noun_mass - fear\n", "Inserted entry with lex_id: 21 into lexicon\n", - "Linking lex_id 21 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 21 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 21 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 21 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: 54eb36da1c2712a561a7f3d97ae4711be26e689a610a5b3bcc6cf8246b4bd328 for noun_mass - money\n", "Inserted entry with lex_id: 22 into lexicon\n", - "Linking lex_id 22 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 22 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 22 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 22 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: f0f05c2c9d5fbbca1a49caaf36e02cabd3e8008b6ba2e06dd4f3ad5af3fc6778 for mn_sg - kg\n", "Inserted entry with lex_id: 23 into lexicon\n", - "Linking lex_id 23 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 23 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 23 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 23 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: 4062f60546af1df473dca3885c5678bceba6f846a393bde85c9f062dd7b3e4e9 for mn_pl - kg\n", "Inserted entry with lex_id: 24 into lexicon\n", - "Linking lex_id 24 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 24 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 24 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 24 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: 355a5ac057c3579401933c1edab57acd83c4fff5af52b235fe6a6487740e7266 for mn_sg - m\n", "Inserted entry with lex_id: 25 into lexicon\n", - "Linking lex_id 25 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 25 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 25 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 25 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: bd00a278eb02fcda5e6953929b33fb7b722616288a41ffec7e161932b00a4f28 for mn_pl - m\n", "Inserted entry with lex_id: 26 into lexicon\n", - "Linking lex_id 26 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 26 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 26 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 26 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: 4dbd3783cd9aaba7e2c7b91cd8b7528fe090214cf231c438a2bbce6c469eae54 for mn_sg - °C\n", "Inserted entry with lex_id: 27 into lexicon\n", - "Linking lex_id 27 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 27 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 27 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 27 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: 0b159623ff61b9c0c6dcbade8aecbcf5a3ba43a5c78a7353af9d4fc9a89d387b for mn_pl - °C\n", "Inserted entry with lex_id: 28 into lexicon\n", - "Linking lex_id 28 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 28 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 28 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 28 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: cdb8203c69d244b96d0efc358b21bb7ecdfedaa377fc2d22174d202d514b60bd for pn_sg - John\n", "Inserted entry with lex_id: 29 into lexicon\n", - "Linking lex_id 29 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 29 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 29 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 29 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: c362d3b6c8f1563be3031c9a27e83307499ef757668783df75d1c2ade5a8dcdb for pn_sg - Nokia\n", "Inserted entry with lex_id: 30 into lexicon\n", - "Linking lex_id 30 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 30 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 30 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 30 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: b79f2d1e7257a89546b59cb6384c316c6a67b9090e0eb79e4945ab5203c5fcca for pndef_sg - Nile\n", "Inserted entry with lex_id: 31 into lexicon\n", - "Linking lex_id 31 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 31 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 31 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 31 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: 0ba13f88729a6598583fd0d63c2c946bbefb8e7084b49d1a6add9c13cd87615c for pndef_pl - United-Nations\n", "Inserted entry with lex_id: 32 into lexicon\n", - "Linking lex_id 32 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 32 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 32 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 32 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: ab1d4ceef2dea8b6524e093ed881a9b373c7399fdda1238c6d6a50e45cb2e5c1 for pn_sg - Mona-Lisa\n", "Inserted entry with lex_id: 33 into lexicon\n", - "Linking lex_id 33 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 33 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 33 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 33 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: 553a63ea05f5be1335cdbaf4776e9fefe7b739709bde3afbc52d13f90d7f0747 for pndef_sg - Mona-Lisa\n", "Inserted entry with lex_id: 34 into lexicon\n", - "Linking lex_id 34 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 34 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 34 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 34 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: ac7502fa73fb93115da3fdc332c095b93db172fb3c9da5342cb1d4efea1dbfa4 for iv_finsg - waits\n", "Inserted entry with lex_id: 35 into lexicon\n", - "Linking lex_id 35 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 35 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 35 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 35 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: efb99022f10de88cfa917fd5f2d22db31a264c47c446e39b745ecaf2104386d5 for iv_infpl - wait\n", "Inserted entry with lex_id: 36 into lexicon\n", - "Linking lex_id 36 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 36 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 36 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 36 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: 43b09b0fdca3918fdeffbdd00f9b9b1e36680a19e18a27b9ef837250aea760ff for iv_finsg - goes-away\n", "Inserted entry with lex_id: 37 into lexicon\n", - "Linking lex_id 37 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 37 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 37 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 37 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: ecc9360327520149b50d67f39339a5340963d1f856c8e2379694e5758b18b90f for iv_infpl - go-away\n", "Inserted entry with lex_id: 38 into lexicon\n", - "Linking lex_id 38 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 38 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 38 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 38 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: f02be7a15dcd7cca79dc9b1c141991d479120352658c50030c7268da9372e6ff for iv_finsg - walks\n", "Inserted entry with lex_id: 39 into lexicon\n", - "Linking lex_id 39 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 39 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 39 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 39 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: 31e757a6e9e9b7a3e8b7760ed46a8d8fac08fa4989bd1e2564178a466592fb0b for iv_infpl - walk\n", "Inserted entry with lex_id: 40 into lexicon\n", - "Linking lex_id 40 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 40 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 40 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 40 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: ee65aeba7add7b5c2bec1c8453b46d0686c74980f5b66e971d8e0fdf4be2f339 for tv_finsg - knows\n", "Inserted entry with lex_id: 41 into lexicon\n", - "Linking lex_id 41 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 41 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 41 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 41 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: 422c3c3b73090cafb154a7af0c97a4a8b6526d0c081ecfd3c4852555ca497274 for tv_infpl - know\n", "Inserted entry with lex_id: 42 into lexicon\n", - "Linking lex_id 42 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 42 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 42 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 42 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: 77ca0e15adaec7eb9f1e2b265d8c4aaea36eb3233610413ec08cbd2cc9e75602 for tv_pp - known\n", "Inserted entry with lex_id: 43 into lexicon\n", - "Linking lex_id 43 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 43 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 43 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 43 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: f7e5589db0c1cd8731249783f142502b70a9c4c81f2438a1a68d9a14466d7638 for tv_finsg - likes\n", "Inserted entry with lex_id: 44 into lexicon\n", - "Linking lex_id 44 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 44 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 44 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 44 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: 5662a9d8c3e47a4030ee3ce04f64b96d20f97050b43889b9c99a3d75bdcf2e87 for tv_infpl - like\n", "Inserted entry with lex_id: 45 into lexicon\n", - "Linking lex_id 45 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 45 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 45 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 45 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: f4758877070e53c2c6289823abd379e18f73118cf9427ba32004de974786bd71 for tv_pp - liked\n", "Inserted entry with lex_id: 46 into lexicon\n", - "Linking lex_id 46 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 46 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 46 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 46 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: ee6ebaf5ffc016337f2f65c9331f36a1fbe639b1f78ae0447d006d28d8056028 for tv_finsg - relates-to\n", "Inserted entry with lex_id: 47 into lexicon\n", - "Linking lex_id 47 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 47 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 47 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 47 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: 192eda123579168e6bd639ed1df16c5698e593c45a353c7dac8e4ba71a910a72 for tv_infpl - relate-to\n", "Inserted entry with lex_id: 48 into lexicon\n", - "Linking lex_id 48 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 48 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 48 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 48 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: 90837f23fb3398bbf7acd13a4734d872ad7561a56638f7d02aef58af5f950656 for tv_pp - related-to\n", "Inserted entry with lex_id: 49 into lexicon\n", - "Linking lex_id 49 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 49 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 49 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 49 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: 42f5f444d7d957ad84c5a633757577db59591b988579f53bd1f350baddaf9f03 for dv_finsg - shows\n", "Inserted entry with lex_id: 50 into lexicon\n", - "Linking lex_id 50 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 50 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 50 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 50 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: d14f9f05e5a0b45180e21ff9b1e2fbe467d23276236aa52fb37eb73fd340da91 for dv_infpl - show\n", "Inserted entry with lex_id: 51 into lexicon\n", - "Linking lex_id 51 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 51 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 51 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 51 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: 7cf576b300bbb026e4a7b5b4a8d792dc0f6e834354a4efe471977f2d71517a9a for dv_pp - shown\n", "Inserted entry with lex_id: 52 into lexicon\n", - "Linking lex_id 52 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 52 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 52 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 52 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: 42f5f444d7d957ad84c5a633757577db59591b988579f53bd1f350baddaf9f03 for dv_finsg - shows\n", "Entry already exists for hash: 42f5f444d7d957ad84c5a633757577db59591b988579f53bd1f350baddaf9f03\n", "Generated hash: d14f9f05e5a0b45180e21ff9b1e2fbe467d23276236aa52fb37eb73fd340da91 for dv_infpl - show\n", @@ -526,32 +535,32 @@ "Entry already exists for hash: 7cf576b300bbb026e4a7b5b4a8d792dc0f6e834354a4efe471977f2d71517a9a\n", "Generated hash: 4b9730c9ceecf1d5f810a4826903bb059c3e92371075ace397c16ed7d738418d for dv_finsg - forgives\n", "Inserted entry with lex_id: 53 into lexicon\n", - "Linking lex_id 53 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 53 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 53 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 53 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: 9b948431ccbbc7fe72acc6521239aa45db87345868a085fef14be2952cf73343 for dv_infpl - forgive\n", "Inserted entry with lex_id: 54 into lexicon\n", - "Linking lex_id 54 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 54 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 54 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 54 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: 87c13947298aa7164ca11f17ffb7cf6e0725519849e9cd3b369c99e69db9f417 for dv_pp - forgiven\n", "Inserted entry with lex_id: 55 into lexicon\n", - "Linking lex_id 55 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 55 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 55 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 55 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: 1b1a64cc34090572aa43370164020fb77fe5e26ea27e6841fb5da311c70db49e for dv_finsg - succeeds\n", "Inserted entry with lex_id: 56 into lexicon\n", - "Linking lex_id 56 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 56 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 56 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 56 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: 94cd50411086a27d99e36cea494fca14e31bfcdde6608e91b7d21b8abbfcba24 for dv_infpl - succeed\n", "Inserted entry with lex_id: 57 into lexicon\n", - "Linking lex_id 57 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 57 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 57 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 57 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: 8ee745975fad537905042b710e2f602f6c6bbe6c72f123b3596ce0b962f2b23f for dv_pp - succeeded\n", "Inserted entry with lex_id: 58 into lexicon\n", - "Linking lex_id 58 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 58 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 58 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 58 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Generated hash: 49416a90f7e5b5ab216b186657fa6a7e5219aaa07c0d4fc0dfa1373b2f2663b9 for prep - in\n", "Inserted entry with lex_id: 59 into lexicon\n", - "Linking lex_id 59 with stix_object_id x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", - "Successfully linked lex_id 59 with stix_uuid x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + "Linking lex_id 59 with stix_object_id x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", + "Successfully linked lex_id 59 with stix_uuid x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", "Import successful.\n", "New entries imported: 59\n", "Existing entries linked: 3\n", @@ -581,7 +590,7 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 12, "metadata": {}, "outputs": [ { @@ -622,7 +631,7 @@ }, { "cell_type": "code", - "execution_count": 8, + "execution_count": 13, "metadata": {}, "outputs": [ { @@ -717,7 +726,7 @@ " (5, 'adj_itr', 'large', 'large', 'NULL', 'bbe9bafa7a2a6e250fdf482a7c46217d7c63ccee917b3ae48324b61659c7e32d', None, None, None)]" ] }, - "execution_count": 8, + "execution_count": 13, "metadata": {}, "output_type": "execute_result" } @@ -729,7 +738,7 @@ }, { "cell_type": "code", - "execution_count": 9, + "execution_count": 14, "metadata": {}, "outputs": [ { @@ -769,13 +778,13 @@ " \n", " \n", " \n", - " x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + " x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", " x-stixd-clex\n", " user\n", " ACE Common Lexicon Import\n", " 2.1\n", - " 2024-08-17 11:11:29\n", - " 2024-08-17 11:11:29\n", + " 2024-08-17 12:15:54\n", + " 2024-08-17 12:15:54\n", " 0\n", " ["lexicon"]\n", " 100\n", @@ -793,10 +802,10 @@ "" ], "text/plain": [ - "[('x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4', 'x-stixd-clex', 'user', 'ACE Common Lexicon Import', '2.1', datetime.datetime(2024, 8, 17, 11, 11, 29), datetime.datetime(2024, 8, 17, 11, 11, 29), 0, '[\"lexicon\"]', 100, 'en', '[]', '[]', '[]', '[]', None, None, '[]', None)]" + "[('x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255', 'x-stixd-clex', 'user', 'ACE Common Lexicon Import', '2.1', datetime.datetime(2024, 8, 17, 12, 15, 54), datetime.datetime(2024, 8, 17, 12, 15, 54), 0, '[\"lexicon\"]', 100, 'en', '[]', '[]', '[]', '[]', None, None, '[]', None)]" ] }, - "execution_count": 9, + "execution_count": 14, "metadata": {}, "output_type": "execute_result" } @@ -808,7 +817,7 @@ }, { "cell_type": "code", - "execution_count": 10, + "execution_count": 15, "metadata": {}, "outputs": [ { @@ -831,37 +840,37 @@ " \n", " \n", " \n", - " x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + " x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", " 1\n", " \n", " \n", - " x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + " x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", " 2\n", " \n", " \n", - " x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + " x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", " 3\n", " \n", " \n", - " x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + " x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", " 4\n", " \n", " \n", - " x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4\n", + " x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255\n", " 5\n", " \n", " \n", "" ], "text/plain": [ - "[('x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4', 1),\n", - " ('x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4', 2),\n", - " ('x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4', 3),\n", - " ('x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4', 4),\n", - " ('x-stixd-clex--624af5ee-6ef1-4fd1-92fd-e5c439505fb4', 5)]" + "[('x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255', 1),\n", + " ('x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255', 2),\n", + " ('x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255', 3),\n", + " ('x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255', 4),\n", + " ('x-stixd-clex--6052abaa-8eaf-4378-86b6-b7a368673255', 5)]" ] }, - "execution_count": 10, + "execution_count": 15, "metadata": {}, "output_type": "execute_result" } @@ -893,7 +902,7 @@ }, { "cell_type": "code", - "execution_count": 11, + "execution_count": 16, "metadata": {}, "outputs": [ { @@ -901,7 +910,7 @@ "output_type": "stream", "text": [ "\u001b[32m.\u001b[0m\u001b[32m.\u001b[0m\u001b[32m.\u001b[0m\u001b[32m.\u001b[0m\u001b[32m.\u001b[0m\u001b[32m.\u001b[0m\u001b[32m.\u001b[0m\u001b[32m.\u001b[0m\u001b[32m.\u001b[0m\u001b[32m.\u001b[0m\u001b[32m.\u001b[0m\u001b[32m.\u001b[0m\u001b[32m.\u001b[0m\u001b[32m.\u001b[0m\u001b[32m.\u001b[0m\u001b[32m.\u001b[0m\u001b[32m.\u001b[0m\u001b[32m.\u001b[0m\u001b[32m.\u001b[0m\u001b[32m.\u001b[0m\u001b[32m.\u001b[0m\u001b[32m.\u001b[0m\u001b[32m.\u001b[0m\u001b[32m.\u001b[0m\u001b[32m.\u001b[0m\u001b[32m.\u001b[0m\u001b[32m.\u001b[0m\u001b[32m.\u001b[0m\u001b[32m.\u001b[0m\u001b[32m.\u001b[0m\u001b[32m.\u001b[0m\u001b[32m.\u001b[0m\u001b[32m [100%]\u001b[0m\n", - "\u001b[32m\u001b[32m\u001b[1m32 passed\u001b[0m\u001b[32m in 46.74s\u001b[0m\u001b[0m\n" + "\u001b[32m\u001b[32m\u001b[1m32 passed\u001b[0m\u001b[32m in 43.01s\u001b[0m\u001b[0m\n" ] }, { @@ -910,7 +919,7 @@ "" ] }, - "execution_count": 11, + "execution_count": 16, "metadata": {}, "output_type": "execute_result" } @@ -940,7 +949,7 @@ }, { "cell_type": "code", - "execution_count": 12, + "execution_count": 17, "metadata": {}, "outputs": [ { @@ -961,7 +970,7 @@ "..\\tests\\test_10_doc_scrapper.py::test_save_markdown \u001b[32mPASSED\u001b[0m\u001b[32m [ 80%]\u001b[0m\n", "..\\tests\\test_10_doc_scrapper.py::test_process_url \u001b[32mPASSED\u001b[0m\u001b[32m [100%]\u001b[0m\n", "\n", - "\u001b[32m============================== \u001b[32m\u001b[1m5 passed\u001b[0m\u001b[32m in 0.13s\u001b[0m\u001b[32m ==============================\u001b[0m\n" + "\u001b[32m============================== \u001b[32m\u001b[1m5 passed\u001b[0m\u001b[32m in 0.20s\u001b[0m\u001b[32m ==============================\u001b[0m\n" ] }, { @@ -970,7 +979,7 @@ "" ] }, - "execution_count": 12, + "execution_count": 17, "metadata": {}, "output_type": "execute_result" } @@ -992,7 +1001,7 @@ }, { "cell_type": "code", - "execution_count": 13, + "execution_count": 18, "metadata": {}, "outputs": [ { @@ -1010,7 +1019,7 @@ "..\\tests\\test_20_gen_clex_uuid.py::test_generate_uuid[4-x-stixd-clex-https:\\raw.githubusercontent.com\\ciioprof0\\stixd\\03c934281777fecd3edb1d8622310bbf0839c17d\\tests\\test_clex.pl] \u001b[32mPASSED\u001b[0m\u001b[32m [ 50%]\u001b[0m\n", "..\\tests\\test_20_gen_clex_uuid.py::test_generate_uuid[4-x-stixd-clex-https:\\raw.githubusercontent.com\\Attempto\\Clex\\20960a5ce07776cb211a8cfb25dc8c81fcdf25e2\\clex_lexicon.pl] \u001b[32mPASSED\u001b[0m\u001b[32m [100%]\u001b[0m\n", "\n", - "\u001b[32m============================== \u001b[32m\u001b[1m2 passed\u001b[0m\u001b[32m in 0.12s\u001b[0m\u001b[32m ==============================\u001b[0m\n" + "\u001b[32m============================== \u001b[32m\u001b[1m2 passed\u001b[0m\u001b[32m in 0.17s\u001b[0m\u001b[32m ==============================\u001b[0m\n" ] }, { @@ -1019,7 +1028,7 @@ "" ] }, - "execution_count": 13, + "execution_count": 18, "metadata": {}, "output_type": "execute_result" } @@ -1041,7 +1050,7 @@ }, { "cell_type": "code", - "execution_count": 14, + "execution_count": 19, "metadata": {}, "outputs": [ { @@ -1059,7 +1068,7 @@ "..\\tests\\test_30_mysql_repo.py::test_save_and_load_entry \u001b[32mPASSED\u001b[0m\u001b[32m [ 50%]\u001b[0m\n", "..\\tests\\test_30_mysql_repo.py::test_find_entry_by_id \u001b[32mPASSED\u001b[0m\u001b[32m [100%]\u001b[0m\n", "\n", - "\u001b[32m============================== \u001b[32m\u001b[1m2 passed\u001b[0m\u001b[32m in 0.11s\u001b[0m\u001b[32m ==============================\u001b[0m\n" + "\u001b[32m============================== \u001b[32m\u001b[1m2 passed\u001b[0m\u001b[32m in 0.09s\u001b[0m\u001b[32m ==============================\u001b[0m\n" ] }, { @@ -1068,7 +1077,7 @@ "" ] }, - "execution_count": 14, + "execution_count": 19, "metadata": {}, "output_type": "execute_result" } @@ -1090,7 +1099,7 @@ }, { "cell_type": "code", - "execution_count": 15, + "execution_count": 20, "metadata": {}, "outputs": [ { @@ -1117,7 +1126,7 @@ "" ] }, - "execution_count": 15, + "execution_count": 20, "metadata": {}, "output_type": "execute_result" } @@ -1139,7 +1148,7 @@ }, { "cell_type": "code", - "execution_count": 16, + "execution_count": 21, "metadata": {}, "outputs": [ { @@ -1158,7 +1167,7 @@ "..\\tests\\test_50_doc_manager.py::test_link_document \u001b[32mPASSED\u001b[0m\u001b[32m [ 66%]\u001b[0m\n", "..\\tests\\test_50_doc_manager.py::test_process_document_text \u001b[32mPASSED\u001b[0m\u001b[32m [100%]\u001b[0m\n", "\n", - "\u001b[32m============================== \u001b[32m\u001b[1m3 passed\u001b[0m\u001b[32m in 0.09s\u001b[0m\u001b[32m ==============================\u001b[0m\n" + "\u001b[32m============================== \u001b[32m\u001b[1m3 passed\u001b[0m\u001b[32m in 0.11s\u001b[0m\u001b[32m ==============================\u001b[0m\n" ] }, { @@ -1167,7 +1176,7 @@ "" ] }, - "execution_count": 16, + "execution_count": 21, "metadata": {}, "output_type": "execute_result" } @@ -1189,7 +1198,7 @@ }, { "cell_type": "code", - "execution_count": 17, + "execution_count": 22, "metadata": {}, "outputs": [ { @@ -1208,7 +1217,7 @@ "..\\tests\\test_53_sent_manager.py::test_link_sentence \u001b[32mPASSED\u001b[0m\u001b[32m [ 66%]\u001b[0m\n", "..\\tests\\test_53_sent_manager.py::test_process_sentence_text \u001b[32mPASSED\u001b[0m\u001b[32m [100%]\u001b[0m\n", "\n", - "\u001b[32m============================== \u001b[32m\u001b[1m3 passed\u001b[0m\u001b[32m in 0.11s\u001b[0m\u001b[32m ==============================\u001b[0m\n" + "\u001b[32m============================== \u001b[32m\u001b[1m3 passed\u001b[0m\u001b[32m in 0.12s\u001b[0m\u001b[32m ==============================\u001b[0m\n" ] }, { @@ -1217,7 +1226,7 @@ "" ] }, - "execution_count": 17, + "execution_count": 22, "metadata": {}, "output_type": "execute_result" } @@ -1239,7 +1248,7 @@ }, { "cell_type": "code", - "execution_count": 18, + "execution_count": 23, "metadata": {}, "outputs": [ { @@ -1258,7 +1267,7 @@ "..\\tests\\test_57_lexicon_manager.py::test_link_lexicon_entry \u001b[32mPASSED\u001b[0m\u001b[32m [ 66%]\u001b[0m\n", "..\\tests\\test_57_lexicon_manager.py::test_process_word \u001b[32mPASSED\u001b[0m\u001b[32m [100%]\u001b[0m\n", "\n", - "\u001b[32m============================== \u001b[32m\u001b[1m3 passed\u001b[0m\u001b[32m in 0.08s\u001b[0m\u001b[32m ==============================\u001b[0m\n" + "\u001b[32m============================== \u001b[32m\u001b[1m3 passed\u001b[0m\u001b[32m in 0.12s\u001b[0m\u001b[32m ==============================\u001b[0m\n" ] }, { @@ -1267,7 +1276,7 @@ "" ] }, - "execution_count": 18, + "execution_count": 23, "metadata": {}, "output_type": "execute_result" } @@ -1289,7 +1298,7 @@ }, { "cell_type": "code", - "execution_count": 19, + "execution_count": 24, "metadata": {}, "outputs": [ { @@ -1309,7 +1318,7 @@ "..\\tests\\test_70_clex_importer_local.py::test_import_clex_entries[39-iv_finsg-walks-walk-None-f02be7a15dcd7cca79dc9b1c141991d479120352658c50030c7268da9372e6ff] \u001b[32mPASSED\u001b[0m\u001b[32m [ 75%]\u001b[0m\n", "..\\tests\\test_70_clex_importer_local.py::test_import_clex_entries[58-dv_pp-succeeded-succeed-as-8ee745975fad537905042b710e2f602f6c6bbe6c72f123b3596ce0b962f2b23f] \u001b[32mPASSED\u001b[0m\u001b[32m [100%]\u001b[0m\n", "\n", - "\u001b[32m============================= \u001b[32m\u001b[1m4 passed\u001b[0m\u001b[32m in 10.00s\u001b[0m\u001b[32m ==============================\u001b[0m\n" + "\u001b[32m============================= \u001b[32m\u001b[1m4 passed\u001b[0m\u001b[32m in 10.60s\u001b[0m\u001b[32m ==============================\u001b[0m\n" ] }, { @@ -1318,7 +1327,7 @@ "" ] }, - "execution_count": 19, + "execution_count": 24, "metadata": {}, "output_type": "execute_result" } @@ -1340,7 +1349,7 @@ }, { "cell_type": "code", - "execution_count": 20, + "execution_count": 25, "metadata": {}, "outputs": [ { @@ -1357,7 +1366,7 @@ "\n", "..\\tests\\test_75_clex_importer_ci.py::test_import_clex_entries \u001b[32mPASSED\u001b[0m\u001b[32m [100%]\u001b[0m\n", "\n", - "\u001b[32m============================== \u001b[32m\u001b[1m1 passed\u001b[0m\u001b[32m in 0.07s\u001b[0m\u001b[32m ==============================\u001b[0m\n" + "\u001b[32m============================== \u001b[32m\u001b[1m1 passed\u001b[0m\u001b[32m in 0.09s\u001b[0m\u001b[32m ==============================\u001b[0m\n" ] }, { @@ -1366,7 +1375,7 @@ "" ] }, - "execution_count": 20, + "execution_count": 25, "metadata": {}, "output_type": "execute_result" } @@ -1397,7 +1406,7 @@ }, { "cell_type": "code", - "execution_count": 21, + "execution_count": 26, "metadata": {}, "outputs": [ { @@ -1418,7 +1427,7 @@ "..\\tests\\test_80_api.py::test_import_clex_mysql_error \u001b[32mPASSED\u001b[0m\u001b[32m [ 80%]\u001b[0m\n", "..\\tests\\test_80_api.py::test_import_clex_system_error \u001b[32mPASSED\u001b[0m\u001b[32m [100%]\u001b[0m\n", "\n", - "\u001b[32m============================== \u001b[32m\u001b[1m5 passed\u001b[0m\u001b[32m in 0.10s\u001b[0m\u001b[32m ==============================\u001b[0m\n" + "\u001b[32m============================== \u001b[32m\u001b[1m5 passed\u001b[0m\u001b[32m in 0.12s\u001b[0m\u001b[32m ==============================\u001b[0m\n" ] }, { @@ -1427,7 +1436,7 @@ "" ] }, - "execution_count": 21, + "execution_count": 26, "metadata": {}, "output_type": "execute_result" } @@ -1460,7 +1469,7 @@ }, { "cell_type": "code", - "execution_count": 22, + "execution_count": 27, "metadata": {}, "outputs": [ { @@ -1477,7 +1486,7 @@ "\n", "..\\tests\\test_90_e2e_local.py::test_form_submission \u001b[32mPASSED\u001b[0m\u001b[32m [100%]\u001b[0m\n", "\n", - "\u001b[32m============================= \u001b[32m\u001b[1m1 passed\u001b[0m\u001b[32m in 16.25s\u001b[0m\u001b[32m ==============================\u001b[0m\n" + "\u001b[32m============================= \u001b[32m\u001b[1m1 passed\u001b[0m\u001b[32m in 17.35s\u001b[0m\u001b[32m ==============================\u001b[0m\n" ] }, { @@ -1486,7 +1495,7 @@ "" ] }, - "execution_count": 22, + "execution_count": 27, "metadata": {}, "output_type": "execute_result" } @@ -1510,7 +1519,7 @@ }, { "cell_type": "code", - "execution_count": 23, + "execution_count": 30, "metadata": {}, "outputs": [ { @@ -1527,7 +1536,7 @@ "\n", "..\\tests\\test_95_e2e_ci.py::test_form_submission \u001b[32mPASSED\u001b[0m\u001b[32m [100%]\u001b[0m\n", "\n", - "\u001b[32m============================= \u001b[32m\u001b[1m1 passed\u001b[0m\u001b[32m in 17.57s\u001b[0m\u001b[32m ==============================\u001b[0m\n" + "\u001b[32m============================= \u001b[32m\u001b[1m1 passed\u001b[0m\u001b[32m in 17.55s\u001b[0m\u001b[32m ==============================\u001b[0m\n" ] }, { @@ -1536,7 +1545,7 @@ "" ] }, - "execution_count": 23, + "execution_count": 30, "metadata": {}, "output_type": "execute_result" } @@ -1575,7 +1584,7 @@ " - `pip install -r requirements.txt`\n", "1. Run the Flask API\n", " - `python api.py`\n", - "1. Access the web form at `http://localhost:5000/ling508/web/stixd.html`\n", + "1. Access the web form at `http://localhost:5000/`\n", "1. When finished, stop the Flask API by pressing `Ctrl+C` in the terminal.\n" ] } diff --git a/ling508/tests/test_90_e2e_local.py b/ling508/tests/test_90_e2e_local.py index f202b61..fd8c706 100644 --- a/ling508/tests/test_90_e2e_local.py +++ b/ling508/tests/test_90_e2e_local.py @@ -43,7 +43,7 @@ def test_form_submission(init_driver, test_client): try: # Open the form in the browser - driver.get("http://localhost:5000/ling508/web/stixd.html") + driver.get("http://localhost:5000/") # Fill out the form uri_field = driver.find_element(By.ID, "uri") diff --git a/ling508/tests/test_95_e2e_ci.py b/ling508/tests/test_95_e2e_ci.py index 977a9a6..791dd00 100644 --- a/ling508/tests/test_95_e2e_ci.py +++ b/ling508/tests/test_95_e2e_ci.py @@ -43,7 +43,7 @@ def test_form_submission(init_driver, test_client): try: # Open the form in the browser - driver.get("http://localhost:5000/ling508/web/stixd.html") + driver.get("http://localhost:5000/") # Fill out the form uri_field = driver.find_element(By.ID, "uri") diff --git a/ling508/web/stixd.html b/ling508/web/stixd.html index 6b0b1c7..1988c34 100644 --- a/ling508/web/stixd.html +++ b/ling508/web/stixd.html @@ -1,16 +1,17 @@ - - - - Import Clex Entries - - -

Import Clex Entries

-
- - - -
- - \ No newline at end of file + + + + Import Clex Entries + + +

Import Clex Entries

+
+ + +

+ +
+ + \ No newline at end of file