From 3d7eaeb1fc58a06fdc4cf7744a7ee72fb706a907 Mon Sep 17 00:00:00 2001 From: dbdimitrov Date: Sun, 25 Jun 2023 13:33:23 +0200 Subject: [PATCH 001/343] wget all files from repo --- tutorial/08_basics_pandas.ipynb | 732 ++++++++++++++++++-------------- 1 file changed, 419 insertions(+), 313 deletions(-) diff --git a/tutorial/08_basics_pandas.ipynb b/tutorial/08_basics_pandas.ipynb index 7a6e08ae..7fa213e7 100644 --- a/tutorial/08_basics_pandas.ipynb +++ b/tutorial/08_basics_pandas.ipynb @@ -83,11 +83,270 @@ "cell_type": "markdown", "metadata": {}, "source": [ + "### Tutorial files\n", + "\n", "In the `biocypher` root directory, you will find a `tutorial` directory with\n", "the files for this tutorial. The `data_generator.py` file contains the\n", - "simulated data generation code, and the other files are named according to the\n", - "tutorial step they are used in. The `biocypher-out` directory will be created\n", - "automatically when you run the tutorial code." + "simulated data generation code, and the other files, specifically the `.yaml` files, are named according to the\n", + "tutorial step they are used in.\n", + "\n", + "Let's download these:" + ] + }, + { + "cell_type": "code", + "execution_count": 1, + "metadata": {}, + "outputs": [], + "source": [ + "import yaml\n", + "import requests\n", + "import subprocess\n", + "\n", + "schema_path = \"https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/\"" + ] + }, + { + "cell_type": "code", + "execution_count": 2, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "--2023-06-25 13:32:30-- https://github.com/biocypher/biocypher/raw/main/tutorial/data_generator.py\n", + "Resolving github.com (github.com)... 140.82.121.4\n", + "Connecting to github.com (github.com)|140.82.121.4|:443... connected.\n", + "HTTP request sent, awaiting response... 302 Found\n", + "Location: https://raw.githubusercontent.com/biocypher/biocypher/main/tutorial/data_generator.py [following]\n", + "--2023-06-25 13:32:30-- https://raw.githubusercontent.com/biocypher/biocypher/main/tutorial/data_generator.py\n", + "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", + "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", + "HTTP request sent, awaiting response... 200 OK\n", + "Length: 6970 (6,8K) [text/plain]\n", + "Saving to: ‘data_generator.py’\n", + "\n", + "data_generator.py 100%[===================>] 6,81K --.-KB/s in 0s \n", + "\n", + "2023-06-25 13:32:30 (39,0 MB/s) - ‘data_generator.py’ saved [6970/6970]\n", + "\n" + ] + } + ], + "source": [ + "!wget -O data_generator.py \"https://github.com/biocypher/biocypher/raw/main/tutorial/data_generator.py\"" + ] + }, + { + "cell_type": "code", + "execution_count": 3, + "metadata": {}, + "outputs": [ + { + "name": "stderr", + "output_type": "stream", + "text": [ + "--2023-06-25 13:32:30-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/01_biocypher_config.yaml\n", + "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", + "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", + "HTTP request sent, awaiting response... 200 OK\n", + "Length: 64 [text/plain]\n", + "Saving to: ‘01_biocypher_config.yaml.1’\n", + "\n", + " 0K 100% 2,62M=0s\n", + "\n", + "2023-06-25 13:32:30 (2,62 MB/s) - ‘01_biocypher_config.yaml.1’ saved [64/64]\n", + "\n", + "--2023-06-25 13:32:30-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/01_schema_config.yaml\n", + "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", + "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", + "HTTP request sent, awaiting response... 200 OK\n", + "Length: 93 [text/plain]\n", + "Saving to: ‘01_schema_config.yaml.1’\n", + "\n", + " 0K 100% 3,45M=0s\n", + "\n", + "2023-06-25 13:32:30 (3,45 MB/s) - ‘01_schema_config.yaml.1’ saved [93/93]\n", + "\n", + "--2023-06-25 13:32:30-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/02_biocypher_config.yaml\n", + "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", + "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", + "HTTP request sent, awaiting response... 200 OK\n", + "Length: 58 [text/plain]\n", + "Saving to: ‘02_biocypher_config.yaml.1’\n", + "\n", + " 0K 100% 1,95M=0s\n", + "\n", + "2023-06-25 13:32:30 (1,95 MB/s) - ‘02_biocypher_config.yaml.1’ saved [58/58]\n", + "\n", + "--2023-06-25 13:32:30-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/02_schema_config.yaml\n", + "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", + "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", + "HTTP request sent, awaiting response... 200 OK\n", + "Length: 111 [text/plain]\n", + "Saving to: ‘02_schema_config.yaml.1’\n", + "\n", + " 0K 100% 3,16M=0s\n", + "\n", + "2023-06-25 13:32:30 (3,16 MB/s) - ‘02_schema_config.yaml.1’ saved [111/111]\n", + "\n", + "--2023-06-25 13:32:30-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/03_biocypher_config.yaml\n", + "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", + "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", + "HTTP request sent, awaiting response... 200 OK\n", + "Length: 69 [text/plain]\n", + "Saving to: ‘03_biocypher_config.yaml.1’\n", + "\n", + " 0K 100% 1,55M=0s\n", + "\n", + "2023-06-25 13:32:31 (1,55 MB/s) - ‘03_biocypher_config.yaml.1’ saved [69/69]\n", + "\n", + "--2023-06-25 13:32:31-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/03_schema_config.yaml\n", + "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", + "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", + "HTTP request sent, awaiting response... 200 OK\n", + "Length: 121 [text/plain]\n", + "Saving to: ‘03_schema_config.yaml.1’\n", + "\n", + " 0K 100% 9,91M=0s\n", + "\n", + "2023-06-25 13:32:31 (9,91 MB/s) - ‘03_schema_config.yaml.1’ saved [121/121]\n", + "\n", + "--2023-06-25 13:32:31-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/04_biocypher_config.yaml\n", + "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", + "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", + "HTTP request sent, awaiting response... 200 OK\n", + "Length: 63 [text/plain]\n", + "Saving to: ‘04_biocypher_config.yaml.1’\n", + "\n", + " 0K 100% 1,94M=0s\n", + "\n", + "2023-06-25 13:32:31 (1,94 MB/s) - ‘04_biocypher_config.yaml.1’ saved [63/63]\n", + "\n", + "--2023-06-25 13:32:31-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/04_schema_config.yaml\n", + "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", + "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", + "HTTP request sent, awaiting response... 200 OK\n", + "Length: 221 [text/plain]\n", + "Saving to: ‘04_schema_config.yaml.1’\n", + "\n", + " 0K 100% 11,0M=0s\n", + "\n", + "2023-06-25 13:32:31 (11,0 MB/s) - ‘04_schema_config.yaml.1’ saved [221/221]\n", + "\n", + "--2023-06-25 13:32:31-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/05_biocypher_config.yaml\n", + "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", + "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", + "HTTP request sent, awaiting response... 200 OK\n", + "Length: 72 [text/plain]\n", + "Saving to: ‘05_biocypher_config.yaml.1’\n", + "\n", + " 0K 100% 3,66M=0s\n", + "\n", + "2023-06-25 13:32:31 (3,66 MB/s) - ‘05_biocypher_config.yaml.1’ saved [72/72]\n", + "\n", + "--2023-06-25 13:32:31-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/05_schema_config.yaml\n", + "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", + "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", + "HTTP request sent, awaiting response... 200 OK\n", + "Length: 370 [text/plain]\n", + "Saving to: ‘05_schema_config.yaml.1’\n", + "\n", + " 0K 100% 12,6M=0s\n", + "\n", + "2023-06-25 13:32:31 (12,6 MB/s) - ‘05_schema_config.yaml.1’ saved [370/370]\n", + "\n", + "--2023-06-25 13:32:31-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/06_biocypher_config.yaml\n", + "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", + "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", + "HTTP request sent, awaiting response... 200 OK\n", + "Length: 66 [text/plain]\n", + "Saving to: ‘06_biocypher_config.yaml.1’\n", + "\n", + " 0K 100% 4,44M=0s\n", + "\n", + "2023-06-25 13:32:31 (4,44 MB/s) - ‘06_biocypher_config.yaml.1’ saved [66/66]\n", + "\n", + "--2023-06-25 13:32:31-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/06_schema_config.yaml\n", + "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", + "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", + "HTTP request sent, awaiting response... 200 OK\n", + "Length: 579 [text/plain]\n", + "Saving to: ‘06_schema_config.yaml.1’\n", + "\n", + " 0K 100% 26,7M=0s\n", + "\n", + "2023-06-25 13:32:31 (26,7 MB/s) - ‘06_schema_config.yaml.1’ saved [579/579]\n", + "\n", + "--2023-06-25 13:32:31-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/06_schema_config_pandas.yaml\n", + "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", + "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", + "HTTP request sent, awaiting response... 200 OK\n", + "Length: 579 [text/plain]\n", + "Saving to: ‘06_schema_config_pandas.yaml.1’\n", + "\n", + " 0K 100% 10,5M=0s\n", + "\n", + "2023-06-25 13:32:31 (10,5 MB/s) - ‘06_schema_config_pandas.yaml.1’ saved [579/579]\n", + "\n", + "--2023-06-25 13:32:31-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/07_biocypher_config.yaml\n", + "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", + "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", + "HTTP request sent, awaiting response... 200 OK\n", + "Length: 79 [text/plain]\n", + "Saving to: ‘07_biocypher_config.yaml.1’\n", + "\n", + " 0K 100% 2,64M=0s\n", + "\n", + "2023-06-25 13:32:31 (2,64 MB/s) - ‘07_biocypher_config.yaml.1’ saved [79/79]\n", + "\n", + "--2023-06-25 13:32:31-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/07_schema_config.yaml\n", + "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", + "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", + "HTTP request sent, awaiting response... 200 OK\n", + "Length: 711 [text/plain]\n", + "Saving to: ‘07_schema_config.yaml.1’\n", + "\n", + " 0K 100% 32,3M=0s\n", + "\n", + "2023-06-25 13:32:31 (32,3 MB/s) - ‘07_schema_config.yaml.1’ saved [711/711]\n", + "\n", + "--2023-06-25 13:32:31-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/07_schema_config_pandas.yaml\n", + "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", + "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", + "HTTP request sent, awaiting response... 200 OK\n", + "Length: 711 [text/plain]\n", + "Saving to: ‘07_schema_config_pandas.yaml.1’\n", + "\n", + " 0K 100% 40,3M=0s\n", + "\n", + "2023-06-25 13:32:31 (40,3 MB/s) - ‘07_schema_config_pandas.yaml.1’ saved [711/711]\n", + "\n" + ] + } + ], + "source": [ + "owner = \"biocypher\"\n", + "repo = \"biocypher\"\n", + "path = \"tutorial\" # The path within the repository (optional, leave empty for the root directory)\n", + "github_url = \"https://api.github.com/repos/{owner}/{repo}/contents/{path}\"\n", + "\n", + "api_url = github_url.format(owner=owner, repo=repo, path=path)\n", + "response = requests.get(api_url)\n", + "\n", + "# Get list of yaml files from the repo\n", + "files = response.json()\n", + "yamls = []\n", + "for file in files:\n", + " if file[\"type\"] == \"file\":\n", + " if file[\"name\"].endswith(\".yaml\"):\n", + " yamls.append(file[\"name\"])\n", + " \n", + "# wget all yaml files \n", + "for yaml in yamls:\n", + " url_path = schema_path + yaml\n", + " subprocess.run([\"wget\", url_path])" ] }, { @@ -95,15 +354,12 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "
\n", - " @slobentanzer wouldn't it be easier to just have the data_generator under biocypher.test - to avoid cloning the whole repo for the tutorials?\n", - "This file would also then fit in docs (depending how you want to refer to it for the read the docs) \n", - "
\n" + "Let's also define functions with which we can visualize those" ] }, { "cell_type": "code", - "execution_count": 1, + "execution_count": 4, "metadata": {}, "outputs": [], "source": [ @@ -115,7 +371,21 @@ "\n", " print(\"--------------\")\n", " print(yaml.dump(yaml_data, sort_keys=False, indent=4))\n", - " print(\"--------------\")" + " print(\"--------------\")\n", + "\n", + " \n", + "# # helper function read yaml from url\n", + "# def read_yaml(url):\n", + "# response = requests.get(url, allow_redirects=True)\n", + "# content = response.content.decode(\"utf-8\")\n", + "# yaml_data = yaml.safe_load(content)\n", + "# return yaml_data\n", + "\n", + "# # helper function to print yaml files\n", + "# def print_yaml(url):\n", + "# print(\"--------------\")\n", + "# print(yaml.dump(read_yaml(url), sort_keys=False, indent=4))\n", + "# print(\"--------------\")" ] }, { @@ -155,7 +425,7 @@ }, { "cell_type": "code", - "execution_count": 2, + "execution_count": 5, "metadata": {}, "outputs": [], "source": [ @@ -186,7 +456,7 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": 6, "metadata": {}, "outputs": [], "source": [ @@ -253,27 +523,27 @@ }, { "cell_type": "code", - "execution_count": 4, + "execution_count": 7, "metadata": {}, "outputs": [ { "name": "stderr", "output_type": "stream", "text": [ - "INFO -- This is BioCypher v0.5.15.\n", - "INFO -- Logging into `biocypher-log/biocypher-20230531-143205.log`.\n" + "INFO -- This is BioCypher v0.5.12.\n", + "INFO -- Logging into `biocypher-log/biocypher-20230625-133232.log`.\n" ] } ], "source": [ "from biocypher import BioCypher\n", "from os.path import join\n", - "schema_path = join('..', 'tutorial')" + "local_path = join('..', 'tutorial')" ] }, { "cell_type": "code", - "execution_count": 5, + "execution_count": 8, "metadata": {}, "outputs": [ { @@ -291,7 +561,7 @@ } ], "source": [ - "print_yaml(join(schema_path, '01_schema_config.yaml'))" + "print_yaml(join(local_path, '01_schema_config.yaml'))" ] }, { @@ -360,7 +630,7 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": 9, "metadata": {}, "outputs": [ { @@ -374,8 +644,8 @@ ], "source": [ "bc = BioCypher(\n", - " biocypher_config_path=join(schema_path, '01_biocypher_config.yaml'),\n", - " schema_config_path=join(schema_path, '01_schema_config.yaml'),\n", + " biocypher_config_path=join(local_path, '01_biocypher_config.yaml'),\n", + " schema_config_path=join(local_path, '01_schema_config.yaml'),\n", ")\n", "# Add the entities that we generated above to the graph\n", "bc.add(entities)" @@ -383,24 +653,24 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 10, "metadata": {}, "outputs": [ { "data": { "text/plain": [ - "{'protein': node_id node_label sequence \n", - " 0 B9H6B4 protein WIPLVMQNEATFYLDRRHSYMIVRVNDGFWPTFNFVHADYDMIWVM... \\\n", - " 1 F2T4J1 protein DFDNHIQDLMLHHSMRRISEPHFELVKSNINLGLLQHPPGWFEYEC... \n", - " 2 G6B5W0 protein LTIYDIIFFEWPHCMEQVHYQLSTWLKIQIPQVWRCAYQWDPANFR... \n", + "{'protein': protein sequence \\\n", + " 0 D9D1F0 ILLVTAERGYLDNMWWQESNFYKTAPVETTYKIFAMAWDRILAHYI... \n", + " 1 I9O8W8 HDSFDMTECRNDRNNKGQQHPIWEQLWFSSELFNKQMSCCWNNCVC... \n", + " 2 T2G7H0 KYRYCFNTRGERFWMVVDMLVHQMTVYIGQINARARNHCEFNLWAP... \n", " \n", " description taxon id preferred_id \n", - " 0 f f o r u x r n l u 9606 B9H6B4 uniprot \n", - " 1 t o z u t s f s p u 9606 F2T4J1 uniprot \n", - " 2 e r s w h w x h i l 9606 G6B5W0 uniprot }" + " 0 r c x m t q z p w q 9606 D9D1F0 uniprot \n", + " 1 t u k v p f h k v w 9606 I9O8W8 uniprot \n", + " 2 p j h v n p b z y m 9606 T2G7H0 uniprot }" ] }, - "execution_count": 7, + "execution_count": 10, "metadata": {}, "output_type": "execute_result" } @@ -429,7 +699,7 @@ }, { "cell_type": "code", - "execution_count": 8, + "execution_count": 11, "metadata": {}, "outputs": [], "source": [ @@ -438,7 +708,7 @@ }, { "cell_type": "code", - "execution_count": 9, + "execution_count": 12, "metadata": {}, "outputs": [ { @@ -458,12 +728,12 @@ } ], "source": [ - "print_yaml(join(schema_path, '02_schema_config.yaml'))" + "print_yaml(join(local_path, '02_schema_config.yaml'))" ] }, { "cell_type": "code", - "execution_count": 10, + "execution_count": 13, "metadata": {}, "outputs": [ { @@ -485,8 +755,8 @@ "]\n", "# Create a new BioCypher instance\n", "bc = BioCypher(\n", - " biocypher_config_path=join(schema_path, '02_biocypher_config.yaml'),\n", - " schema_config_path=join(schema_path, '02_schema_config.yaml'),\n", + " biocypher_config_path=join(local_path, '02_biocypher_config.yaml'),\n", + " schema_config_path=join(local_path, '02_schema_config.yaml'),\n", ")\n", "# Run the import\n", "bc.add(node_generator(proteins))" @@ -494,30 +764,30 @@ }, { "cell_type": "code", - "execution_count": 11, + "execution_count": 14, "metadata": {}, "outputs": [ { "data": { "text/plain": [ - "{'protein': node_id node_label sequence \n", - " 0 I3F2Z9 protein REHLAWIVSPQCFRERSMCNTYCHHSHLLLRTKPMVDIVEPMACCG... \\\n", - " 1 190794 protein REPMQAKWMPGYFAYRITILLKSNQMVWSVYMPMHAKWSHEHWLWS... \n", - " 2 G6M3X6 protein EICYKSPTYFMMRASTAPWAAVDCEEATEGNRWHVPDLGNPGDIGH... \n", - " 3 834464 protein WCNRTALLTHSGSAYGENCKFQAHKRTRETGKGTHDLIWDRYDYEF... \n", - " 4 E0L5X8 protein VFFLFGTTMSVCPCDELQMPICDSVIADIFNMCSDEQFQWPWEEQI... \n", - " 5 360805 protein QRMHIYDLGNIDMPGPCKCMVKDWPSGIDCKNFGTQFHVVKPGEII... \n", + "{'protein': protein sequence \\\n", + " 0 Z9J6J5 DTQKCACGLWTRTLDIDDLWAHEECLNWATRKWHTGQLLNKKTTII... \n", + " 1 933153 WFETRCYRFAVCTLALRYRDEMSNHEDYGVFHMTNAIGLMQMQILN... \n", + " 2 Y7E9I7 YHDYTIAHKGMKWIGLGFLVYQWNCMNKPSRQHMQKEHLMWCMWVM... \n", + " 3 989014 GAVIGVNENAKHAMWEGQPPADFNKVRDIDWPKKGRCDHNFDNGHA... \n", + " 4 N3C8G8 SMAYFGKEGDANMCKGNTSRAQWSVWKRFQQPCMNAGWSTLPGQDM... \n", + " 5 837842 NLFGTMWDHHMRCDVQQQKCSAALSLRRCSVLQHQMPGKSDKRDGV... \n", " \n", " description taxon id preferred_id \n", - " 0 v l q z t h w q c x 9606 I3F2Z9 uniprot \n", - " 1 t m f w e z q r m l 9606 190794 uniprot \n", - " 2 h q p i z u a w o t 9606 G6M3X6 uniprot \n", - " 3 h g k u m p p i v b 9606 834464 uniprot \n", - " 4 q l u d k s q p v l 9606 E0L5X8 uniprot \n", - " 5 y i j o l b a c m f 9606 360805 uniprot }" + " 0 u r m y c w g j i a 9606 Z9J6J5 uniprot \n", + " 1 d s o f a q m v n l 9606 933153 uniprot \n", + " 2 v z a f k f m n e c 9606 Y7E9I7 uniprot \n", + " 3 d m k v y p n e e l 9606 989014 uniprot \n", + " 4 r s f i m d h x p s 9606 N3C8G8 uniprot \n", + " 5 c f c c z a m x p h 9606 837842 uniprot }" ] }, - "execution_count": 11, + "execution_count": 14, "metadata": {}, "output_type": "execute_result" } @@ -569,7 +839,7 @@ }, { "cell_type": "code", - "execution_count": 12, + "execution_count": 15, "metadata": {}, "outputs": [ { @@ -591,7 +861,7 @@ } ], "source": [ - "print_yaml(join(schema_path, '03_schema_config.yaml'))" + "print_yaml(join(local_path, '03_schema_config.yaml'))" ] }, { @@ -622,7 +892,7 @@ }, { "cell_type": "code", - "execution_count": 13, + "execution_count": 16, "metadata": {}, "outputs": [ { @@ -636,35 +906,35 @@ { "data": { "text/plain": [ - "{'uniprot.protein': node_id node_label sequence \n", - " 0 I3F2Z9 uniprot.protein REHLAWIVSPQCFRERSMCNTYCHHSHLLLRTKPMVDIVEPMACCG... \\\n", - " 1 G6M3X6 uniprot.protein EICYKSPTYFMMRASTAPWAAVDCEEATEGNRWHVPDLGNPGDIGH... \n", - " 2 E0L5X8 uniprot.protein VFFLFGTTMSVCPCDELQMPICDSVIADIFNMCSDEQFQWPWEEQI... \n", + "{'uniprot.protein': uniprot.protein sequence \\\n", + " 0 Z9J6J5 DTQKCACGLWTRTLDIDDLWAHEECLNWATRKWHTGQLLNKKTTII... \n", + " 1 Y7E9I7 YHDYTIAHKGMKWIGLGFLVYQWNCMNKPSRQHMQKEHLMWCMWVM... \n", + " 2 N3C8G8 SMAYFGKEGDANMCKGNTSRAQWSVWKRFQQPCMNAGWSTLPGQDM... \n", " \n", " description taxon id preferred_id \n", - " 0 v l q z t h w q c x 9606 I3F2Z9 uniprot \n", - " 1 h q p i z u a w o t 9606 G6M3X6 uniprot \n", - " 2 q l u d k s q p v l 9606 E0L5X8 uniprot ,\n", - " 'entrez.protein': node_id node_label sequence \n", - " 0 190794 entrez.protein REPMQAKWMPGYFAYRITILLKSNQMVWSVYMPMHAKWSHEHWLWS... \\\n", - " 1 834464 entrez.protein WCNRTALLTHSGSAYGENCKFQAHKRTRETGKGTHDLIWDRYDYEF... \n", - " 2 360805 entrez.protein QRMHIYDLGNIDMPGPCKCMVKDWPSGIDCKNFGTQFHVVKPGEII... \n", + " 0 u r m y c w g j i a 9606 Z9J6J5 uniprot \n", + " 1 v z a f k f m n e c 9606 Y7E9I7 uniprot \n", + " 2 r s f i m d h x p s 9606 N3C8G8 uniprot ,\n", + " 'entrez.protein': entrez.protein sequence \\\n", + " 0 933153 WFETRCYRFAVCTLALRYRDEMSNHEDYGVFHMTNAIGLMQMQILN... \n", + " 1 989014 GAVIGVNENAKHAMWEGQPPADFNKVRDIDWPKKGRCDHNFDNGHA... \n", + " 2 837842 NLFGTMWDHHMRCDVQQQKCSAALSLRRCSVLQHQMPGKSDKRDGV... \n", " \n", " description taxon id preferred_id \n", - " 0 t m f w e z q r m l 9606 190794 entrez \n", - " 1 h g k u m p p i v b 9606 834464 entrez \n", - " 2 y i j o l b a c m f 9606 360805 entrez }" + " 0 d s o f a q m v n l 9606 933153 entrez \n", + " 1 d m k v y p n e e l 9606 989014 entrez \n", + " 2 c f c c z a m x p h 9606 837842 entrez }" ] }, - "execution_count": 13, + "execution_count": 16, "metadata": {}, "output_type": "execute_result" } ], "source": [ "bc = BioCypher(\n", - " biocypher_config_path=join(schema_path, '03_biocypher_config.yaml'),\n", - " schema_config_path=join(schema_path, '03_schema_config.yaml'),\n", + " biocypher_config_path=join(local_path, '03_biocypher_config.yaml'),\n", + " schema_config_path=join(local_path, '03_schema_config.yaml'),\n", ")\n", "bc.add(node_generator(proteins))\n", "bc.to_df()" @@ -742,7 +1012,7 @@ }, { "cell_type": "code", - "execution_count": 14, + "execution_count": 17, "metadata": {}, "outputs": [ { @@ -769,7 +1039,7 @@ } ], "source": [ - "print_yaml(join(schema_path, '04_schema_config.yaml'))" + "print_yaml(join(local_path, '04_schema_config.yaml'))" ] }, { @@ -791,7 +1061,7 @@ }, { "cell_type": "code", - "execution_count": 15, + "execution_count": 18, "metadata": {}, "outputs": [], "source": [ @@ -800,7 +1070,7 @@ }, { "cell_type": "code", - "execution_count": 16, + "execution_count": 19, "metadata": {}, "outputs": [ { @@ -814,27 +1084,27 @@ { "data": { "text/plain": [ - "{'uniprot.protein': node_id node_label sequence \n", - " 0 T4G5C9 uniprot.protein LQKEYAALFWQPRAFYPYLIKSFLDEAKRDCFWMMIFPVKSWWHHQ... \\\n", - " 1 W5O6Z3 uniprot.protein SNNQCAIATWAVSFWMSSGAFSLLSMDFCTHENHFGVTRFGDWKEH... \n", - " 2 U5W6F4 uniprot.protein SYKECEYWEKSGNIFNTMREREWNFCKKLKMQIFKCIWWLNGNKWI... \n", + "{'uniprot.protein': uniprot.protein sequence \\\n", + " 0 W9U7K0 PGAETNIDVNLDNWMSLRKQEHVMFFFYRYFSIGTLTGILLVMFTK... \n", + " 1 U7X3A1 AAMQNTQNEWGIPREKVFKKWGDRITLWHRIFCKCSTLYMQFVSDM... \n", + " 2 H8G7V8 ALGFVEIFYTGSGTPAGTKCQVMTQVVMIPQERWWSGCRQMDCCVG... \n", " \n", - " description taxon mass id preferred_id \n", - " 0 f m l t b y w t b i 9138 7018.0 T4G5C9 uniprot \n", - " 1 a p d z o i w u g r 4555 3025.0 W5O6Z3 uniprot \n", - " 2 m g r l w m d d g a 6432 NaN U5W6F4 uniprot ,\n", - " 'entrez.protein': node_id node_label sequence \n", - " 0 75149 entrez.protein LSCQTWVPFKQPIFNICHIASAPENQQHGCVVGTHPMDKSRTHLEI... \\\n", - " 1 376243 entrez.protein FSMMCWDLQHWDCRAQRCWKEKKIDSIDSVKRCQFLCDLIREEIPT... \n", - " 2 120953 entrez.protein TALWMVIRSYFQACYTWHYIRFRNWVFGSWYRMEHIDDDMKFCKEA... \n", + " description taxon mass id preferred_id \n", + " 0 e k f u r x k m s v 6528 8244 W9U7K0 uniprot \n", + " 1 z d k q k a f k c n 5602 5546 U7X3A1 uniprot \n", + " 2 m z b v d y r r l b 7640 None H8G7V8 uniprot ,\n", + " 'entrez.protein': entrez.protein sequence \\\n", + " 0 673163 CFANCLVYGTSDPNGGMMRVCACFNPKRVKYRGQPCSSKQVPCEDH... \n", + " 1 906051 HWSNYKSSWDDEWVGWSNFGSMVCTRLRMFVRIREISKPMTSMMSY... \n", + " 2 702730 HTQKQDWAVFEPDHTLMDNFKIRVCQSWGDMMSCDGVRVHGSETHP... \n", " \n", " description taxon mass id preferred_id \n", - " 0 i y y t o u i c o w 9606 None 75149 entrez \n", - " 1 j g g g u s c k f n 9606 None 376243 entrez \n", - " 2 g g s k j f r i f c 9606 None 120953 entrez }" + " 0 z a p w q g a i j x 9606 None 673163 entrez \n", + " 1 a t h j o n v u s j 9606 None 906051 entrez \n", + " 2 z y u u g a v z t v 9606 None 702730 entrez }" ] }, - "execution_count": 16, + "execution_count": 19, "metadata": {}, "output_type": "execute_result" } @@ -849,8 +1119,8 @@ "]\n", "# New instance, populated, and to DataFrame\n", "bc = BioCypher(\n", - " biocypher_config_path=join(schema_path, '04_biocypher_config.yaml'),\n", - " schema_config_path=join(schema_path, '04_schema_config.yaml'),\n", + " biocypher_config_path=join(local_path, '04_biocypher_config.yaml'),\n", + " schema_config_path=join(local_path, '04_schema_config.yaml'),\n", ")\n", "bc.add(node_generator(proteins))\n", "bc.to_df()" @@ -876,7 +1146,7 @@ }, { "cell_type": "code", - "execution_count": 17, + "execution_count": 20, "metadata": {}, "outputs": [], "source": [ @@ -885,7 +1155,7 @@ }, { "cell_type": "code", - "execution_count": 18, + "execution_count": 21, "metadata": {}, "outputs": [ { @@ -918,7 +1188,7 @@ } ], "source": [ - "print_yaml(join(schema_path, '05_schema_config.yaml'))" + "print_yaml(join(local_path, '05_schema_config.yaml'))" ] }, { @@ -945,7 +1215,7 @@ }, { "cell_type": "code", - "execution_count": 19, + "execution_count": 22, "metadata": {}, "outputs": [ { @@ -961,35 +1231,35 @@ "output_type": "stream", "text": [ "uniprot.protein\n", - " node_id node_label sequence \n", - "0 U5Z5S0 uniprot.protein PLWSVAKIHAEELPLLEYFVPDGSYDVPRGKMVNEFSEPEHWNVQC... \\\n", - "1 B1B6J7 uniprot.protein VMYTFYDDGQHYHMWIGADYLLMVNNQDEPEEGINWWKLPLTNQVN... \n", - "2 R9B8P2 uniprot.protein WQACQITEDLRKNYQNADRWTSQFALEPTAVQNCYRLLQPQLTQMD... \n", + " uniprot.protein sequence \\\n", + "0 M8N1V7 RMIPMDRLHTCRQEGVRMFQCEGWACNSIRTGWLPLYKQEPFGGSF... \n", + "1 X3T3W1 YTLNRFCHGYKHYSQYQWDDVRQRLLEDVGEDVGVCVWKTWCRMYN... \n", + "2 R1T0U8 ETNFMLLVKGIMDWHIVIHRVWRPQINMNVKFPENEKVGHKCACPN... \n", "\n", - " description taxon mass id preferred_id \n", - "0 y n d f b v j i d t 8076 NaN U5Z5S0 uniprot \n", - "1 r j j d c g l b z z 9741 NaN B1B6J7 uniprot \n", - "2 a h u h p w b x d z 7295 3887.0 R9B8P2 uniprot \n", + " description taxon mass id preferred_id \n", + "0 d a c d p u w o c h 1180 None M8N1V7 uniprot \n", + "1 k k z t p o y v v e 8234 3419 X3T3W1 uniprot \n", + "2 o f f h y m c d r e 7772 4738 R1T0U8 uniprot \n", "protein isoform\n", - " node_id node_label sequence \n", - "0 H0D1M0 protein isoform YCETYMKVVMRQYIHREESYRHEPGAKLCDTMWQIPDILPSWYEQF... \\\n", - "1 X8N1C4 protein isoform MMPIREQSGVQCWCTWKQKSTWSKIANEGRFDHYWGYRRWYVFYMS... \n", - "2 Q3I2X0 protein isoform MEPYKREGAQPAPASGVASSIWQFSNHMCVDMKGTRIQCKNTRCLA... \n", + " protein isoform sequence \\\n", + "0 A6F9D0 QECLKINLNVTFYWPNDLWSGSITKQIYLYQMWADCDAAPRFQCAA... \n", + "1 S1J1H7 GEVYHLRSENVQACQTSRMTMKLAQAVGETNPTHNEQATFWFYPPR... \n", + "2 J0Y5C7 HQKIHQSHLWSYHPLDKELQVMAVCYTHDHNGSYCKLGWEFEWWQI... \n", "\n", - " description taxon mass id preferred_id \n", - "0 f m a c f l u r a d 4278 NaN H0D1M0 uniprot \n", - "1 c z v l z q r z q i 4830 NaN X8N1C4 uniprot \n", - "2 s m l i n n k f k x 1925 7594.0 Q3I2X0 uniprot \n", + " description taxon mass id preferred_id \n", + "0 q w f k t b k v r r 6777 7636 A6F9D0 uniprot \n", + "1 n a n q o g u n f b 8327 None S1J1H7 uniprot \n", + "2 t q q c m b r o i f 5542 None J0Y5C7 uniprot \n", "entrez.protein\n", - " node_id node_label sequence \n", - "0 503804 entrez.protein NLNTNVYSPEPYAQKYLMDCQLVIHNLPYHLCNSPSSLVYADIFQW... \\\n", - "1 103919 entrez.protein YPHSFIFYCVSKCWWMKELMMKTLYQTTRCCRTGLQCLSQWDPFMM... \n", - "2 170557 entrez.protein RTCYFANEPITMCHPNWQWHHTCKADNAIGKNDMWTCIGYLAPDTW... \n", + " entrez.protein sequence \\\n", + "0 212 NQQWFKQMFRCQGTDLWDIFSPSDHLFFTPKYQKLDPCPQCTPRHH... \n", + "1 965260 MEFFVNWTNEQPTGVYLNIAYQELFHHIEAHPMIDSRIALHYKQKI... \n", + "2 111907 PAFNLVEFLELYDIQGKIWETKNIISSHVAPMPGQSKTWVTMDTLM... \n", "\n", " description taxon mass id preferred_id \n", - "0 p w z n p o x u v l 9606 None 503804 entrez \n", - "1 a p o j l y j w n n 9606 None 103919 entrez \n", - "2 g m s x m q q z i j 9606 None 170557 entrez \n" + "0 m a s a l c q a m h 9606 None 212 entrez \n", + "1 q x z m q h p k f z 9606 None 965260 entrez \n", + "2 t y n w p b d k q l 9606 None 111907 entrez \n" ] } ], @@ -1005,8 +1275,8 @@ "\n", "# Create BioCypher driver\n", "bc = BioCypher(\n", - " biocypher_config_path=join(schema_path, '05_biocypher_config.yaml'),\n", - " schema_config_path=join(schema_path, '05_schema_config.yaml'),\n", + " biocypher_config_path=join(local_path, '05_biocypher_config.yaml'),\n", + " schema_config_path=join(local_path, '05_schema_config.yaml'),\n", ")\n", "# Run the import\n", "bc.add(node_generator(proteins))\n", @@ -1045,7 +1315,7 @@ }, { "cell_type": "code", - "execution_count": 20, + "execution_count": 23, "metadata": {}, "outputs": [ { @@ -1086,7 +1356,7 @@ } ], "source": [ - "print_yaml(join(schema_path, '06_schema_config_pandas.yaml'))" + "print_yaml(join(local_path, '06_schema_config_pandas.yaml'))" ] }, { @@ -1099,7 +1369,7 @@ }, { "cell_type": "code", - "execution_count": 21, + "execution_count": 24, "metadata": {}, "outputs": [], "source": [ @@ -1114,16 +1384,16 @@ }, { "cell_type": "code", - "execution_count": 22, + "execution_count": 25, "metadata": {}, "outputs": [ { "data": { "text/plain": [ - "'U5Z5S0 interacts_with R9B8P2'" + "'S1J1H7 interacts_with A6F9D0'" ] }, - "execution_count": 22, + "execution_count": 25, "metadata": {}, "output_type": "execute_result" } @@ -1137,16 +1407,16 @@ }, { "cell_type": "code", - "execution_count": 24, + "execution_count": 26, "metadata": {}, "outputs": [ { "data": { "text/plain": [ - "{'source': 'signor'}" + "{'method': 'r p q s q d i k a b'}" ] }, - "execution_count": 24, + "execution_count": 26, "metadata": {}, "output_type": "execute_result" } @@ -1166,19 +1436,19 @@ }, { "cell_type": "code", - "execution_count": 34, + "execution_count": 27, "metadata": {}, "outputs": [], "source": [ "bc = BioCypher(\n", - " biocypher_config_path=join(schema_path, '06_biocypher_config.yaml'),\n", - " schema_config_path=join(schema_path, '06_schema_config_pandas.yaml'),\n", + " biocypher_config_path=join(local_path, '06_biocypher_config.yaml'),\n", + " schema_config_path=join(local_path, '06_schema_config_pandas.yaml'),\n", ")" ] }, { "cell_type": "code", - "execution_count": 35, + "execution_count": 28, "metadata": {}, "outputs": [ { @@ -1216,7 +1486,7 @@ }, { "cell_type": "code", - "execution_count": 36, + "execution_count": 29, "metadata": {}, "outputs": [ { @@ -1240,67 +1510,20 @@ " \n", " \n", " \n", - " relationship_id\n", - " source_id\n", - " target_id\n", - " relationship_label\n", - " source\n", + " protein protein interaction\n", + " _from\n", + " _to\n", " method\n", + " source\n", " \n", " \n", " \n", " \n", " 0\n", - " intact867611\n", - " U5Z5S0\n", - " R9B8P2\n", - " protein protein interaction\n", - " signor\n", - " None\n", - " \n", - " \n", - " 1\n", - " None\n", - " H0D1M0\n", - " U5Z5S0\n", - " protein protein interaction\n", - " None\n", - " None\n", - " \n", - " \n", - " 2\n", - " None\n", - " H0D1M0\n", - " X8N1C4\n", - " protein protein interaction\n", - " intact\n", - " x f i d j l n r u n\n", - " \n", - " \n", - " 3\n", - " None\n", - " H0D1M0\n", - " R9B8P2\n", - " protein protein interaction\n", - " None\n", - " y j m c u r l c x p\n", - " \n", - " \n", - " 4\n", - " None\n", - " X8N1C4\n", - " 103919\n", - " protein protein interaction\n", - " intact\n", - " v w c m l a t q v g\n", - " \n", - " \n", - " 5\n", " None\n", - " X8N1C4\n", - " R9B8P2\n", - " protein protein interaction\n", - " intact\n", + " S1J1H7\n", + " A6F9D0\n", + " r p q s q d i k a b\n", " None\n", " \n", " \n", @@ -1308,24 +1531,11 @@ "" ], "text/plain": [ - " relationship_id source_id target_id relationship_label source \n", - "0 intact867611 U5Z5S0 R9B8P2 protein protein interaction signor \\\n", - "1 None H0D1M0 U5Z5S0 protein protein interaction None \n", - "2 None H0D1M0 X8N1C4 protein protein interaction intact \n", - "3 None H0D1M0 R9B8P2 protein protein interaction None \n", - "4 None X8N1C4 103919 protein protein interaction intact \n", - "5 None X8N1C4 R9B8P2 protein protein interaction intact \n", - "\n", - " method \n", - "0 None \n", - "1 None \n", - "2 x f i d j l n r u n \n", - "3 y j m c u r l c x p \n", - "4 v w c m l a t q v g \n", - "5 None " + " protein protein interaction _from _to method source\n", + "0 None S1J1H7 A6F9D0 r p q s q d i k a b None" ] }, - "execution_count": 36, + "execution_count": 29, "metadata": {}, "output_type": "execute_result" } @@ -1344,7 +1554,7 @@ }, { "cell_type": "code", - "execution_count": 37, + "execution_count": 30, "metadata": {}, "outputs": [ { @@ -1371,10 +1581,10 @@ { "data": { "text/plain": [ - "" + "" ] }, - "execution_count": 37, + "execution_count": 30, "metadata": {}, "output_type": "execute_result" } @@ -1383,110 +1593,6 @@ "bc.show_ontology_structure()" ] }, - { - "attachments": {}, - "cell_type": "markdown", - "metadata": {}, - "source": [ - "### To keep or Remove" - ] - }, - { - "attachments": {}, - "cell_type": "markdown", - "metadata": {}, - "source": [ - "
\n", - "BioCypher provides feedback about property conflicts; try running the code\n", - "for this example (`04__properties.py`) with the schema configuration of the\n", - "previous section (`03_schema_config.yaml`) and see what happens.\n", - "
\n", - "\n", - "@slobentanzer - nothing drastic happens haha (I guess it's expected that we don't have mass? :D)\n", - "\n", - "@dbdimitrov - yes; this is important in the batch import setting where we need to adhere to a fixed number of columns, which does not apply to Pandas DataFrames. Not sure ATM whether we should implement a warning for this case or just ignore it." - ] - }, - { - "cell_type": "code", - "execution_count": 39, - "metadata": {}, - "outputs": [ - { - "data": { - "text/plain": [ - "{'sequence': 'PLWSVAKIHAEELPLLEYFVPDGSYDVPRGKMVNEFSEPEHWNVQCRADMYPEESIGKKYDILQMNDCMQTAFPAPIHQRCIEQHSEKKPMGLRGECFSHYMYEGTYKDIIPWQCGYDKHTLVIDIVGPGCRYTFFPWTSNFRRMGKLRKVLLPVNIKPYQRSWYNMVYDTAWGDVHGYDFIYPIWYNAMCAIDSNVYIGTHLFIMFEHMMAMKYIKRFCFLKEWFPHSLCKTKPKKDNDRNIQASVV',\n", - " 'description': 'y n d f b v j i d t',\n", - " 'taxon': '8076'}" - ] - }, - "execution_count": 39, - "metadata": {}, - "output_type": "execute_result" - } - ], - "source": [ - "proteins[0].get_properties()" - ] - }, - { - "cell_type": "code", - "execution_count": 42, - "metadata": {}, - "outputs": [ - { - "name": "stderr", - "output_type": "stream", - "text": [ - "INFO -- Loading ontologies...\n", - "INFO -- Instantiating OntologyAdapter class for https://github.com/biolink/biolink-model/raw/v3.2.1/biolink-model.owl.ttl.\n" - ] - }, - { - "data": { - "text/plain": [ - "{'uniprot.protein': node_id node_label sequence \n", - " 0 M2F0O5 uniprot.protein MQMWILHILSGWLNIIQFLVNNCMMKQLTEMCTIDQQDRARSTLNL... \\\n", - " 1 E8G3H2 uniprot.protein HDRLATDQDMKLWLGTHQAPENYFLGQMLILCQIYVQHIDRPASTW... \n", - " 2 T5C4X8 uniprot.protein QYHYNGCKMDDIDTFGWHQRYRSHWHIGVIRKIHITAHRTCSCGWW... \n", - " \n", - " description taxon id preferred_id mass \n", - " 0 s g y y i v z c u l 7385 M2F0O5 uniprot NaN \n", - " 1 n x i f n v g k s e 3477 E8G3H2 uniprot 7440.0 \n", - " 2 p s h x s o u q y i 941 T5C4X8 uniprot 6147.0 ,\n", - " 'entrez.protein': node_id node_label sequence \n", - " 0 159171 entrez.protein SSRPYRHQVRLCQLKSSLLLCPCWFLEFIDLNTKTSRSTPQQQHFP... \\\n", - " 1 285933 entrez.protein DIINFTMVFYMKKIVFPNFWGTPDSPLMRCFYRDWLAIAECLMLCW... \n", - " 2 827912 entrez.protein PTFHHFQSYSQCISDSNMFHLPLRKKYCCEPMPDGCDNIIPKQINF... \n", - " \n", - " description taxon id preferred_id \n", - " 0 o l j n w x t x a s 9606 159171 entrez \n", - " 1 s n o v y a t n f d 9606 285933 entrez \n", - " 2 v e j y l c y p b d 9606 827912 entrez }" - ] - }, - "execution_count": 42, - "metadata": {}, - "output_type": "execute_result" - } - ], - "source": [ - "# Create a list of proteins to be imported (now with properties)\n", - "proteins = [\n", - " p for sublist in zip(\n", - " [RandomPropertyProtein() for _ in range(n_proteins)],\n", - " [EntrezProtein() for _ in range(n_proteins)],\n", - " ) for p in sublist\n", - "]\n", - "# New instance, populated, and to DataFrame\n", - "bc = BioCypher(\n", - " biocypher_config_path=join(schema_path, '04_biocypher_config.yaml'),\n", - " schema_config_path=join(schema_path, '03_schema_config.yaml'),\n", - ")\n", - "bc.add(node_generator(proteins))\n", - "bc.to_df()" - ] - }, { "cell_type": "code", "execution_count": null, @@ -1511,7 +1617,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.10.6" + "version": "3.9.17" }, "orig_nbformat": 4, "vscode": { From f84721c06c5dc0cd64f829909fea370162694485 Mon Sep 17 00:00:00 2001 From: dbdimitrov Date: Sun, 25 Jun 2023 13:43:19 +0200 Subject: [PATCH 002/343] tailor to gcollab --- tutorial/08_basics_pandas.ipynb | 383 +++++++++++++++----------------- 1 file changed, 176 insertions(+), 207 deletions(-) diff --git a/tutorial/08_basics_pandas.ipynb b/tutorial/08_basics_pandas.ipynb index 7fa213e7..5e38222f 100644 --- a/tutorial/08_basics_pandas.ipynb +++ b/tutorial/08_basics_pandas.ipynb @@ -41,41 +41,16 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "To run this tutorial, you will need to have cloned and installed the BioCypher repository on your machine. We recommend using [Poetry](https://python-poetry.org/). \n", - "\n", - "To obtain both, run the following commands in your terminal:" - ] - }, - { - "attachments": {}, - "cell_type": "markdown", - "metadata": {}, - "source": [ - "```{bash}\n", - "git clone https://github.com/biocypher/biocypher.git\n", - "cd biocypher\n", - "poetry install\n", - "\n", - "```" + "To run this tutorial, you will need to first install BioCypher repository on the Virtual machine machine:" ] }, { - "attachments": {}, - "cell_type": "markdown", + "cell_type": "code", + "execution_count": null, "metadata": {}, + "outputs": [], "source": [ - "
\n", - " \n", - "
Poetry environment
\n", - "\n", - "In order to run the tutorial code, you will need to activate the Poetry\n", - "environment. This can be done by running `poetry shell` in the `biocypher`\n", - "directory. Alternatively, you can run the code from within the Poetry\n", - "environment by prepending `poetry run` to the command. For example, to run the\n", - "tutorial code, you can run `poetry run python tutorial/01__basic_import.py`.\n", - "\n", - "\n", - "
" + "!pip install biocypher" ] }, { @@ -115,12 +90,12 @@ "name": "stdout", "output_type": "stream", "text": [ - "--2023-06-25 13:32:30-- https://github.com/biocypher/biocypher/raw/main/tutorial/data_generator.py\n", - "Resolving github.com (github.com)... 140.82.121.4\n", - "Connecting to github.com (github.com)|140.82.121.4|:443... connected.\n", + "--2023-06-25 13:41:50-- https://github.com/biocypher/biocypher/raw/main/tutorial/data_generator.py\n", + "Resolving github.com (github.com)... 140.82.121.3\n", + "Connecting to github.com (github.com)|140.82.121.3|:443... connected.\n", "HTTP request sent, awaiting response... 302 Found\n", "Location: https://raw.githubusercontent.com/biocypher/biocypher/main/tutorial/data_generator.py [following]\n", - "--2023-06-25 13:32:30-- https://raw.githubusercontent.com/biocypher/biocypher/main/tutorial/data_generator.py\n", + "--2023-06-25 13:41:51-- https://raw.githubusercontent.com/biocypher/biocypher/main/tutorial/data_generator.py\n", "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", "HTTP request sent, awaiting response... 200 OK\n", @@ -129,7 +104,7 @@ "\n", "data_generator.py 100%[===================>] 6,81K --.-KB/s in 0s \n", "\n", - "2023-06-25 13:32:30 (39,0 MB/s) - ‘data_generator.py’ saved [6970/6970]\n", + "2023-06-25 13:41:51 (28,3 MB/s) - ‘data_generator.py’ saved [6970/6970]\n", "\n" ] } @@ -147,181 +122,181 @@ "name": "stderr", "output_type": "stream", "text": [ - "--2023-06-25 13:32:30-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/01_biocypher_config.yaml\n", + "--2023-06-25 13:41:51-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/01_biocypher_config.yaml\n", "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", "HTTP request sent, awaiting response... 200 OK\n", "Length: 64 [text/plain]\n", "Saving to: ‘01_biocypher_config.yaml.1’\n", "\n", - " 0K 100% 2,62M=0s\n", + " 0K 100% 2,96M=0s\n", "\n", - "2023-06-25 13:32:30 (2,62 MB/s) - ‘01_biocypher_config.yaml.1’ saved [64/64]\n", + "2023-06-25 13:41:51 (2,96 MB/s) - ‘01_biocypher_config.yaml.1’ saved [64/64]\n", "\n", - "--2023-06-25 13:32:30-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/01_schema_config.yaml\n", + "--2023-06-25 13:41:51-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/01_schema_config.yaml\n", "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", "HTTP request sent, awaiting response... 200 OK\n", "Length: 93 [text/plain]\n", "Saving to: ‘01_schema_config.yaml.1’\n", "\n", - " 0K 100% 3,45M=0s\n", + " 0K 100% 2,03M=0s\n", "\n", - "2023-06-25 13:32:30 (3,45 MB/s) - ‘01_schema_config.yaml.1’ saved [93/93]\n", + "2023-06-25 13:41:51 (2,03 MB/s) - ‘01_schema_config.yaml.1’ saved [93/93]\n", "\n", - "--2023-06-25 13:32:30-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/02_biocypher_config.yaml\n", + "--2023-06-25 13:41:51-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/02_biocypher_config.yaml\n", "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", "HTTP request sent, awaiting response... 200 OK\n", "Length: 58 [text/plain]\n", "Saving to: ‘02_biocypher_config.yaml.1’\n", "\n", - " 0K 100% 1,95M=0s\n", + " 0K 100% 3,21M=0s\n", "\n", - "2023-06-25 13:32:30 (1,95 MB/s) - ‘02_biocypher_config.yaml.1’ saved [58/58]\n", + "2023-06-25 13:41:52 (3,21 MB/s) - ‘02_biocypher_config.yaml.1’ saved [58/58]\n", "\n", - "--2023-06-25 13:32:30-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/02_schema_config.yaml\n", + "--2023-06-25 13:41:52-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/02_schema_config.yaml\n", "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", "HTTP request sent, awaiting response... 200 OK\n", "Length: 111 [text/plain]\n", "Saving to: ‘02_schema_config.yaml.1’\n", "\n", - " 0K 100% 3,16M=0s\n", + " 0K 100% 1,82M=0s\n", "\n", - "2023-06-25 13:32:30 (3,16 MB/s) - ‘02_schema_config.yaml.1’ saved [111/111]\n", + "2023-06-25 13:41:52 (1,82 MB/s) - ‘02_schema_config.yaml.1’ saved [111/111]\n", "\n", - "--2023-06-25 13:32:30-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/03_biocypher_config.yaml\n", + "--2023-06-25 13:41:52-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/03_biocypher_config.yaml\n", "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", "HTTP request sent, awaiting response... 200 OK\n", "Length: 69 [text/plain]\n", "Saving to: ‘03_biocypher_config.yaml.1’\n", "\n", - " 0K 100% 1,55M=0s\n", + " 0K 100% 1,43M=0s\n", "\n", - "2023-06-25 13:32:31 (1,55 MB/s) - ‘03_biocypher_config.yaml.1’ saved [69/69]\n", + "2023-06-25 13:41:52 (1,43 MB/s) - ‘03_biocypher_config.yaml.1’ saved [69/69]\n", "\n", - "--2023-06-25 13:32:31-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/03_schema_config.yaml\n", + "--2023-06-25 13:41:52-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/03_schema_config.yaml\n", "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", "HTTP request sent, awaiting response... 200 OK\n", "Length: 121 [text/plain]\n", "Saving to: ‘03_schema_config.yaml.1’\n", "\n", - " 0K 100% 9,91M=0s\n", + " 0K 100% 11,4M=0s\n", "\n", - "2023-06-25 13:32:31 (9,91 MB/s) - ‘03_schema_config.yaml.1’ saved [121/121]\n", + "2023-06-25 13:41:52 (11,4 MB/s) - ‘03_schema_config.yaml.1’ saved [121/121]\n", "\n", - "--2023-06-25 13:32:31-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/04_biocypher_config.yaml\n", + "--2023-06-25 13:41:52-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/04_biocypher_config.yaml\n", "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", "HTTP request sent, awaiting response... 200 OK\n", "Length: 63 [text/plain]\n", "Saving to: ‘04_biocypher_config.yaml.1’\n", "\n", - " 0K 100% 1,94M=0s\n", + " 0K 100% 1,04M=0s\n", "\n", - "2023-06-25 13:32:31 (1,94 MB/s) - ‘04_biocypher_config.yaml.1’ saved [63/63]\n", + "2023-06-25 13:41:52 (1,04 MB/s) - ‘04_biocypher_config.yaml.1’ saved [63/63]\n", "\n", - "--2023-06-25 13:32:31-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/04_schema_config.yaml\n", + "--2023-06-25 13:41:52-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/04_schema_config.yaml\n", "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", "HTTP request sent, awaiting response... 200 OK\n", "Length: 221 [text/plain]\n", "Saving to: ‘04_schema_config.yaml.1’\n", "\n", - " 0K 100% 11,0M=0s\n", + " 0K 100% 19,4M=0s\n", "\n", - "2023-06-25 13:32:31 (11,0 MB/s) - ‘04_schema_config.yaml.1’ saved [221/221]\n", + "2023-06-25 13:41:53 (19,4 MB/s) - ‘04_schema_config.yaml.1’ saved [221/221]\n", "\n", - "--2023-06-25 13:32:31-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/05_biocypher_config.yaml\n", + "--2023-06-25 13:41:53-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/05_biocypher_config.yaml\n", "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", "HTTP request sent, awaiting response... 200 OK\n", "Length: 72 [text/plain]\n", "Saving to: ‘05_biocypher_config.yaml.1’\n", "\n", - " 0K 100% 3,66M=0s\n", + " 0K 100% 1,58M=0s\n", "\n", - "2023-06-25 13:32:31 (3,66 MB/s) - ‘05_biocypher_config.yaml.1’ saved [72/72]\n", + "2023-06-25 13:41:53 (1,58 MB/s) - ‘05_biocypher_config.yaml.1’ saved [72/72]\n", "\n", - "--2023-06-25 13:32:31-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/05_schema_config.yaml\n", + "--2023-06-25 13:41:53-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/05_schema_config.yaml\n", "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", "HTTP request sent, awaiting response... 200 OK\n", "Length: 370 [text/plain]\n", "Saving to: ‘05_schema_config.yaml.1’\n", "\n", - " 0K 100% 12,6M=0s\n", + " 0K 100% 9,42M=0s\n", "\n", - "2023-06-25 13:32:31 (12,6 MB/s) - ‘05_schema_config.yaml.1’ saved [370/370]\n", + "2023-06-25 13:41:53 (9,42 MB/s) - ‘05_schema_config.yaml.1’ saved [370/370]\n", "\n", - "--2023-06-25 13:32:31-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/06_biocypher_config.yaml\n", + "--2023-06-25 13:41:53-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/06_biocypher_config.yaml\n", "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", "HTTP request sent, awaiting response... 200 OK\n", "Length: 66 [text/plain]\n", "Saving to: ‘06_biocypher_config.yaml.1’\n", "\n", - " 0K 100% 4,44M=0s\n", + " 0K 100% 4,99M=0s\n", "\n", - "2023-06-25 13:32:31 (4,44 MB/s) - ‘06_biocypher_config.yaml.1’ saved [66/66]\n", + "2023-06-25 13:41:53 (4,99 MB/s) - ‘06_biocypher_config.yaml.1’ saved [66/66]\n", "\n", - "--2023-06-25 13:32:31-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/06_schema_config.yaml\n", + "--2023-06-25 13:41:53-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/06_schema_config.yaml\n", "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", "HTTP request sent, awaiting response... 200 OK\n", "Length: 579 [text/plain]\n", "Saving to: ‘06_schema_config.yaml.1’\n", "\n", - " 0K 100% 26,7M=0s\n", + " 0K 100% 18,8M=0s\n", "\n", - "2023-06-25 13:32:31 (26,7 MB/s) - ‘06_schema_config.yaml.1’ saved [579/579]\n", + "2023-06-25 13:41:53 (18,8 MB/s) - ‘06_schema_config.yaml.1’ saved [579/579]\n", "\n", - "--2023-06-25 13:32:31-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/06_schema_config_pandas.yaml\n", + "--2023-06-25 13:41:53-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/06_schema_config_pandas.yaml\n", "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", "HTTP request sent, awaiting response... 200 OK\n", "Length: 579 [text/plain]\n", "Saving to: ‘06_schema_config_pandas.yaml.1’\n", "\n", - " 0K 100% 10,5M=0s\n", + " 0K 100% 14,3M=0s\n", "\n", - "2023-06-25 13:32:31 (10,5 MB/s) - ‘06_schema_config_pandas.yaml.1’ saved [579/579]\n", + "2023-06-25 13:41:54 (14,3 MB/s) - ‘06_schema_config_pandas.yaml.1’ saved [579/579]\n", "\n", - "--2023-06-25 13:32:31-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/07_biocypher_config.yaml\n", + "--2023-06-25 13:41:54-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/07_biocypher_config.yaml\n", "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", "HTTP request sent, awaiting response... 200 OK\n", "Length: 79 [text/plain]\n", "Saving to: ‘07_biocypher_config.yaml.1’\n", "\n", - " 0K 100% 2,64M=0s\n", + " 0K 100% 1,21M=0s\n", "\n", - "2023-06-25 13:32:31 (2,64 MB/s) - ‘07_biocypher_config.yaml.1’ saved [79/79]\n", + "2023-06-25 13:41:54 (1,21 MB/s) - ‘07_biocypher_config.yaml.1’ saved [79/79]\n", "\n", - "--2023-06-25 13:32:31-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/07_schema_config.yaml\n", + "--2023-06-25 13:41:54-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/07_schema_config.yaml\n", "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", "HTTP request sent, awaiting response... 200 OK\n", "Length: 711 [text/plain]\n", "Saving to: ‘07_schema_config.yaml.1’\n", "\n", - " 0K 100% 32,3M=0s\n", + " 0K 100% 25,2M=0s\n", "\n", - "2023-06-25 13:32:31 (32,3 MB/s) - ‘07_schema_config.yaml.1’ saved [711/711]\n", + "2023-06-25 13:41:54 (25,2 MB/s) - ‘07_schema_config.yaml.1’ saved [711/711]\n", "\n", - "--2023-06-25 13:32:31-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/07_schema_config_pandas.yaml\n", + "--2023-06-25 13:41:54-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/07_schema_config_pandas.yaml\n", "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", "HTTP request sent, awaiting response... 200 OK\n", "Length: 711 [text/plain]\n", "Saving to: ‘07_schema_config_pandas.yaml.1’\n", "\n", - " 0K 100% 40,3M=0s\n", + " 0K 100% 8,67M=0s\n", "\n", - "2023-06-25 13:32:31 (40,3 MB/s) - ‘07_schema_config_pandas.yaml.1’ saved [711/711]\n", + "2023-06-25 13:41:54 (8,67 MB/s) - ‘07_schema_config_pandas.yaml.1’ saved [711/711]\n", "\n" ] } @@ -371,21 +346,7 @@ "\n", " print(\"--------------\")\n", " print(yaml.dump(yaml_data, sort_keys=False, indent=4))\n", - " print(\"--------------\")\n", - "\n", - " \n", - "# # helper function read yaml from url\n", - "# def read_yaml(url):\n", - "# response = requests.get(url, allow_redirects=True)\n", - "# content = response.content.decode(\"utf-8\")\n", - "# yaml_data = yaml.safe_load(content)\n", - "# return yaml_data\n", - "\n", - "# # helper function to print yaml files\n", - "# def print_yaml(url):\n", - "# print(\"--------------\")\n", - "# print(yaml.dump(read_yaml(url), sort_keys=False, indent=4))\n", - "# print(\"--------------\")" + " print(\"--------------\")" ] }, { @@ -531,14 +492,13 @@ "output_type": "stream", "text": [ "INFO -- This is BioCypher v0.5.12.\n", - "INFO -- Logging into `biocypher-log/biocypher-20230625-133232.log`.\n" + "INFO -- Logging into `biocypher-log/biocypher-20230625-134155.log`.\n" ] } ], "source": [ "from biocypher import BioCypher\n", - "from os.path import join\n", - "local_path = join('..', 'tutorial')" + "from os.path import join" ] }, { @@ -561,7 +521,7 @@ } ], "source": [ - "print_yaml(join(local_path, '01_schema_config.yaml'))" + "print_yaml('01_schema_config.yaml')" ] }, { @@ -644,8 +604,8 @@ ], "source": [ "bc = BioCypher(\n", - " biocypher_config_path=join(local_path, '01_biocypher_config.yaml'),\n", - " schema_config_path=join(local_path, '01_schema_config.yaml'),\n", + " biocypher_config_path='01_biocypher_config.yaml',\n", + " schema_config_path='01_schema_config.yaml',\n", ")\n", "# Add the entities that we generated above to the graph\n", "bc.add(entities)" @@ -660,14 +620,14 @@ "data": { "text/plain": [ "{'protein': protein sequence \\\n", - " 0 D9D1F0 ILLVTAERGYLDNMWWQESNFYKTAPVETTYKIFAMAWDRILAHYI... \n", - " 1 I9O8W8 HDSFDMTECRNDRNNKGQQHPIWEQLWFSSELFNKQMSCCWNNCVC... \n", - " 2 T2G7H0 KYRYCFNTRGERFWMVVDMLVHQMTVYIGQINARARNHCEFNLWAP... \n", + " 0 F7V4U2 RMFDDRFPVELRICTGSLVIINLGEFAEQHDKQDGSKPSHQPMFAT... \n", + " 1 K2Y8U3 HWPPSGVSCGVFPECWYRWRDEQWACFGPHIKYNKDNTWSWAQWMH... \n", + " 2 L1V6V9 QAEPKYKLAQENCRVQIKLPKIVGTCRPHWMTKTYHVLHTCVLWKS... \n", " \n", " description taxon id preferred_id \n", - " 0 r c x m t q z p w q 9606 D9D1F0 uniprot \n", - " 1 t u k v p f h k v w 9606 I9O8W8 uniprot \n", - " 2 p j h v n p b z y m 9606 T2G7H0 uniprot }" + " 0 i f c m m q e o o s 9606 F7V4U2 uniprot \n", + " 1 e y p g j t j y r x 9606 K2Y8U3 uniprot \n", + " 2 a i b t l j e g n j 9606 L1V6V9 uniprot }" ] }, "execution_count": 10, @@ -728,7 +688,7 @@ } ], "source": [ - "print_yaml(join(local_path, '02_schema_config.yaml'))" + "print_yaml('02_schema_config.yaml')" ] }, { @@ -755,8 +715,8 @@ "]\n", "# Create a new BioCypher instance\n", "bc = BioCypher(\n", - " biocypher_config_path=join(local_path, '02_biocypher_config.yaml'),\n", - " schema_config_path=join(local_path, '02_schema_config.yaml'),\n", + " biocypher_config_path='02_biocypher_config.yaml',\n", + " schema_config_path='02_schema_config.yaml',\n", ")\n", "# Run the import\n", "bc.add(node_generator(proteins))" @@ -771,20 +731,20 @@ "data": { "text/plain": [ "{'protein': protein sequence \\\n", - " 0 Z9J6J5 DTQKCACGLWTRTLDIDDLWAHEECLNWATRKWHTGQLLNKKTTII... \n", - " 1 933153 WFETRCYRFAVCTLALRYRDEMSNHEDYGVFHMTNAIGLMQMQILN... \n", - " 2 Y7E9I7 YHDYTIAHKGMKWIGLGFLVYQWNCMNKPSRQHMQKEHLMWCMWVM... \n", - " 3 989014 GAVIGVNENAKHAMWEGQPPADFNKVRDIDWPKKGRCDHNFDNGHA... \n", - " 4 N3C8G8 SMAYFGKEGDANMCKGNTSRAQWSVWKRFQQPCMNAGWSTLPGQDM... \n", - " 5 837842 NLFGTMWDHHMRCDVQQQKCSAALSLRRCSVLQHQMPGKSDKRDGV... \n", + " 0 K2W3K5 TVKISILFNPLPNQDMNTTTCQAESNYKAIYLYPWCSMDDVWNVEA... \n", + " 1 186009 FHYHGGMGPFMTYQNFLHWEQMQPMKLFNEPMQFHDWYGTHVNWPG... \n", + " 2 S6E6D1 CSVQIQIGMSQDSPDSSEGNMDCPPRNIGGYEIVCNVQGKRCYSTD... \n", + " 3 926766 HKEAELLVKGQIQTPKCLRHNHFYAKLTIVIELNYMVDRYGKDMAR... \n", + " 4 Z1F6R2 FMVWKDCLCIRMRHMAVPVPQYHCEYFEVILERWEVPCFSVLNRCK... \n", + " 5 362641 PISDEQEMGSEFCGHCNTGVYQVEMHFFECEDLNPKVQPKWIFTVT... \n", " \n", " description taxon id preferred_id \n", - " 0 u r m y c w g j i a 9606 Z9J6J5 uniprot \n", - " 1 d s o f a q m v n l 9606 933153 uniprot \n", - " 2 v z a f k f m n e c 9606 Y7E9I7 uniprot \n", - " 3 d m k v y p n e e l 9606 989014 uniprot \n", - " 4 r s f i m d h x p s 9606 N3C8G8 uniprot \n", - " 5 c f c c z a m x p h 9606 837842 uniprot }" + " 0 e e v h x f t f j l 9606 K2W3K5 uniprot \n", + " 1 b c q m l d a u u g 9606 186009 uniprot \n", + " 2 i z t s l x v g j l 9606 S6E6D1 uniprot \n", + " 3 t n a j d l j a t a 9606 926766 uniprot \n", + " 4 h d m k q n r e h r 9606 Z1F6R2 uniprot \n", + " 5 l m x k h m v g p y 9606 362641 uniprot }" ] }, "execution_count": 14, @@ -861,7 +821,7 @@ } ], "source": [ - "print_yaml(join(local_path, '03_schema_config.yaml'))" + "print_yaml('03_schema_config.yaml')" ] }, { @@ -907,23 +867,23 @@ "data": { "text/plain": [ "{'uniprot.protein': uniprot.protein sequence \\\n", - " 0 Z9J6J5 DTQKCACGLWTRTLDIDDLWAHEECLNWATRKWHTGQLLNKKTTII... \n", - " 1 Y7E9I7 YHDYTIAHKGMKWIGLGFLVYQWNCMNKPSRQHMQKEHLMWCMWVM... \n", - " 2 N3C8G8 SMAYFGKEGDANMCKGNTSRAQWSVWKRFQQPCMNAGWSTLPGQDM... \n", + " 0 K2W3K5 TVKISILFNPLPNQDMNTTTCQAESNYKAIYLYPWCSMDDVWNVEA... \n", + " 1 S6E6D1 CSVQIQIGMSQDSPDSSEGNMDCPPRNIGGYEIVCNVQGKRCYSTD... \n", + " 2 Z1F6R2 FMVWKDCLCIRMRHMAVPVPQYHCEYFEVILERWEVPCFSVLNRCK... \n", " \n", " description taxon id preferred_id \n", - " 0 u r m y c w g j i a 9606 Z9J6J5 uniprot \n", - " 1 v z a f k f m n e c 9606 Y7E9I7 uniprot \n", - " 2 r s f i m d h x p s 9606 N3C8G8 uniprot ,\n", + " 0 e e v h x f t f j l 9606 K2W3K5 uniprot \n", + " 1 i z t s l x v g j l 9606 S6E6D1 uniprot \n", + " 2 h d m k q n r e h r 9606 Z1F6R2 uniprot ,\n", " 'entrez.protein': entrez.protein sequence \\\n", - " 0 933153 WFETRCYRFAVCTLALRYRDEMSNHEDYGVFHMTNAIGLMQMQILN... \n", - " 1 989014 GAVIGVNENAKHAMWEGQPPADFNKVRDIDWPKKGRCDHNFDNGHA... \n", - " 2 837842 NLFGTMWDHHMRCDVQQQKCSAALSLRRCSVLQHQMPGKSDKRDGV... \n", + " 0 186009 FHYHGGMGPFMTYQNFLHWEQMQPMKLFNEPMQFHDWYGTHVNWPG... \n", + " 1 926766 HKEAELLVKGQIQTPKCLRHNHFYAKLTIVIELNYMVDRYGKDMAR... \n", + " 2 362641 PISDEQEMGSEFCGHCNTGVYQVEMHFFECEDLNPKVQPKWIFTVT... \n", " \n", " description taxon id preferred_id \n", - " 0 d s o f a q m v n l 9606 933153 entrez \n", - " 1 d m k v y p n e e l 9606 989014 entrez \n", - " 2 c f c c z a m x p h 9606 837842 entrez }" + " 0 b c q m l d a u u g 9606 186009 entrez \n", + " 1 t n a j d l j a t a 9606 926766 entrez \n", + " 2 l m x k h m v g p y 9606 362641 entrez }" ] }, "execution_count": 16, @@ -933,8 +893,8 @@ ], "source": [ "bc = BioCypher(\n", - " biocypher_config_path=join(local_path, '03_biocypher_config.yaml'),\n", - " schema_config_path=join(local_path, '03_schema_config.yaml'),\n", + " biocypher_config_path='03_biocypher_config.yaml',\n", + " schema_config_path='03_schema_config.yaml',\n", ")\n", "bc.add(node_generator(proteins))\n", "bc.to_df()" @@ -1012,7 +972,7 @@ }, { "cell_type": "code", - "execution_count": 17, + "execution_count": 18, "metadata": {}, "outputs": [ { @@ -1039,7 +999,7 @@ } ], "source": [ - "print_yaml(join(local_path, '04_schema_config.yaml'))" + "print_yaml('04_schema_config.yaml')" ] }, { @@ -1061,7 +1021,7 @@ }, { "cell_type": "code", - "execution_count": 18, + "execution_count": 19, "metadata": {}, "outputs": [], "source": [ @@ -1070,7 +1030,7 @@ }, { "cell_type": "code", - "execution_count": 19, + "execution_count": 20, "metadata": {}, "outputs": [ { @@ -1085,26 +1045,26 @@ "data": { "text/plain": [ "{'uniprot.protein': uniprot.protein sequence \\\n", - " 0 W9U7K0 PGAETNIDVNLDNWMSLRKQEHVMFFFYRYFSIGTLTGILLVMFTK... \n", - " 1 U7X3A1 AAMQNTQNEWGIPREKVFKKWGDRITLWHRIFCKCSTLYMQFVSDM... \n", - " 2 H8G7V8 ALGFVEIFYTGSGTPAGTKCQVMTQVVMIPQERWWSGCRQMDCCVG... \n", + " 0 S1Z9L5 RHLRGDVMQEDHHTSSERMVYNVLPQDYKVVSCEYWNTQVTALWVI... \n", + " 1 W9J5F1 IPFSQSAWAQQRIGPKGTKAHGVTQPAPMDIKNLCNLTDLTLILDF... \n", + " 2 T1J3U0 WFGCCHKQYVSHVIDRQDPQSPSDNPSLVSQLQFFMWGIQIQNGEI... \n", " \n", " description taxon mass id preferred_id \n", - " 0 e k f u r x k m s v 6528 8244 W9U7K0 uniprot \n", - " 1 z d k q k a f k c n 5602 5546 U7X3A1 uniprot \n", - " 2 m z b v d y r r l b 7640 None H8G7V8 uniprot ,\n", + " 0 u x e o k m a i o s 3899 None S1Z9L5 uniprot \n", + " 1 i x k c r b p d d p 8873 None W9J5F1 uniprot \n", + " 2 m a w r r u x c w o 1966 9364 T1J3U0 uniprot ,\n", " 'entrez.protein': entrez.protein sequence \\\n", - " 0 673163 CFANCLVYGTSDPNGGMMRVCACFNPKRVKYRGQPCSSKQVPCEDH... \n", - " 1 906051 HWSNYKSSWDDEWVGWSNFGSMVCTRLRMFVRIREISKPMTSMMSY... \n", - " 2 702730 HTQKQDWAVFEPDHTLMDNFKIRVCQSWGDMMSCDGVRVHGSETHP... \n", + " 0 405878 RMTDGFEWQLDFHAFIWCNQAAWQLPLEVHISQGNGGWRMGLYGNM... \n", + " 1 154167 CGMNYDNGYFSVAYQSYDLWYHQQLKTRGVKPAEKDSDKDLGIDVI... \n", + " 2 234189 GQWQECIQGFTPQQMCVDCCAETKLANKSYYHSWMTWRLSGLCFNM... \n", " \n", " description taxon mass id preferred_id \n", - " 0 z a p w q g a i j x 9606 None 673163 entrez \n", - " 1 a t h j o n v u s j 9606 None 906051 entrez \n", - " 2 z y u u g a v z t v 9606 None 702730 entrez }" + " 0 y c s v s n e c h o 9606 None 405878 entrez \n", + " 1 i k n c e n r n c d 9606 None 154167 entrez \n", + " 2 o v w y g h y e v y 9606 None 234189 entrez }" ] }, - "execution_count": 19, + "execution_count": 20, "metadata": {}, "output_type": "execute_result" } @@ -1119,8 +1079,8 @@ "]\n", "# New instance, populated, and to DataFrame\n", "bc = BioCypher(\n", - " biocypher_config_path=join(local_path, '04_biocypher_config.yaml'),\n", - " schema_config_path=join(local_path, '04_schema_config.yaml'),\n", + " biocypher_config_path='04_biocypher_config.yaml',\n", + " schema_config_path='04_schema_config.yaml',\n", ")\n", "bc.add(node_generator(proteins))\n", "bc.to_df()" @@ -1146,7 +1106,7 @@ }, { "cell_type": "code", - "execution_count": 20, + "execution_count": 21, "metadata": {}, "outputs": [], "source": [ @@ -1155,7 +1115,7 @@ }, { "cell_type": "code", - "execution_count": 21, + "execution_count": 22, "metadata": {}, "outputs": [ { @@ -1188,7 +1148,7 @@ } ], "source": [ - "print_yaml(join(local_path, '05_schema_config.yaml'))" + "print_yaml('05_schema_config.yaml')" ] }, { @@ -1215,7 +1175,7 @@ }, { "cell_type": "code", - "execution_count": 22, + "execution_count": 23, "metadata": {}, "outputs": [ { @@ -1232,34 +1192,34 @@ "text": [ "uniprot.protein\n", " uniprot.protein sequence \\\n", - "0 M8N1V7 RMIPMDRLHTCRQEGVRMFQCEGWACNSIRTGWLPLYKQEPFGGSF... \n", - "1 X3T3W1 YTLNRFCHGYKHYSQYQWDDVRQRLLEDVGEDVGVCVWKTWCRMYN... \n", - "2 R1T0U8 ETNFMLLVKGIMDWHIVIHRVWRPQINMNVKFPENEKVGHKCACPN... \n", + "0 A9L6G4 SWIVVGQPDSHNKRLVNYHWMRCEHPLRCWRPIYVVRVSFQSQCEQ... \n", + "1 E4N2H2 PGVMILDNMQHKCSKELSTRQIITNHWICNSAPISWSSGMDRSCLD... \n", + "2 V4F1T1 DQCHNLCPGSSFQCPENAFGNDWIDHMPQETGLMQYDDPQSGMWFT... \n", "\n", " description taxon mass id preferred_id \n", - "0 d a c d p u w o c h 1180 None M8N1V7 uniprot \n", - "1 k k z t p o y v v e 8234 3419 X3T3W1 uniprot \n", - "2 o f f h y m c d r e 7772 4738 R1T0U8 uniprot \n", + "0 m o k j a f w v w r 4220 None A9L6G4 uniprot \n", + "1 n v i r s f m f d w 6339 6481 E4N2H2 uniprot \n", + "2 w e v v a b o b b u 9176 6510 V4F1T1 uniprot \n", "protein isoform\n", " protein isoform sequence \\\n", - "0 A6F9D0 QECLKINLNVTFYWPNDLWSGSITKQIYLYQMWADCDAAPRFQCAA... \n", - "1 S1J1H7 GEVYHLRSENVQACQTSRMTMKLAQAVGETNPTHNEQATFWFYPPR... \n", - "2 J0Y5C7 HQKIHQSHLWSYHPLDKELQVMAVCYTHDHNGSYCKLGWEFEWWQI... \n", + "0 F0N9A4 QDVVLVEGCGDEGWIHMPEKRPGQAYKWCERFRPIPDFTNSIKIAY... \n", + "1 B1W6O2 SQKHFRRWWTNDCFGQELMSIYYNVKFWDNLIEMTGGPASRVCLGQ... \n", + "2 G6V5R9 ASAITPFSYEKPHTVTLDATEVFPKMQDAQAIEREIHFSKSTLVYG... \n", "\n", " description taxon mass id preferred_id \n", - "0 q w f k t b k v r r 6777 7636 A6F9D0 uniprot \n", - "1 n a n q o g u n f b 8327 None S1J1H7 uniprot \n", - "2 t q q c m b r o i f 5542 None J0Y5C7 uniprot \n", + "0 r f e a v a a g w r 8061 None F0N9A4 uniprot \n", + "1 a c a v v k v k c w 6786 None B1W6O2 uniprot \n", + "2 c k g d a l f r t v 6868 1323 G6V5R9 uniprot \n", "entrez.protein\n", " entrez.protein sequence \\\n", - "0 212 NQQWFKQMFRCQGTDLWDIFSPSDHLFFTPKYQKLDPCPQCTPRHH... \n", - "1 965260 MEFFVNWTNEQPTGVYLNIAYQELFHHIEAHPMIDSRIALHYKQKI... \n", - "2 111907 PAFNLVEFLELYDIQGKIWETKNIISSHVAPMPGQSKTWVTMDTLM... \n", + "0 52329 DYRSMAPTFILMKIYPACDAITKRRWSVATVKDGEFIWWSAVKIFP... \n", + "1 581107 LLVFNMGQLAVAGYGNTMVSAMMCFCCDVKARMGMSWLPKITTMQW... \n", + "2 270569 MVCSHHELAVAFQTMCPIQGDAATAKANAHRTTDKQNWMVVKWFRT... \n", "\n", " description taxon mass id preferred_id \n", - "0 m a s a l c q a m h 9606 None 212 entrez \n", - "1 q x z m q h p k f z 9606 None 965260 entrez \n", - "2 t y n w p b d k q l 9606 None 111907 entrez \n" + "0 q k r b h g t q x x 9606 None 52329 entrez \n", + "1 h f g z j r b g m w 9606 None 581107 entrez \n", + "2 s b p v f u t y g v 9606 None 270569 entrez \n" ] } ], @@ -1275,8 +1235,8 @@ "\n", "# Create BioCypher driver\n", "bc = BioCypher(\n", - " biocypher_config_path=join(local_path, '05_biocypher_config.yaml'),\n", - " schema_config_path=join(local_path, '05_schema_config.yaml'),\n", + " biocypher_config_path='05_biocypher_config.yaml',\n", + " schema_config_path='05_schema_config.yaml',\n", ")\n", "# Run the import\n", "bc.add(node_generator(proteins))\n", @@ -1315,7 +1275,7 @@ }, { "cell_type": "code", - "execution_count": 23, + "execution_count": 24, "metadata": {}, "outputs": [ { @@ -1356,7 +1316,7 @@ } ], "source": [ - "print_yaml(join(local_path, '06_schema_config_pandas.yaml'))" + "print_yaml('06_schema_config_pandas.yaml')" ] }, { @@ -1369,7 +1329,7 @@ }, { "cell_type": "code", - "execution_count": 24, + "execution_count": 25, "metadata": {}, "outputs": [], "source": [ @@ -1384,16 +1344,16 @@ }, { "cell_type": "code", - "execution_count": 25, + "execution_count": 26, "metadata": {}, "outputs": [ { "data": { "text/plain": [ - "'S1J1H7 interacts_with A6F9D0'" + "'A9L6G4 interacts_with V4F1T1'" ] }, - "execution_count": 25, + "execution_count": 26, "metadata": {}, "output_type": "execute_result" } @@ -1407,16 +1367,16 @@ }, { "cell_type": "code", - "execution_count": 26, + "execution_count": 27, "metadata": {}, "outputs": [ { "data": { "text/plain": [ - "{'method': 'r p q s q d i k a b'}" + "{'source': 'signor', 'method': 'u z c x m d c u g s'}" ] }, - "execution_count": 26, + "execution_count": 27, "metadata": {}, "output_type": "execute_result" } @@ -1436,19 +1396,19 @@ }, { "cell_type": "code", - "execution_count": 27, + "execution_count": 28, "metadata": {}, "outputs": [], "source": [ "bc = BioCypher(\n", - " biocypher_config_path=join(local_path, '06_biocypher_config.yaml'),\n", - " schema_config_path=join(local_path, '06_schema_config_pandas.yaml'),\n", + " biocypher_config_path='06_biocypher_config.yaml',\n", + " schema_config_path='06_schema_config_pandas.yaml',\n", ")" ] }, { "cell_type": "code", - "execution_count": 28, + "execution_count": 29, "metadata": {}, "outputs": [ { @@ -1486,7 +1446,7 @@ }, { "cell_type": "code", - "execution_count": 29, + "execution_count": 30, "metadata": {}, "outputs": [ { @@ -1513,17 +1473,25 @@ " protein protein interaction\n", " _from\n", " _to\n", - " method\n", " source\n", + " method\n", " \n", " \n", " \n", " \n", " 0\n", + " intact703256\n", + " A9L6G4\n", + " V4F1T1\n", + " signor\n", + " u z c x m d c u g s\n", + " \n", + " \n", + " 1\n", " None\n", - " S1J1H7\n", - " A6F9D0\n", - " r p q s q d i k a b\n", + " E4N2H2\n", + " F0N9A4\n", + " intact\n", " None\n", " \n", " \n", @@ -1531,11 +1499,12 @@ "" ], "text/plain": [ - " protein protein interaction _from _to method source\n", - "0 None S1J1H7 A6F9D0 r p q s q d i k a b None" + " protein protein interaction _from _to source method\n", + "0 intact703256 A9L6G4 V4F1T1 signor u z c x m d c u g s\n", + "1 None E4N2H2 F0N9A4 intact None" ] }, - "execution_count": 29, + "execution_count": 30, "metadata": {}, "output_type": "execute_result" } @@ -1554,7 +1523,7 @@ }, { "cell_type": "code", - "execution_count": 30, + "execution_count": 31, "metadata": {}, "outputs": [ { @@ -1581,10 +1550,10 @@ { "data": { "text/plain": [ - "" + "" ] }, - "execution_count": 30, + "execution_count": 31, "metadata": {}, "output_type": "execute_result" } From bace4f6a3047ce66a570ed8fa55613476b8f2b09 Mon Sep 17 00:00:00 2001 From: dbdimitrov Date: Sun, 25 Jun 2023 13:49:58 +0200 Subject: [PATCH 003/343] fix typo --- tutorial/08_basics_pandas.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutorial/08_basics_pandas.ipynb b/tutorial/08_basics_pandas.ipynb index 5e38222f..4c7eef7e 100644 --- a/tutorial/08_basics_pandas.ipynb +++ b/tutorial/08_basics_pandas.ipynb @@ -41,7 +41,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "To run this tutorial, you will need to first install BioCypher repository on the Virtual machine machine:" + "To run this tutorial, you will need to first install BioCypher repository on the virtual machine:" ] }, { From d8b114025ab6ea992b2b3f867ae3c6c62df36e59 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Mon, 26 Jun 2023 13:38:24 +0200 Subject: [PATCH 004/343] changed some display formatting --- tutorial/08_basics_pandas.ipynb | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/tutorial/08_basics_pandas.ipynb b/tutorial/08_basics_pandas.ipynb index 4c7eef7e..b2c28046 100644 --- a/tutorial/08_basics_pandas.ipynb +++ b/tutorial/08_basics_pandas.ipynb @@ -637,7 +637,7 @@ ], "source": [ "# Print the graph as a dictionary of pandas DataFrame(s) per node label\n", - "bc.to_df()" + "display(bc.to_df())" ] }, { @@ -897,7 +897,7 @@ " schema_config_path='03_schema_config.yaml',\n", ")\n", "bc.add(node_generator(proteins))\n", - "bc.to_df()" + "display(bc.to_df())" ] }, { @@ -1083,7 +1083,7 @@ " schema_config_path='04_schema_config.yaml',\n", ")\n", "bc.add(node_generator(proteins))\n", - "bc.to_df()" + "display(bc.to_df())" ] }, { @@ -1160,17 +1160,13 @@ "class has properties already, they will be kept (if they are not present in the\n", "parent class) or replaced by the parent class properties (if they are present).\n", "\n", - "
\n", "Again, apart from adding the protein isoforms to the input stream, the code\n", "for this example is identical to the previous one except for the reference to\n", "the updated schema configuration.\n", - "
\n", "\n", - "
\n", "We now create three separate DataFrames, all of which are children of the\n", "`protein` class; two implicit children (`uniprot.protein` and `entrez.protein`)\n", - "and one explicit child (`protein isoform`).\n", - "
\n" + "and one explicit child (`protein isoform`).\n" ] }, { @@ -1243,7 +1239,7 @@ "\n", "for name, df in bc.to_df().items():\n", " print(name)\n", - " print(df)" + " display(df)" ] }, { From c675055454ead16c39c87381b70de153af249768 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Mon, 26 Jun 2023 13:42:16 +0200 Subject: [PATCH 005/343] more display --- tutorial/08_basics_pandas.ipynb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tutorial/08_basics_pandas.ipynb b/tutorial/08_basics_pandas.ipynb index b2c28046..90fc4911 100644 --- a/tutorial/08_basics_pandas.ipynb +++ b/tutorial/08_basics_pandas.ipynb @@ -637,7 +637,7 @@ ], "source": [ "# Print the graph as a dictionary of pandas DataFrame(s) per node label\n", - "display(bc.to_df())" + "bc.to_df()[\"protein\"]" ] }, { @@ -753,7 +753,7 @@ } ], "source": [ - "bc.to_df()" + "bc.to_df()[\"protein\"]" ] }, { @@ -897,7 +897,9 @@ " schema_config_path='03_schema_config.yaml',\n", ")\n", "bc.add(node_generator(proteins))\n", - "display(bc.to_df())" + "for name, df in bc.to_df().items():\n", + " print(name)\n", + " display(df)" ] }, { @@ -1083,7 +1085,9 @@ " schema_config_path='04_schema_config.yaml',\n", ")\n", "bc.add(node_generator(proteins))\n", - "display(bc.to_df())" + "for name, df in bc.to_df().items():\n", + " print(name)\n", + " display(df)" ] }, { From 4b169efc2b75760f0feb1265efa44de79a944c37 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Mon, 26 Jun 2023 13:50:35 +0200 Subject: [PATCH 006/343] colab-specific information --- tutorial/08_basics_pandas.ipynb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tutorial/08_basics_pandas.ipynb b/tutorial/08_basics_pandas.ipynb index 90fc4911..a0a87179 100644 --- a/tutorial/08_basics_pandas.ipynb +++ b/tutorial/08_basics_pandas.ipynb @@ -41,7 +41,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "To run this tutorial, you will need to first install BioCypher repository on the virtual machine:" + "To run this tutorial, you will first need to install perform some setup steps specific to running on Google Colab. You can collapse this section and run the setup steps with one click, as they are not required for the explanation of BioCyper's functionality. You can of course also run the steps one by one, if you want to see what is happening. The real tutorial starts with section 1, \"Adding data\"." ] }, { @@ -350,7 +350,6 @@ ] }, { - "attachments": {}, "cell_type": "markdown", "metadata": {}, "source": [ @@ -362,8 +361,14 @@ "each of the steps. The configuration files are located in the `tutorial`\n", "directory, and are called using the `biocypher_config_path` argument at\n", "instantiation of the BioCypher interface. For more information, see also the\n", - "[Quickstart Configuration](quick_config) section.\n", - "\n", + "[Quickstart Configuration](quick_config) section." + ] + }, + { + "attachments": {}, + "cell_type": "markdown", + "metadata": {}, + "source": [ "## Section 1: Adding data\n", "\n", "
\n", From 9372ab0f6fd19c0c35a2d35b9e1993f05b813ed0 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Mon, 26 Jun 2023 14:17:00 +0200 Subject: [PATCH 007/343] remove unneeded text and import --- tutorial/08_basics_pandas.ipynb | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/tutorial/08_basics_pandas.ipynb b/tutorial/08_basics_pandas.ipynb index a0a87179..c9cff830 100644 --- a/tutorial/08_basics_pandas.ipynb +++ b/tutorial/08_basics_pandas.ipynb @@ -355,13 +355,16 @@ "source": [ "## Configuration\n", "BioCypher is configured using a YAML file; it comes with a default (which you\n", - "can see in the [Configuration](config) section). You can use it, for instance,\n", - "to select an output format, the output directory, separators, logging level, and\n", - "other options. For this tutorial, we will use a dedicated configuration file for\n", - "each of the steps. The configuration files are located in the `tutorial`\n", - "directory, and are called using the `biocypher_config_path` argument at\n", - "instantiation of the BioCypher interface. For more information, see also the\n", - "[Quickstart Configuration](quick_config) section." + "can see in the\n", + "[Configuration](https://biocypher.org/installation.html#configuration) section).\n", + "You can use it, for instance, to select an output format, the output directory,\n", + "separators, logging level, and other options. For this tutorial, we will use a\n", + "dedicated configuration file for each of the steps. The configuration files are\n", + "located in the `tutorial` directory, and are called using the\n", + "`biocypher_config_path` argument at instantiation of the BioCypher interface.\n", + "For more information, see also the [Quickstart\n", + "Configuration](https://biocypher.org/quickstart.html#the-biocypher-configuration-yaml-file)\n", + "section." ] }, { @@ -371,17 +374,6 @@ "source": [ "## Section 1: Adding data\n", "\n", - "
\n", - " \n", - "
Tutorial files
\n", - "\n", - "The code for this tutorial can be found at `tutorial/01__basic_import.py`. The\n", - "schema is at `tutorial/01_schema_config.yaml`, configuration in\n", - "`tutorial/01_biocypher_config.yaml`. Data generation happens in\n", - "`tutorial/data_generator.py`.\n", - "\n", - "
\n", - "\n", "### Input data stream (\"adapter\")\n", "The basic operation of adding data to the knowledge graph requires two\n", "components: an input stream of data (which we call adapter) and a configuration\n", @@ -502,8 +494,7 @@ } ], "source": [ - "from biocypher import BioCypher\n", - "from os.path import join" + "from biocypher import BioCypher" ] }, { From 2f79d95c2bf6cf462d7e61a22a952476b6f7cdfd Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Mon, 26 Jun 2023 14:18:13 +0200 Subject: [PATCH 008/343] move biocypher import --- tutorial/08_basics_pandas.ipynb | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/tutorial/08_basics_pandas.ipynb b/tutorial/08_basics_pandas.ipynb index c9cff830..37ccfcb9 100644 --- a/tutorial/08_basics_pandas.ipynb +++ b/tutorial/08_basics_pandas.ipynb @@ -479,24 +479,6 @@ "configuration:" ] }, - { - "cell_type": "code", - "execution_count": 7, - "metadata": {}, - "outputs": [ - { - "name": "stderr", - "output_type": "stream", - "text": [ - "INFO -- This is BioCypher v0.5.12.\n", - "INFO -- Logging into `biocypher-log/biocypher-20230625-134155.log`.\n" - ] - } - ], - "source": [ - "from biocypher import BioCypher" - ] - }, { "cell_type": "code", "execution_count": 8, @@ -599,6 +581,7 @@ } ], "source": [ + "from biocypher import BioCypher\n", "bc = BioCypher(\n", " biocypher_config_path='01_biocypher_config.yaml',\n", " schema_config_path='01_schema_config.yaml',\n", From 4ef21a079866bac8efca2097ce666717b7b887e5 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Mon, 26 Jun 2023 14:26:36 +0200 Subject: [PATCH 009/343] fix link --- tutorial/08_basics_pandas.ipynb | 52 ++++++++++++++++----------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/tutorial/08_basics_pandas.ipynb b/tutorial/08_basics_pandas.ipynb index 37ccfcb9..877042e7 100644 --- a/tutorial/08_basics_pandas.ipynb +++ b/tutorial/08_basics_pandas.ipynb @@ -70,7 +70,7 @@ }, { "cell_type": "code", - "execution_count": 1, + "execution_count": null, "metadata": {}, "outputs": [], "source": [ @@ -83,7 +83,7 @@ }, { "cell_type": "code", - "execution_count": 2, + "execution_count": null, "metadata": {}, "outputs": [ { @@ -115,7 +115,7 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": null, "metadata": {}, "outputs": [ { @@ -334,7 +334,7 @@ }, { "cell_type": "code", - "execution_count": 4, + "execution_count": null, "metadata": {}, "outputs": [], "source": [ @@ -383,7 +383,7 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": null, "metadata": {}, "outputs": [], "source": [ @@ -414,7 +414,7 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": null, "metadata": {}, "outputs": [], "source": [ @@ -481,7 +481,7 @@ }, { "cell_type": "code", - "execution_count": 8, + "execution_count": null, "metadata": {}, "outputs": [ { @@ -507,20 +507,20 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "The first line (`protein`) identifies our entity and connects to the\n", - "ontological backbone; here we define the first class to be represented in the\n", - "graph. In the configuration YAML, we represent entities — similar to the\n", - "internal representation of Biolink — in lower sentence case (e.g., \"small\n", - "molecule\"). Conversely, for class names, in file names, and property graph\n", - "labels, we use PascalCase instead (e.g., \"SmallMolecule\") to avoid issues with\n", - "handling spaces. The transformation is done by BioCypher internally. BioCypher\n", - "does not strictly enforce the entities allowed in this class definition; in\n", - "fact, we provide [several methods of extending the existing ontological\n", - "backbone *ad hoc* by providing custom inheritance or hybridising\n", - "ontologies](biolink). However, every entity should at some point be connected\n", - "to the underlying ontology, otherwise the multiple hierarchical labels will not\n", - "be populated. Following this first line are three indented values of the\n", - "protein class.\n", + "The first line (`protein`) identifies our entity and connects to the ontological\n", + "backbone; here we define the first class to be represented in the graph. In the\n", + "configuration YAML, we represent entities — similar to the internal\n", + "representation of Biolink — in lower sentence case (e.g., \"small molecule\").\n", + "Conversely, for class names, in file names, and property graph labels, we use\n", + "PascalCase instead (e.g., \"SmallMolecule\") to avoid issues with handling spaces.\n", + "The transformation is done by BioCypher internally. BioCypher does not strictly\n", + "enforce the entities allowed in this class definition; in fact, we provide\n", + "[several methods of extending the existing ontological backbone *ad hoc* by\n", + "providing custom inheritance or hybridising\n", + "ontologies](https://biocypher.org/tutorial-ontology.html#model-extensions).\n", + "However, every entity should at some point be connected to the underlying\n", + "ontology, otherwise the multiple hierarchical labels will not be populated.\n", + "Following this first line are three indented values of the protein class.\n", "\n", "The second line (`represented_as`) tells BioCypher in which way each entity\n", "should be represented in the graph; the only options are `node` and `edge`.\n", @@ -568,7 +568,7 @@ }, { "cell_type": "code", - "execution_count": 9, + "execution_count": null, "metadata": {}, "outputs": [ { @@ -592,7 +592,7 @@ }, { "cell_type": "code", - "execution_count": 10, + "execution_count": null, "metadata": {}, "outputs": [ { @@ -638,7 +638,7 @@ }, { "cell_type": "code", - "execution_count": 11, + "execution_count": null, "metadata": {}, "outputs": [], "source": [ @@ -647,7 +647,7 @@ }, { "cell_type": "code", - "execution_count": 12, + "execution_count": null, "metadata": {}, "outputs": [ { @@ -672,7 +672,7 @@ }, { "cell_type": "code", - "execution_count": 13, + "execution_count": null, "metadata": {}, "outputs": [ { From c714313a49f459666f3c4d1e5e5e9a66224b350d Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Mon, 26 Jun 2023 15:16:34 +0200 Subject: [PATCH 010/343] link to interactive tutorial --- docs/tutorial.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/tutorial.md b/docs/tutorial.md index c332485c..4f019004 100644 --- a/docs/tutorial.md +++ b/docs/tutorial.md @@ -1,3 +1,11 @@ +```{admonition} Google Colab Version of the Tutorial +:class: tip + +You can run the tutorial interactively in Google Colab by clicking [this +link](https://colab.research.google.com/github/biocypher/biocypher/blob/main/tutorial/08_basics_pandas.ipynb). + +``` + (tutorial)= # Tutorial - Basics The main purpose of BioCypher is to facilitate the pre-processing of biomedical From 52e95a2909a98b2cc638359df3323266e3766f64 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Wed, 19 Jul 2023 11:04:19 +0200 Subject: [PATCH 011/343] update paper link --- docs/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/index.rst b/docs/index.rst index c3a24d03..dc99ae0d 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -17,7 +17,7 @@ biomedical community. If you're new to knowledge graphs and want to familiarise with the concepts that drive BioCypher, we recommend to check out the graphical abstract below and read -our paper! +[our paper](https://www.nature.com/articles/s41587-023-01848-y)! .. grid:: 2 :gutter: 2 @@ -29,7 +29,7 @@ our paper! :octicon:`mark-github;3em` :octicon:`repo;3em` .. grid-item-card:: Read the paper - :link: https://arxiv.org/abs/2212.13543 + :link: https://www.nature.com/articles/s41587-023-01848-y :text-align: center :octicon:`book;3em` :octicon:`light-bulb;3em` From 419a75bb8ba08b3359244f390c2b2970df078982 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Wed, 19 Jul 2023 16:32:38 +0200 Subject: [PATCH 012/343] fix link --- docs/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.rst b/docs/index.rst index dc99ae0d..d5ecf401 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -17,7 +17,7 @@ biomedical community. If you're new to knowledge graphs and want to familiarise with the concepts that drive BioCypher, we recommend to check out the graphical abstract below and read -[our paper](https://www.nature.com/articles/s41587-023-01848-y)! +`our paper `_! .. grid:: 2 :gutter: 2 From 047eaff37b8f77f07536e9b8bf67fc4a1fb91582 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Wed, 19 Jul 2023 16:42:26 +0200 Subject: [PATCH 013/343] add chat to intro doc --- docs/index.rst | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/docs/index.rst b/docs/index.rst index d5ecf401..067d3bf6 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -89,4 +89,29 @@ facilitates the creation of knowledge graphs that are informed by the latest developments in the field of biomedical knowledge representation. However, to make this framework truly accessible and comprehensive, we need the input of the biomedical community. We are therefore inviting you to join us in this -endeavour! \ No newline at end of file +endeavour! + +================== +Connect your Knowledge Graph to Large Language Models +================== + +To facilitate the use of knowledge graphs in downstream tasks, we have developed +a framework to connect knowledge graphs to large language models. This framework +is called `biochatter ` and is used in +our web app `ChatGSE `_. See the links for more +information. + +. grid:: 2 + :gutter: 2 + + .. grid-item-card:: ChatGSE web app + :link: https://chat.biocypher.org/ + :text-align: center + + :octicon:`comment-discussion;3em` :octicon:`dependabot;3em` + + .. grid-item-card:: biochatter repository + :link: https://github.com/biocypher/biochatter + :text-align: center + + :octicon:`mark-github;3em` :octicon:`repo;3em` \ No newline at end of file From cde037980a42c316d0b45a9588dbeeb72e791b9f Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Wed, 19 Jul 2023 16:42:41 +0200 Subject: [PATCH 014/343] fix link --- docs/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.rst b/docs/index.rst index 067d3bf6..b95cc01b 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -97,7 +97,7 @@ Connect your Knowledge Graph to Large Language Models To facilitate the use of knowledge graphs in downstream tasks, we have developed a framework to connect knowledge graphs to large language models. This framework -is called `biochatter ` and is used in +is called `biochatter `_ and is used in our web app `ChatGSE `_. See the links for more information. From 3cc24be47d67a69dbc12d4d071920a7f69130ea8 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Wed, 19 Jul 2023 16:48:39 +0200 Subject: [PATCH 015/343] fix cards --- docs/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.rst b/docs/index.rst index b95cc01b..4ee91a38 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -101,7 +101,7 @@ is called `biochatter `_ and is used in our web app `ChatGSE `_. See the links for more information. -. grid:: 2 +.. grid:: 2 :gutter: 2 .. grid-item-card:: ChatGSE web app From d21f6af634289a5ebc698a8e55975d1878a040bb Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 27 Jul 2023 00:49:24 +0200 Subject: [PATCH 016/343] add badge and move others to top --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index a6d78f2d..c8b68b20 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # BioCypher +[![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) [![Powered by the Bioregistry](https://img.shields.io/static/v1?label=Powered%20by&message=Bioregistry&color=BA274A&style=flat&logo=image/png;base64,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)](https://github.com/biopragmatics/bioregistry) [![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) ## ❓ Description Knowledge graphs (KGs) are an [approach to knowledge @@ -58,5 +59,3 @@ Before, it was available as a preprint at https://arxiv.org/abs/2212.13543. This project has received funding from the European Union’s Horizon 2020 research and innovation programme under grant agreement No 965193 for DECIDER and No 116030 for TransQST. - -[![Powered by the Bioregistry](https://img.shields.io/static/v1?label=Powered%20by&message=Bioregistry&color=BA274A&style=flat&logo=image/png;base64,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)](https://github.com/biopragmatics/bioregistry) [![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) From 5bdb08fdace94eb736e83196ff99b66374fc5ba1 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 27 Jul 2023 00:50:33 +0200 Subject: [PATCH 017/343] Rename workflow (for badge) --- .github/workflows/sphinx_autodoc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sphinx_autodoc.yml b/.github/workflows/sphinx_autodoc.yml index c5647c85..8ee331e1 100644 --- a/.github/workflows/sphinx_autodoc.yml +++ b/.github/workflows/sphinx_autodoc.yml @@ -1,4 +1,4 @@ -name: Sphinx build docs on push +name: Docs build on: - push From d584e588c69b53a19fa6e90eb633f2b2dd31d559 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 27 Jul 2023 00:52:48 +0200 Subject: [PATCH 018/343] add docs badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c8b68b20..ba16f1fe 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # BioCypher -[![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) [![Powered by the Bioregistry](https://img.shields.io/static/v1?label=Powered%20by&message=Bioregistry&color=BA274A&style=flat&logo=image/png;base64,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)](https://github.com/biopragmatics/bioregistry) [![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) +[![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) ![Docs build](https://github.com/biocypher/biocypher/actions/workflows/sphinx_autodoc.yaml/badge.svg) [![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) [![Powered by the Bioregistry](https://img.shields.io/static/v1?label=Powered%20by&message=Bioregistry&color=BA274A&style=flat&logo=image/png;base64,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)](https://github.com/biopragmatics/bioregistry) ## ❓ Description Knowledge graphs (KGs) are an [approach to knowledge From ab763428304892e11fd4d7e25648704ef491654f Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 27 Jul 2023 00:54:00 +0200 Subject: [PATCH 019/343] yaml -> yml --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ba16f1fe..dd7475bc 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # BioCypher -[![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) ![Docs build](https://github.com/biocypher/biocypher/actions/workflows/sphinx_autodoc.yaml/badge.svg) [![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) [![Powered by the Bioregistry](https://img.shields.io/static/v1?label=Powered%20by&message=Bioregistry&color=BA274A&style=flat&logo=image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAACXBIWXMAAAEnAAABJwGNvPDMAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAACi9JREFUWIWtmXl41MUZxz/z291sstmQO9mQG0ISwHBtOOSwgpUQhApWgUfEowKigKI81actypaqFbWPVkGFFKU0Vgs+YgvhEAoqEUESrnDlEEhCbkLYJtlkk9399Y/N/rKbzQXt96+Zed+Z9/t7Z+adeecnuA1s5yFVSGrLOAf2qTiEEYlUZKIAfYdKE7KoBLkQSc4XgkPfXxz/owmT41ZtiVtR3j94eqxQq5aDeASIvkVb12RBtt0mb5xZsvfa/5XgnqTMcI3Eq7IQjwM+7jJJo8YvNhK/qDBUOl8A7JZWWqqu01Jeg6Pd1nW4NuBjjax6eWrRruv/M8EDqTMflmXeB0Jcbb6RIRhmTCJ0ymgC0wYjadTd9nW0tWMu+In63NNU7c3FWtvgJpXrZVlakVGU8/ltEcwzGjU3miI/ABa72vwTB5K45AEi7x2PUEl9fZsHZLuDmgPHuLJpJ82lle6iTSH6mpXp+fnt/Sa4yzhbp22yfwFkgnMaBy17kPhFmQh1997qLxztNkq35XB505fINtf0iz1WvfTQ7Pxdlj4Jdnjuny5yvpEhjHh7FQOGD/YyZi4owS86HJ+QQMDpJaBf3jUXlHD21+8q0y4LDppV/vfNO7+jzV3Pa6SOac0E8I8fSPonpm7JAVR+eRhzwU/Ofj+e49tpT/HdtGXcyLvQJ8HAtCTGfmJCF2dwfpTMz4NszX/uqqdyr+xPyVwoEK+C03PGrDX4GkJ7NBJ+txH/hCgAit7cRlNxOY62dmzmZgwzJvZJUh2gI/xnRmoOHsfe3AqQ/kho0qXs+pLzLh3FgwdT54YKxLsAQq0mbf1zHuTsltZejemHJSrlgGGDPGTXc09zdM5qTi59jZbKOg+Zb1QYI95+XokEQogPDifPDnPJFQ8uCkl8FyGmACQtn4dhxp3KINX7jnHi0ZeJnT8dla8Plbu+48zzfyJ08kh8ggIACB4zlIAhsURm3EnML6eB6Fzep1a+SUt5DS2VddTs+4GQccPRhgV1kowIQRaChhMXAPxkIev/Vl+8R/HgnqTMmI4gjH/iQOIXZSqdzQUlXDB9RPyi+1DrdVx67WMursvCkDERXYxB0ROSIOKecURMG+tBzkXAhbYbZk6teNPLkwmPzUIX71wuMiw+MHx2nEJQrWIFHSdE4pIHlFDisLZxYe1HhIwfTtLK+RSu30rVnlxGvrOapOcW9DsW3vH6CgKS4zxIXlz3Fw8dSaMmcfEcV9XHYbc/DSCZMEkgFoJzY0TeO17pVL7jANbaBoauWUJlTi4VOw+T9sazBKYl0ZB/qV/kALThQRi3vOJB0lpzw0vPMONOtOHOqRcyi7bzkEqanJo3HogBMGROUrziaGundGsOsQsyUPn6UPx2NvELZxIybhinn3uLyx9uVwaW7XbqjxdQmr2X0uy93Dh+Dtlu9zCu9vdj1PsvEWwcii7OwJAXFnoRFCoVhoxJrmr0gOQWo9qBfaorXodOHq0o1x8roN3cSMyC6ZT942uQBIlL53Jl804sV6oY9/fXAGg4WcjFdZuxlFV7GNPFRzFs7VKCRiV7ejJrTa/eDr1rFKXZOQCocEyTgHQAyUdD4B2d4cF8pohg4zC0YUFU7z5C9Jy7sVvbKPtsH6GT0tCGBtFwspBTz/zRixyApbSKk8te5+aZ4l4JdUVQWpIScmQhjGocUjJCRhcTieSjURQTF89FtttpuVaLpaya8Knp1B3OQ5Zlag/nU//9cmScS6EnONrauWjazIQv3kCoVD3quUPS+uAXHU7z1SpATpEQchSA78AwD0WVnxa1XkdjURlCJRGQHMfN/EuEjk9jyr4NRN47Hltjc58Gm0sraTjZ/w3l5BLuKkZJdFzT1f5+3Sq3NZjRDNAjaX1orb2BX2wEmkA9fvGGbvW7Q+OlUu+2wlIqdx+h3dzkJVPrda5iQJ93p+DRqcQ/PhsAw8xJ6AfHdkhuIVvoEribLl/jxKOv4Gi34T8omgnb1yOk7sdTA01AiK3J6yoGgP+gaPwHOdOP6LlTlXb3mNYXAlI8da9/e0pJBZovV2BrakYzQK/I3bg0SsiiCqClqs/0wAPB6UOVo6k3+CdEETwm1aPtP+dLlLJPSKAHOYDWCoVLlYTkKAKcCU4vO7IrhErFsLVLPXZ+V0haDcN+v8xjB9strdQfPavUA0ckefRxWNuwVNS6rBRKQB44r+Lmc5f7TRAgaFQyYzb9Dv/4gd18ASQ8/gsC0zwJNJVcw97aeWmOcDtaAW6eLXZLBchTC8EhWXbW6o+cInhMipetuu9OUvTWNnwNodzx+krlvAQIGjmECV+spyH/Ak3F5QDok+OoPXicip2HiJiWTuH6rQx6eh7BxlT0STH4xUbSUl6Df/xAIqaO9bBVn3taKUuy/ZAwYZImpvx4FYjVRgQzOec9r1vK0TmrldMiIDkO45ZXegxLLrRW13P0/heQHQ4CUhIYvfElNIHOtWaztNJ4qZQBqfFKLg3OMz135rNY624ClB0tHJcomTA5ZMGnANbaBmoOHPMy5hvZebNuLCoj71frXIN0i9pDJzj24IsIlUTCo7NI3/KyQg5ArfMleEyKBzmA6r1HO8eV+dSEySEB2G3yRpwZP1c2f+n1GjB07RIlcwNoKi7j3G839EhQF2cg6fmHmbznPRKevJ/GorIedV1wtLVzJesrV9WqQtoIHRfWjreSjwGar1ZRui3Ho7PfwHBGb3jRg6S1roGeoIuNJGBIPKV/zSF31irOrn4HXAu9B1zduhtLecelQxZZ9xTtrgC342Df8IwQyaYqBMKEWo0xaw1BI4d4DNJSWcfF32fRWnuD5NWPEDZ5lIe8NDuHq1v+ha2xGdkho4szYJg1hbj501EH6OgJ5oIS8hf/oWPm5HqNrE51vdt4nC/7k+9bIIT8GYA2Ipixn5jwjQrrZsju0XT5GubTRfiEBqFPisUvOrzPPi0VdeQ9YcJ63bWmxbzphTk7XHKvA/DrlJkfAU+Bcy2N+fA3vZK0WVoxny4idOKIfn+IO7lTz7zRObWCjdMv7VnhruOV9dws9F8u4CsAS1k1J54wYS4o6arWaaS8hvLP998yuZtnisl7wuROLkdjsKzqqtfL45FjB8gzwZnIJy6dS8Jjs3p8ausvHG3tXN26mytZO5W8Rcjsbg1Qze/X45ELHY9I7wHLXG26+CgSl8zFkDGh3zdkF2S7nep9PzhzmnK3FEGwUWOwrJr6zTdeL529EnRhf3LmfCHEBkBZiNrwIAwZkwi9a5Qzh9D6dNvXYW3jZkEJ9UdOOYPwdY/gXgdiufuGuC2C4Hy3kWXrOhmeBLQeA6jV6GLC8Y0KR613Hn+2phZaK69jqah1P/hdsCKLLIfGtnbG+f3eyfHtEHTh38mzom2SY4WQWQjE9tnBE+XIZKuQNrqCcH9wSwRdMGGSJiTnpatwTJOFMIKcgvPVX/kNIcM1gSgC8iTZfii3aEL+7fyG+C+6O8izl1GE5gAAAABJRU5ErkJggg==)](https://github.com/biopragmatics/bioregistry) +[![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) ![Docs build](https://github.com/biocypher/biocypher/actions/workflows/sphinx_autodoc.yml/badge.svg) [![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) [![Powered by the Bioregistry](https://img.shields.io/static/v1?label=Powered%20by&message=Bioregistry&color=BA274A&style=flat&logo=image/png;base64,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)](https://github.com/biopragmatics/bioregistry) ## ❓ Description Knowledge graphs (KGs) are an [approach to knowledge From be1e5dace16393dd7d2fb31695871cb933595023 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 27 Jul 2023 01:17:17 +0200 Subject: [PATCH 020/343] pre-commit badge --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index dd7475bc..1359360e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,9 @@ # BioCypher -[![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) ![Docs build](https://github.com/biocypher/biocypher/actions/workflows/sphinx_autodoc.yml/badge.svg) [![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) [![Powered by the Bioregistry](https://img.shields.io/static/v1?label=Powered%20by&message=Bioregistry&color=BA274A&style=flat&logo=image/png;base64,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)](https://github.com/biopragmatics/bioregistry) +[![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) +![Docs build](https://github.com/biocypher/biocypher/actions/workflows/sphinx_autodoc.yml/badge.svg) +[![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) +[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit) +[![Powered by the Bioregistry](https://img.shields.io/static/v1?label=Powered%20by&message=Bioregistry&color=BA274A&style=flat&logo=image/png;base64,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)](https://github.com/biopragmatics/bioregistry) ## ❓ Description Knowledge graphs (KGs) are an [approach to knowledge From 7b4a4760b0b29087782b33e467d4b7e107202ff2 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 27 Jul 2023 01:22:19 +0200 Subject: [PATCH 021/343] pypthon and pypi badges --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 1359360e..363dbbf0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,8 @@ # BioCypher +[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) +![Python](https://img.shields.io/badge/python-3.9-blue.svg) +![Python](https://img.shields.io/badge/python-3.10-blue.svg) +[![PyPI version](https://badge.fury.io/py/biocypher.svg)](https://badge.fury.io/py/biocypher) [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) ![Docs build](https://github.com/biocypher/biocypher/actions/workflows/sphinx_autodoc.yml/badge.svg) [![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) From 9ce4ffebd37d1650863bfdfbf34502d3a6c4a8e4 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 27 Jul 2023 01:28:19 +0200 Subject: [PATCH 022/343] PRs badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 363dbbf0..6ac76c76 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ ![Docs build](https://github.com/biocypher/biocypher/actions/workflows/sphinx_autodoc.yml/badge.svg) [![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit) +[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) [![Powered by the Bioregistry](https://img.shields.io/static/v1?label=Powered%20by&message=Bioregistry&color=BA274A&style=flat&logo=image/png;base64,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)](https://github.com/biopragmatics/bioregistry) ## ❓ Description From cce82ca388565346a911903f06d6de971cf4437f Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Fri, 28 Jul 2023 01:49:45 +0200 Subject: [PATCH 023/343] overhaul quickstart documentation closes #219 --- docs/installation.md | 5 +- docs/neo4j.md | 16 ++- docs/quickstart.md | 291 +++++++++++++++++++------------------- docs/submodule.rst | 6 +- docs/tutorial-ontology.md | 1 + docs/tutorial.md | 2 +- 6 files changed, 163 insertions(+), 158 deletions(-) diff --git a/docs/installation.md b/docs/installation.md index 647a1ce2..5a209552 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -54,9 +54,12 @@ poetry install Poetry creates a virtual environment for you (starting with `biocypher-`; alternatively you can name it yourself) and installs all dependencies. -If you want to run the tests that use a Neo4j DBMS instance: +If you want to run the tests that use a Neo4j DBMS (database management system) +instance: + - Make sure that you have a Neo4j instance with the APOC plugin installed and a database named `test` running on standard bolt port `7687` + - Activate the virtual environment by running `% poetry shell` and then run the tests by running `% pytest` in the root directory of the repository with the command line argument `--password=`. diff --git a/docs/neo4j.md b/docs/neo4j.md index 67b63a69..e07fb9b4 100644 --- a/docs/neo4j.md +++ b/docs/neo4j.md @@ -1,5 +1,6 @@ # Interacting with Neo4j + BioCypher development was initially centred around a Neo4j graph database output due to the migration of OmniPath to a Neo4j backend. Importantly, we understand BioCypher as an abstration of the build process of a biomedical knowledge graph, @@ -9,6 +10,12 @@ and will update the documentation accordingly. In the following section, we give an overview of interacting with Neo4j from the perspective of BioCypher, but we refer the reader to the Neo4j documentation for more details. +```{note} +We use the APOC library for Neo4j, which is not included automatically, but +needs to be installed as a plugin to the DMBS. For more information, please +refer to the [APOC documentation](https://neo4j.com/labs/apoc/). +``` + ## Communication via the Neo4j Python Driver The BioCypher [Driver](driver) is the main submodule of BioCypher. It @@ -136,11 +143,12 @@ BioCypher or original versions, respectively. (neo4j_tut)= # Tutorial - Neo4j + After writing knowledge graph files with BioCypher in offline mode for the Neo4j -DBMS, the graph can now be imported into Neo4j using the `neo4j-admin` command -line tool. This is not necessary if the graph is created in online mode. For -convenience, BioCypher provides the command line call required to import the -data into Neo4j: +DBMS (database management system), the graph can now be imported into Neo4j +using the `neo4j-admin` command line tool. This is not necessary if the graph is +created in online mode. For convenience, BioCypher provides the command line +call required to import the data into Neo4j: ```{code-block} python bc.write_import_call() diff --git a/docs/quickstart.md b/docs/quickstart.md index d0dcba5c..cd379e48 100644 --- a/docs/quickstart.md +++ b/docs/quickstart.md @@ -29,27 +29,35 @@ If you are new to BioCypher and would like a step-by-step introduction to the package, please follow the [tutorial](tutorial). ``` -The BioCypher workflow of creating your own knowledge graph consists of two -components: +The BioCypher workflow of creating your own knowledge graph consists of three +consecutive steps: -1. the [host module adapter](qs_host-module-adapter), a python - program, and -2. the [schema configuration file](qs_schema-config), a YAML file. +1. Clearly define the scope of your project, including the data sources you want +to use, the entities and relationships you want to represent, and the +[ontologies](ontologies) that should inform these entities. -The adapter serves as a data interface between the source and BioCypher, -piping the "raw" data into BioCypher for the creation of the property -graph, while the schema configuration tells BioCypher how the graph -should be structured, detailing the names of constituents and how they -should be connected. +2. Using these definitions, find existing [adapters of data +sources](qs_input-adapter) or, if necessary, create your own. For the data +yielded by these adapters, create a [schema configuration](qs_schema-config) +file that tells BioCypher how to represent the entities and relationships in the +graph. -(qs_host-module-adapter)= -## The host module adapter +3. [Run BioCypher](qs_run-bc) using the adapters and schema config to create the +knowledge graph. If necessary, iterate over KG construction and configuration +until you are satisfied with the result. + +(qs_input-adapter)= +## The input adapter BioCypher follows a modular approach to data inputs; to create a knowledge graph, we use at least one adapter module that provides a data stream to build the graph from. Examples for current adapters can be found on the [GitHub project adapter view](https://github.com/orgs/biocypher/projects/3/views/2). -Adapters can ingest data from many different input sources, including Python +This is the first place to look when creating your own KG; BioCypher adapters +are meant to be reusable and a centralised way of maintaining access to data +sources. + +Adapters can ingest data from many different input formats, including Python modules as in the [CROssBAR adapter](https://github.com/HUBioDataLab/CROssBAR-BioCypher-Migration) (which uses the OmniPath backend software, PyPath, for downloading and caching data), @@ -57,40 +65,15 @@ advanced file management formats such as Parquet as in the [Open Targets adapter](https://github.com/biocypher/open-targets), or simple CSV files as in the [Dependency Map adapter](https://github.com/biocypher/dependency-map). -The recommended way of interacting with BioCypher is via the -{py:class}``biocypher._driver.Driver`` class. It can be called either starting -in "offline mode" using `offline = True`, i.e., without connection to a running -Neo4j instance, or by providing authentication details via arguments or -configuration file: - -```{code-block} python -import biocypher -d = biocypher.Driver( - offline = False, - db_uri = "bolt://localhost:7687", - db_user = "neo4j", - db_passwd = "password", -) -``` - -```{note} -We use the APOC library for Neo4j, which is not included automatically, but -needs to be installed as a plugin to the DMBS. For more information, please -refer to the [APOC documentation](https://neo4j.com/labs/apoc/). -``` - -```{hint} -The settings for the BioCypher driver can also be specified in a configuration -file. For more details, please refer to the [Setup instructions](config). -``` - The main function of the adapter is to pass data into BioCypher, usually as some form of iterable (commonly a list or generator of items). As a minimal example, we load a list of proteins with identifiers, trivial names, and molecular masses from a (fictional) CSV: ```{code-block} python -# read into data frame +:caption: Adapter yielding nodes + +# read data into df with open("file.csv", "r") as f: proteins = pd.read_csv(f) @@ -106,8 +89,6 @@ def node_generator(): yield (_id, _type, _props) -# write biocypher nodes -d.write_nodes(node_generator()) ``` For nodes, BioCypher expects a tuple containing three entries; the preferred @@ -115,6 +96,34 @@ identifier of the node, the type of entity, and a dictionary containing all other properties (can be empty). What BioCypher does with the received information is determined largely by the schema configuration detailed below. +```{code-block} python +:caption: Adapter yielding edges + +# read data into df +with open("file.csv", "r") as f: + interactions = pd.read_csv(f) + +# yield interactions from data frame +def edge_generator(): + for i in interactions: + _id = i["id"] + _source = i["source"] + _target = i["target"] + _type = "interaction" + _props = { + "type": i["relationship_type"], + "score": i["score"], + } + + yield (_id, _source, _target, _type, _props) + +``` + +For edges, BioCypher expects a tuple containing five entries; the preferred +identifier of the edge (can be `None`), the identifier of the source node +(non-optional), the identifier of the target node (non-optional), the type of +relationship, and a dictionary containing all other properties (can be empty). + For advanced usage, the type of node or edge can be determined programatically. Properties do not need to be explicitly called one by one; they can be passed in as a complete dictionary of all entries and @@ -125,38 +134,43 @@ type in the schema configuration file. ## The schema configuration YAML file The second important component of translation into a BioCypher-compatible -property graph is the specification of graph constituents and their mode of -representation in the graph. For instance, we want to add a representation for -proteins to the OmniPath graph, and the proteins should be represented as nodes. -To make this known to the BioCypher module, we use the -[schema-config.yaml](https://github.com/biocypher/biocypher/blob/main/biocypher/_config/schema_config.yaml), -which details *only* the immediate constituents of the desired graph. Since the -identifier systems in the Biolink schema are not comprehensive and offer many -alternatives, we currently use the CURIE prefixes directly as given by -[Bioregistry](https://bioregistry.io). For instance, a protein could be -represented, for instance, by a UniProt identifier, the corresponding ENSEMBL -identifier, or an HGNC gene symbol. The CURIE prefix for "Uniprot Protein" is -`uniprot`, so a consistent protein schema definition would be: +knowledge graph is the specification of graph constituents and their mode of +representation in the graph. To make this known to the BioCypher module, we use +the +[schema-config.yaml](https://github.com/biocypher/biocypher/blob/main/biocypher/_config/test_schema_config.yaml), +which details *only* the immediate constituents of the desired graph as the +top-level entries in the YAML file. While each of these top-level entries is +required to be found in the underlying ontology (for instance, the [Biolink +model](https://biolink.github.io/biolink-model/)), the `input_label` field is +arbitrary and has to match the `_type` yielded by the adapter (compare above). + +Other fields of each entry can refer to the representation of the entity in the +KG (`represented_as: node`), and the identifier namespace chosen for each entity +type. For instance, a protein could be represented by a UniProt identifier, the +corresponding ENSEMBL identifier, or an HGNC gene symbol. We prefer the CURIE +prefix for unambiguous identification of entities. The CURIE prefix for "Uniprot +Protein" is `uniprot`, so a consistent protein schema definition would be: ```{code-block} yaml -protein: - represented_as: node - preferred_id: uniprot - input_label: protein +protein: # top-level entry, has to match ontology + represented_as: node # mode of representation: node or edge + preferred_id: uniprot # preferred identifier namespace + input_label: protein # label that identifies members of this class (_type) ``` ```{note} For BioCypher classes, similar to the internal representation in the Biolink model, we use lower sentence-case notation, e.g., `protein` and `small molecule`. For file names and Neo4j labels, these are converted to PascalCase. +For more information, see the [Ontology tutorial](ontology). ``` -In the protein case, we are specifying its representation as a node, -that we wish to use the UniProt identifier as the main identifier for -proteins, and that proteins in the input coming from ``PyPath`` carry -the label ``protein`` (in lowercase). Should one wish to use ENSEMBL -notation instead of UniProt, the corresponding CURIE prefix, in this -case, `ensembl`, can be substituted. +The above configuration of the protein class specifies its representation as a +node, that we wish to use the UniProt identifier as the main identifier for +proteins, and that proteins in the data stream from the adapter carry the label +(`_type`) ``protein`` (in lowercase). Should we want to use the ENSEMBL +namespace instead of UniProt IDs, the corresponding CURIE prefix, in this case, +`ensembl`, can be substituted: ```{code-block} yaml protein: @@ -165,87 +179,63 @@ protein: input_label: protein ``` -If there exists no identifier system that is suitable for coverage of -the data, the standard field `id` can be used; this will not result in -the creation of a named property that reflects the identifier of each -node. See below for an example. The `preferred_id` field can in this case also -be omitted entirely; this will lead to the same outcome (`id`). - -The other slots of a graph constituent entry contain information -BioCypher needs to receive the input data correctly and construct the -graph accordingly. For "Named Thing" entities such as the protein, this -includes the mode of representation (YAML entry ``represented_as``), -which can be ``node`` or ``edge``. Proteins can only feasibly -represented as nodes, but for other entities, such as interactions or -aggregates, representation can be both as node or as edge. In Biolink, -these belong to the super-class -[Associations](https://biolink.github.io/biolink-model/docs/associations.html). -For associations, BioCypher additionally requires the specification of -the source and target of the association; for instance, a -post-translational interaction occurs between proteins, so the source -and target attribute in the ``schema-config.yaml`` will both be -``protein``. +If there exists no identifier system that is suitable for coverage of the data +(which is fairly common when it comes to relationships), `preferred_id` field +can be omitted. This will lead to the creation of a generic `id` property on +this node or edge type. -```{code-block} yaml -post translational interaction: - represented_as: node - preferred_id: id - source: protein - target: protein - input_label: post_translational +(qs_run-bc)= +## BioCypher API documentation + +BioCypher is instantiated using the `BioCypher()` class, which can be called +without arguments, given that the [configuration](qs_config) files are either +present in the working directory, or the pipeline should be run with default +settings. + +```{code-block} python +from biocypher import BioCypher +bc = BioCypher() ``` -For the post-translational interaction, which is an association, we are -specifying representation as a node (prompting BioCypher to create not -only the node but also two edges connecting to the proteins -participating in any particular post-translational interaction). In -other words, we are reifying the post-translational interaction in order -to have a node to which other nodes can be linked; for instance, we -might want to add a publication to a particular interaction to serve as -source of evidence, which is only possible for nodes in a property -graph, not for edges. - -Since there are no systematic identifiers for post-translational -interactions, we concatenate the protein ids and relevant properties of -the interaction to a new unique id. We prevent creation of a specific -named property by specifying `id` as the identifier system in this case. -If a specific property name (in addition to the generic `id` field) is -desired, one can use any arbitrary string as a designation for this -identifier, which will then be a named property on the -``PostTranslationalInteraction`` nodes. +BioCypher's main functionality is writing the graph (nodes and edges) to a +database or files for database import. We exemplarise this using the Neo4j +output format, writing CSV files formatted for the Neo4j admin import. In this +example, `node_generator()` and `edge_generator()` are the adapter functions +that yield nodes and edges, respectively (see above). -```{note} -BioCypher accepts non-Biolink IDs since not all possible entries possess a -systematic identifier system, whereas the entity class (``protein``, ``post -translational interaction``) has to be included in the Biolink schema and -spelled identically. For this reason, we [extend the Biolink -schema](tutorial_ontology_extension) in cases where there exists no entry for -our entity of choice. Further, we are specifying the source and target classes -of our association (both ``protein``), which are optional, and the label we -provide in the input from ``PyPath`` (``post_translational``). +```{code-block} python +bc.write_nodes(node_generator()) +bc.write_edges(edge_generator()) ``` -If we wanted the interaction to be represented in the graph as an edge, -we would also need to supply an additional - arbitrary - property, -`label_as_edge`, which would be used as the relationship type; this -could for instance be `INTERACTS_POST_TRANSLATIONALLY`, following the -property graph database consensus that property graph edges are -represented in all upper case form and as verbs, to distinguish from -nodes that are represented in PascalCase and as nouns. This would modify -the above example to the following: +Node and edge generators can contain arbitrarily many types of nodes and edges, +which will be mapped via the schema configuration and sorted by BioCypher. +One instance of the BioCypher class keeps track of the nodes and edges that +have been written to the database, so that multiple calls to `write_nodes()` +and `write_edges()` will not lead to duplicate entries in the database. -```{code-block} yaml -post translational interaction: - represented_as: edge - preferred_id: id - source: protein - target: protein - input_label: post_translational - label_as_edge: INTERACTS_POST_TRANSLATIONALLY +For on-line writing to a database or a Pandas dataframe, we use the functions +with `add` instead of `write`. For instance, to add nodes and edges to a Pandas +dataframe, we can use: + +```{code-block} python +bc.add_nodes(node_generator()) +bc.add_edges(edge_generator()) +``` + +To retrieve the dataframe once all entities are in the graph, we can call +`to_df()`: + +```{code-block} python +df = bc.to_df() ``` -(quick_config)= +For more information on the usage of these functions, please refer to the +[Tutorial](tutorial) section and the [full API documentation](API Reference). + +(qs_config)= ## The biocypher configuration YAML file + Most of the configuration options for BioCypher can and should be specified in the configuration YAML file, `biocypher_config.yaml`. While BioCypher comes with default settings (the ones you can see in the [Configuration](config) section), @@ -256,6 +246,7 @@ instance, you can select your output format (`dbms`) and output path, the location of the schema configuration file, and the ontology to be used. ```{code-block} yaml +:caption: biocypher_config.yaml biocypher: dbms: postgresql @@ -267,23 +258,25 @@ biocypher: ``` -You can currently select between `postgresql`, `neo4j`, and `arangodb` (beta) as -your output format; more options will be added in the future. The `output_path` -is relative to your working directory, as is the schema-config path. The -`ontology` should be specified as a (preferably persistent) URL to the ontology -file, and a `root_node` to specify the node from which the ontology should be -traversed. We recommend using a URL that specifies the exact version of the -ontology, as in the example above. +You can currently select between `postgresql`, `neo4j`, `rdf` (beta), and +`arangodb` (beta) as your output format; more options will be added in the +future. The `output_path` is relative to your working directory, as is the +schema-config path. The `ontology` should be specified as a (preferably +persistent) URL to the ontology file, and a `root_node` to specify the node from +which the ontology should be traversed. We recommend using a URL that specifies +the exact version of the ontology, as in the example above. ### DBMS-specific settings -In addition to the general settings, you can specify DBMS-specific settings -under the `postgresql`, `arangodb`, or `neo4j` entry. For instance, you can -specify the database name, the host, the port, and the credentials for your -database. You can also set delimiters for the entities and arrays in your import -files. For a list of all settings, please refer to the [Configuration](config) -section. + +In addition to the general settings, you can specify settings specific to each +DBMS (database management system) in the configuration file under the +`postgresql`, `arangodb`, `rdf`, or `neo4j` entry. For instance, you can specify +the database name, the host, the port, and the credentials for your database. +You can also set delimiters for the entities and arrays in your import files. +For a list of all settings, please refer to the [Configuration](config) section. ```{code-block} yaml +:caption: biocypher_config.yaml neo4j: database_name: biocypher diff --git a/docs/submodule.rst b/docs/submodule.rst index 964c21c4..5806e4c2 100644 --- a/docs/submodule.rst +++ b/docs/submodule.rst @@ -1,6 +1,6 @@ -############################## -Submodule documentation -############################## +############# +API Reference +############# ``_core.py``: The main BioCypher interface ========================================= diff --git a/docs/tutorial-ontology.md b/docs/tutorial-ontology.md index b04456bd..2da20011 100644 --- a/docs/tutorial-ontology.md +++ b/docs/tutorial-ontology.md @@ -1,3 +1,4 @@ +(ontologies)= # Tutorial - Handling Ontologies ![Adapters and ontologies](figure_modularity.png) diff --git a/docs/tutorial.md b/docs/tutorial.md index 4f019004..7effe22f 100644 --- a/docs/tutorial.md +++ b/docs/tutorial.md @@ -74,7 +74,7 @@ other options. For this tutorial, we will use a dedicated configuration file for each of the steps. The configuration files are located in the `tutorial` directory, and are called using the `biocypher_config_path` argument at instantiation of the BioCypher interface. For more information, see also the -[Quickstart Configuration](quick_config) section. +[Quickstart Configuration](qs_config) section. ## Section 1: Adding data ```{admonition} Tutorial files From 7a3a7f2dc57465e080f42afa645b9d03ce0e2ae1 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Fri, 28 Jul 2023 01:58:36 +0200 Subject: [PATCH 024/343] try link from md to rst --- docs/quickstart.md | 3 ++- docs/submodule.rst | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/quickstart.md b/docs/quickstart.md index cd379e48..07210be0 100644 --- a/docs/quickstart.md +++ b/docs/quickstart.md @@ -231,7 +231,8 @@ df = bc.to_df() ``` For more information on the usage of these functions, please refer to the -[Tutorial](tutorial) section and the [full API documentation](API Reference). +[Tutorial](tutorial) section and the [full API +documentation](submodule.rst#api-reference). (qs_config)= ## The biocypher configuration YAML file diff --git a/docs/submodule.rst b/docs/submodule.rst index 5806e4c2..18f1d214 100644 --- a/docs/submodule.rst +++ b/docs/submodule.rst @@ -1,3 +1,5 @@ +.. _api-reference: + ############# API Reference ############# From 096dd261aed0e8232389161aca437dd94510490c Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Mon, 31 Jul 2023 14:43:48 +0200 Subject: [PATCH 025/343] clean pre-commit config --- .pre-commit-config.yaml | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c2c32252..bb179197 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,7 +14,6 @@ repos: - id: yapf language: python additional_dependencies: [toml] - # stages: [manual] - repo: https://github.com/Instagram/Fixit rev: 9d59f968e84bd2773f34b0069eeeaad3ce783254 hooks: @@ -25,19 +24,10 @@ repos: hooks: - id: isort additional_dependencies: [toml] -# - repo: https://github.com/hakancelikdev/pyall -# rev: 0.2.0 -# hooks: -# - id: pyall -# args: [--refactor] - repo: https://github.com/snok/pep585-upgrade rev: v1.0.1 hooks: - id: upgrade-type-hints -# - repo: https://github.com/asottile/add-trailing-comma -# rev: v2.2.3 -# hooks: -# - id: add-trailing-comma - repo: https://github.com/myint/unify rev: v0.5 hooks: @@ -60,20 +50,6 @@ repos: - id: fix-encoding-pragma args: [--remove] # for Python3 codebase, it's not necessary - id: requirements-txt-fixer -# - repo: https://github.com/john-hen/Flake8-pyproject -# rev: 1.1.0 -# hooks: -# - id: Flake8-pyproject -# additional_dependencies: [flake8-docstrings, flake8-comprehensions, flake8-bugbear] -# - repo: https://github.com/myint/rstcheck -# rev: v6.0.0rc3 -# hooks: -# - id: rstcheck -# - repo: https://github.com/asottile/pyupgrade -# rev: v2.23.1 -# hooks: -# - id: pyupgrade -# args: [--py3-plus, --py36-plus] - repo: https://github.com/pre-commit/pygrep-hooks rev: v1.9.0 hooks: From 64d77bca68f16cac11493b46ce67a8814cea0653 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Mon, 31 Jul 2023 15:03:24 +0200 Subject: [PATCH 026/343] switch to black and remove redundant hooks --- .pre-commit-config.yaml | 25 +++++++------------------ pyproject.toml | 11 ----------- 2 files changed, 7 insertions(+), 29 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bb179197..9ff159ec 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,32 +8,21 @@ default_stages: - push minimum_pre_commit_version: 2.7.1 repos: -- repo: https://github.com/google/yapf - rev: v0.32.0 +- repo: https://github.com/ambv/black + rev: 23.7.0 hooks: - - id: yapf - language: python - additional_dependencies: [toml] -- repo: https://github.com/Instagram/Fixit - rev: 9d59f968e84bd2773f34b0069eeeaad3ce783254 - hooks: - - id: fixit-run-rules - stages: [manual] + - id: black - repo: https://github.com/timothycrosley/isort - rev: 5.10.1 + rev: 5.12.0 hooks: - id: isort additional_dependencies: [toml] - repo: https://github.com/snok/pep585-upgrade - rev: v1.0.1 + rev: v1.0 hooks: - id: upgrade-type-hints -- repo: https://github.com/myint/unify - rev: v0.5 - hooks: - - id: unify - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.2.0 + rev: v4.4.0 hooks: - id: check-docstring-first - id: end-of-file-fixer @@ -51,7 +40,7 @@ repos: args: [--remove] # for Python3 codebase, it's not necessary - id: requirements-txt-fixer - repo: https://github.com/pre-commit/pygrep-hooks - rev: v1.9.0 + rev: v1.10.0 hooks: - id: python-no-eval - id: python-use-type-annotations diff --git a/pyproject.toml b/pyproject.toml index 489c75ea..f7e72573 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -116,14 +116,3 @@ per-file-ignores = [ ] max-line-length = 80 count = true - -[tool.yapf] -based_on_style = "facebook" -split_penalty_before_if_expr = 0 -split_penalty_import_names = 0 -split_penalty_comprehension = 0 -split_penalty_for_added_line_split = 0 -split_penalty_after_opening_bracket = 0 -split_before_first_argument = true -split_before_named_assigns = true -split_complex_comprehension = true From 5f52db53ef2950593748da62aec9355886076aad Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Mon, 31 Jul 2023 15:16:07 +0200 Subject: [PATCH 027/343] run updated pre-commit: black format closes Formatting: move to black #220 --- README.md | 14 +- biocypher/__init__.py | 21 +- biocypher/_config/__init__.py | 52 +- biocypher/_config/biocypher_config.yaml | 2 - biocypher/_connect.py | 124 ++-- biocypher/_core.py | 121 ++-- biocypher/_create.py | 107 ++-- biocypher/_deduplicate.py | 29 +- biocypher/_logger.py | 25 +- biocypher/_mapping.py | 152 +++-- biocypher/_metadata.py | 29 +- biocypher/_misc.py | 45 +- biocypher/_ontology.py | 170 +++--- biocypher/_pandas.py | 26 +- biocypher/_translate.py | 167 +++--- biocypher/_write.py | 608 ++++++++++---------- docs/adapters.md | 4 +- docs/conf.py | 57 +- docs/index.rst | 2 +- docs/r-bioc.md | 2 +- docs/tutorial-adapter.md | 4 +- docs/tutorial.md | 2 +- docs/user-experiences.md | 14 +- test/conftest.py | 352 ++++++------ test/profile_performance.py | 90 ++- test/rdflib_playground.py | 27 +- test/test_config.py | 7 +- test/test_core.py | 11 +- test/test_create.py | 4 +- test/test_deduplicate.py | 90 +-- test/test_driver.py | 243 ++++---- test/test_integration.py | 10 +- test/test_mapping.py | 23 +- test/test_misc.py | 37 +- test/test_ontology.py | 99 ++-- test/test_pandas.py | 19 +- test/test_translate.py | 442 +++++++------- test/test_write_arango.py | 68 ++- test/test_write_neo4j.py | 542 +++++++++-------- test/test_write_postgres.py | 138 +++-- tutorial/01__basic_import.py | 6 +- tutorial/01__basic_import_pandas.py | 7 +- tutorial/02__merge.py | 12 +- tutorial/02__merge_pandas.py | 12 +- tutorial/03__implicit_subclass.py | 12 +- tutorial/03__implicit_subclass_pandas.py | 12 +- tutorial/04__properties.py | 12 +- tutorial/04__properties_pandas.py | 12 +- tutorial/05__property_inheritance.py | 12 +- tutorial/05__property_inheritance_pandas.py | 12 +- tutorial/06__relationships.py | 12 +- tutorial/06__relationships_pandas.py | 15 +- tutorial/07__synonyms.py | 12 +- tutorial/07__synonyms_pandas.py | 12 +- tutorial/data_generator.py | 65 ++- 55 files changed, 2123 insertions(+), 2081 deletions(-) diff --git a/README.md b/README.md index 6ac76c76..de04a821 100644 --- a/README.md +++ b/README.md @@ -3,12 +3,12 @@ ![Python](https://img.shields.io/badge/python-3.9-blue.svg) ![Python](https://img.shields.io/badge/python-3.10-blue.svg) [![PyPI version](https://badge.fury.io/py/biocypher.svg)](https://badge.fury.io/py/biocypher) -[![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) -![Docs build](https://github.com/biocypher/biocypher/actions/workflows/sphinx_autodoc.yml/badge.svg) -[![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) -[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit) +[![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) +![Docs build](https://github.com/biocypher/biocypher/actions/workflows/sphinx_autodoc.yml/badge.svg) +[![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) +[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) -[![Powered by the Bioregistry](https://img.shields.io/static/v1?label=Powered%20by&message=Bioregistry&color=BA274A&style=flat&logo=image/png;base64,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)](https://github.com/biopragmatics/bioregistry) +[![Powered by the Bioregistry](https://img.shields.io/static/v1?label=Powered%20by&message=Bioregistry&color=BA274A&style=flat&logo=image/png;base64,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)](https://github.com/biopragmatics/bioregistry) ## ❓ Description Knowledge graphs (KGs) are an [approach to knowledge @@ -60,8 +60,8 @@ please join our community at https://biocypher.zulipchat.com! > This disclaimer was adapted from the [Pooch](https://github.com/fatiando/pooch) project. ## ✍️ Citation -The BioCypher paper has been peer-reviewed in -[Nature Biotechnology](https://www.nature.com/articles/s41587-023-01848-y). +The BioCypher paper has been peer-reviewed in +[Nature Biotechnology](https://www.nature.com/articles/s41587-023-01848-y). Before, it was available as a preprint at https://arxiv.org/abs/2212.13543. ## Acknowledgements diff --git a/biocypher/__init__.py b/biocypher/__init__.py index 52c067da..6222ea76 100644 --- a/biocypher/__init__.py +++ b/biocypher/__init__.py @@ -13,14 +13,14 @@ """ __all__ = [ - '__version__', - '__author__', - 'module_data', - 'config', - 'logfile', - 'log', - 'Driver', - 'BioCypher', + "__version__", + "__author__", + "module_data", + "config", + "logfile", + "log", + "Driver", + "BioCypher", ] from ._core import BioCypher @@ -30,11 +30,10 @@ class Driver(BioCypher): - # initialise parent class but log a warning def __init__(self, *args, **kwargs): logger.warning( - 'The class `Driver` is deprecated and will be removed in a future ' - 'release. Please use `BioCypher` instead.' + "The class `Driver` is deprecated and will be removed in a future " + "release. Please use `BioCypher` instead." ) super().__init__(*args, **kwargs) diff --git a/biocypher/_config/__init__.py b/biocypher/_config/__init__.py index 584a30a5..3d421c1e 100644 --- a/biocypher/_config/__init__.py +++ b/biocypher/_config/__init__.py @@ -23,10 +23,10 @@ import yaml import appdirs -__all__ = ['module_data', 'module_data_path', 'read_config', 'config', 'reset'] +__all__ = ["module_data", "module_data_path", "read_config", "config", "reset"] -_USER_CONFIG_DIR = appdirs.user_config_dir('biocypher', 'saezlab') -_USER_CONFIG_FILE = os.path.join(_USER_CONFIG_DIR, 'conf.yaml') +_USER_CONFIG_DIR = appdirs.user_config_dir("biocypher", "saezlab") +_USER_CONFIG_FILE = os.path.join(_USER_CONFIG_DIR, "conf.yaml") class MyLoader(yaml.SafeLoader): @@ -34,18 +34,18 @@ def construct_scalar(self, node): # Check if the scalar contains double quotes and an escape sequence value = super().construct_scalar(node) q = bool(node.style == '"') - b = bool('\\' in value.encode('unicode_escape').decode('utf-8')) + b = bool("\\" in value.encode("unicode_escape").decode("utf-8")) if q and b: warnings.warn( ( - 'Double quotes detected in YAML configuration scalar: ' + "Double quotes detected in YAML configuration scalar: " f"{value.encode('unicode_escape')}. " - 'These allow escape sequences and may cause problems, for ' + "These allow escape sequences and may cause problems, for " "instance with the Neo4j admin import files (e.g. '\\t'). " - 'Make sure you wanted to do this, and use single quotes ' - 'whenever possible.' + "Make sure you wanted to do this, and use single quotes " + "whenever possible." ), - category=UserWarning + category=UserWarning, ) return value @@ -57,7 +57,7 @@ def module_data_path(name: str) -> str: here = os.path.dirname(os.path.abspath(__file__)) - return os.path.join(here, f'{name}.yaml') + return os.path.join(here, f"{name}.yaml") def module_data(name: str) -> Any: @@ -71,11 +71,8 @@ def module_data(name: str) -> Any: def _read_yaml(path: str) -> Optional[dict]: - if os.path.exists(path): - - with open(path, 'r') as fp: - + with open(path, "r") as fp: return yaml.load(fp.read(), Loader=MyLoader) @@ -89,18 +86,22 @@ def read_config() -> dict: TODO explain path configuration """ - defaults = module_data('biocypher_config') + defaults = module_data("biocypher_config") user = _read_yaml(_USER_CONFIG_FILE) or {} # TODO account for .yml? - local = _read_yaml('biocypher_config.yaml' - ) or _read_yaml('config/biocypher_config.yaml') or {} + local = ( + _read_yaml("biocypher_config.yaml") + or _read_yaml("config/biocypher_config.yaml") + or {} + ) for key in defaults: - - value = local[key] if key in local else user[key] if key in user else None + value = ( + local[key] if key in local else user[key] if key in user else None + ) if value is not None: - if type(defaults[key]) == str: # first level config (like title) + if type(defaults[key]) == str: # first level config (like title) defaults[key] = value else: defaults[key].update(value) @@ -114,20 +115,17 @@ def config(*args, **kwargs) -> Optional[Any]: """ if args and kwargs: - raise ValueError( - 'Setting and getting values in the same call is not allowed.', + "Setting and getting values in the same call is not allowed.", ) if args: - - result = tuple(globals()['_config'].get(key, None) for key in args) + result = tuple(globals()["_config"].get(key, None) for key in args) return result[0] if len(result) == 1 else result for key, value in kwargs.items(): - - globals()['_config'][key].update(value) + globals()["_config"][key].update(value) def reset(): @@ -135,7 +133,7 @@ def reset(): Reload configuration from the config files. """ - globals()['_config'] = read_config() + globals()["_config"] = read_config() reset() diff --git a/biocypher/_config/biocypher_config.yaml b/biocypher/_config/biocypher_config.yaml index 8fae981f..a31167be 100644 --- a/biocypher/_config/biocypher_config.yaml +++ b/biocypher/_config/biocypher_config.yaml @@ -109,5 +109,3 @@ postgresql: delimiter: '\t' # import_call_bin_prefix: '' # path to "psql" # import_call_file_prefix: '/path/to/files' - - \ No newline at end of file diff --git a/biocypher/_connect.py b/biocypher/_connect.py index 88f3b3aa..3e2a2a93 100644 --- a/biocypher/_connect.py +++ b/biocypher/_connect.py @@ -13,7 +13,7 @@ """ from ._logger import logger -logger.debug(f'Loading module {__name__}.') +logger.debug(f"Loading module {__name__}.") from typing import Optional from collections.abc import Iterable @@ -27,10 +27,10 @@ from ._ontology import Ontology from ._translate import Translator -__all__ = ['_Neo4jDriver'] +__all__ = ["_Neo4jDriver"] -class _Neo4jDriver(): +class _Neo4jDriver: """ Manages a BioCypher connection to a Neo4j database using the ``neo4j_utils.Driver`` class. @@ -58,6 +58,7 @@ class _Neo4jDriver(): translator (Translator): The translator to use for mapping. """ + def __init__( self, database_name: str, @@ -71,7 +72,6 @@ def __init__( fetch_size: int = 1000, increment_version: bool = True, ): - self._ontology = ontology self._translator = translator @@ -89,23 +89,18 @@ def __init__( # check for biocypher config in connected graph if wipe: - self.init_db() if increment_version: - # set new current version node self._update_meta_graph() def _update_meta_graph(self): - - logger.info('Updating Neo4j meta graph.') + logger.info("Updating Neo4j meta graph.") # find current version node db_version = self._driver.query( - 'MATCH (v:BioCypher) ' - 'WHERE NOT (v)-[:PRECEDES]->() ' - 'RETURN v', + "MATCH (v:BioCypher) " "WHERE NOT (v)-[:PRECEDES]->() " "RETURN v", ) # add version node self.add_biocypher_nodes(self._ontology) @@ -113,11 +108,11 @@ def _update_meta_graph(self): # connect version node to previous if db_version[0]: previous = db_version[0][0] - previous_id = previous['v']['id'] + previous_id = previous["v"]["id"] e_meta = BioCypherEdge( previous_id, - self._ontology.get_dict().get('node_id'), - 'PRECEDES', + self._ontology.get_dict().get("node_id"), + "PRECEDES", ) self.add_biocypher_edges(e_meta) @@ -132,7 +127,7 @@ def init_db(self): need of the database """ - logger.info('Initialising database.') + logger.info("Initialising database.") self._create_constraints() def _create_constraints(self): @@ -144,17 +139,16 @@ def _create_constraints(self): constraints on the id of all entities represented as nodes. """ - logger.info('Creating constraints for node types in config.') + logger.info("Creating constraints for node types in config.") # get structure for leaf in self._ontology.extended_schema.items(): label = _misc.sentencecase_to_pascalcase(leaf[0]) - if leaf[1]['represented_as'] == 'node': - + if leaf[1]["represented_as"] == "node": s = ( - f'CREATE CONSTRAINT `{label}_id` ' - f'IF NOT EXISTS ON (n:`{label}`) ' - 'ASSERT n.id IS UNIQUE' + f"CREATE CONSTRAINT `{label}_id` " + f"IF NOT EXISTS ON (n:`{label}`) " + "ASSERT n.id IS UNIQUE" ) self._driver.query(s) @@ -246,38 +240,36 @@ def add_biocypher_nodes( """ try: - nodes = _misc.to_list(nodes) entities = [node.get_dict() for node in nodes] except AttributeError: - - msg = 'Nodes must have a `get_dict` method.' + msg = "Nodes must have a `get_dict` method." logger.error(msg) raise ValueError(msg) - logger.info(f'Merging {len(entities)} nodes.') + logger.info(f"Merging {len(entities)} nodes.") entity_query = ( - 'UNWIND $entities AS ent ' - 'CALL apoc.merge.node([ent.node_label], ' - '{id: ent.node_id}, ent.properties, ent.properties) ' - 'YIELD node ' - 'RETURN node' + "UNWIND $entities AS ent " + "CALL apoc.merge.node([ent.node_label], " + "{id: ent.node_id}, ent.properties, ent.properties) " + "YIELD node " + "RETURN node" ) - method = 'explain' if explain else 'profile' if profile else 'query' + method = "explain" if explain else "profile" if profile else "query" result = getattr(self._driver, method)( entity_query, parameters={ - 'entities': entities, + "entities": entities, }, ) - logger.info('Finished merging nodes.') + logger.info("Finished merging nodes.") return result @@ -326,28 +318,23 @@ def add_biocypher_edges( rels = [] try: - for e in edges: - - if hasattr(e, 'get_node'): - + if hasattr(e, "get_node"): nodes.append(e.get_node()) rels.append(e.get_source_edge().get_dict()) rels.append(e.get_target_edge().get_dict()) else: - rels.append(e.get_dict()) except AttributeError: - - msg = 'Edges and nodes must have a `get_dict` method.' + msg = "Edges and nodes must have a `get_dict` method." logger.error(msg) raise ValueError(msg) self.add_biocypher_nodes(nodes) - logger.info(f'Merging {len(rels)} edges.') + logger.info(f"Merging {len(rels)} edges.") # cypher query @@ -355,41 +342,40 @@ def add_biocypher_edges( # properties on match and on create; # TODO add node labels? node_query = ( - 'UNWIND $rels AS r ' - 'MERGE (src {id: r.source_id}) ' - 'MERGE (tar {id: r.target_id}) ' + "UNWIND $rels AS r " + "MERGE (src {id: r.source_id}) " + "MERGE (tar {id: r.target_id}) " ) - self._driver.query(node_query, parameters={'rels': rels}) + self._driver.query(node_query, parameters={"rels": rels}) edge_query = ( - 'UNWIND $rels AS r ' - 'MATCH (src {id: r.source_id}) ' - 'MATCH (tar {id: r.target_id}) ' - 'WITH src, tar, r ' - 'CALL apoc.merge.relationship' - '(src, r.relationship_label, NULL, ' - 'r.properties, tar, r.properties) ' - 'YIELD rel ' - 'RETURN rel' + "UNWIND $rels AS r " + "MATCH (src {id: r.source_id}) " + "MATCH (tar {id: r.target_id}) " + "WITH src, tar, r " + "CALL apoc.merge.relationship" + "(src, r.relationship_label, NULL, " + "r.properties, tar, r.properties) " + "YIELD rel " + "RETURN rel" ) - method = 'explain' if explain else 'profile' if profile else 'query' + method = "explain" if explain else "profile" if profile else "query" - result = getattr(self._driver, - method)(edge_query, parameters={ - 'rels': rels - }) + result = getattr(self._driver, method)( + edge_query, parameters={"rels": rels} + ) - logger.info('Finished merging edges.') + logger.info("Finished merging edges.") return result def get_driver( dbms: str, - translator: 'Translator', - ontology: 'Ontology', + translator: "Translator", + ontology: "Ontology", ): """ Function to return the writer class. @@ -400,14 +386,14 @@ def get_driver( dbms_config = _config(dbms) - if dbms == 'neo4j': + if dbms == "neo4j": return _Neo4jDriver( - database_name=dbms_config['database_name'], - wipe=dbms_config['wipe'], - uri=dbms_config['uri'], - user=dbms_config['user'], - password=dbms_config['password'], - multi_db=dbms_config['multi_db'], + database_name=dbms_config["database_name"], + wipe=dbms_config["wipe"], + uri=dbms_config["uri"], + user=dbms_config["user"], + password=dbms_config["password"], + multi_db=dbms_config["multi_db"], ontology=ontology, translator=translator, ) diff --git a/biocypher/_core.py b/biocypher/_core.py index a6096eb0..2cf6f796 100644 --- a/biocypher/_core.py +++ b/biocypher/_core.py @@ -12,34 +12,36 @@ BioCypher core module. Interfaces with the user and distributes tasks to submodules. """ -from typing import Dict, List, Optional +from typing import Optional + from more_itertools import peekable + import pandas as pd from ._logger import logger -logger.debug(f'Loading module {__name__}.') +logger.debug(f"Loading module {__name__}.") from ._write import get_writer -from ._pandas import Pandas from ._config import config as _config from ._config import update_from_file as _file_update from ._create import BioCypherEdge, BioCypherNode +from ._pandas import Pandas from ._connect import get_driver from ._mapping import OntologyMapping from ._ontology import Ontology from ._translate import Translator from ._deduplicate import Deduplicator -__all__ = ['BioCypher'] +__all__ = ["BioCypher"] -SUPPORTED_DBMS = ['neo4j', 'postgresql'] +SUPPORTED_DBMS = ["neo4j", "postgresql"] REQUIRED_CONFIG = [ - 'dbms', - 'offline', - 'strict_mode', - 'head_ontology', + "dbms", + "offline", + "strict_mode", + "head_ontology", ] @@ -75,6 +77,7 @@ class BioCypher: provided, the default value 'biocypher-out' will be used. """ + def __init__( self, dbms: str = None, @@ -88,65 +91,64 @@ def __init__( # legacy params db_name: str = None, ): - # Update configuration if custom path is provided if biocypher_config_path: _file_update(biocypher_config_path) if db_name: logger.warning( - 'The parameter `db_name` is deprecated. Please set the ' - '`database_name` setting in the `biocypher_config.yaml` file ' - 'instead.' + "The parameter `db_name` is deprecated. Please set the " + "`database_name` setting in the `biocypher_config.yaml` file " + "instead." ) - _config(**{db_name: {'database_name': db_name}}) + _config(**{db_name: {"database_name": db_name}}) # Load configuration - self.base_config = _config('biocypher') + self.base_config = _config("biocypher") # Check for required configuration for key in REQUIRED_CONFIG: if key not in self.base_config: - raise ValueError(f'Configuration key {key} is required.') + raise ValueError(f"Configuration key {key} is required.") # Set configuration - mandatory - self._dbms = dbms or self.base_config['dbms'] + self._dbms = dbms or self.base_config["dbms"] if offline is None: - self._offline = self.base_config['offline'] + self._offline = self.base_config["offline"] else: self._offline = offline if strict_mode is None: - self._strict_mode = self.base_config['strict_mode'] + self._strict_mode = self.base_config["strict_mode"] else: self._strict_mode = strict_mode self._schema_config_path = schema_config_path or self.base_config.get( - 'schema_config_path' + "schema_config_path" ) if not self._schema_config_path: raise ValueError( - 'BioCypher requires a schema configuration; please provide a ' - 'path to the schema configuration YAML file via ' - '`biocypher_config.yaml` or `BioCypher` class parameter.' + "BioCypher requires a schema configuration; please provide a " + "path to the schema configuration YAML file via " + "`biocypher_config.yaml` or `BioCypher` class parameter." ) - self._head_ontology = head_ontology or self.base_config['head_ontology'] + self._head_ontology = head_ontology or self.base_config["head_ontology"] # Set configuration - optional self._output_directory = output_directory or self.base_config.get( - 'output_directory' + "output_directory" ) self._tail_ontologies = tail_ontologies or self.base_config.get( - 'tail_ontologies' + "tail_ontologies" ) if self._dbms not in SUPPORTED_DBMS: raise ValueError( - f'DBMS {self._dbms} not supported. ' - f'Please select from {SUPPORTED_DBMS}.' + f"DBMS {self._dbms} not supported. " + f"Please select from {SUPPORTED_DBMS}." ) # Initialize @@ -156,7 +158,7 @@ def __init__( self._ontology = None self._writer = None self._pd = None - + def _get_deduplicator(self) -> Deduplicator: """ Create deduplicator if not exists and return. @@ -222,7 +224,7 @@ def _get_writer(self): strict_mode=self._strict_mode, ) else: - raise NotImplementedError('Cannot get writer in online mode.') + raise NotImplementedError("Cannot get writer in online mode.") def _get_driver(self): """ @@ -237,12 +239,12 @@ def _get_driver(self): deduplicator=self._get_deduplicator(), ) else: - raise NotImplementedError('Cannot get driver in offline mode.') + raise NotImplementedError("Cannot get driver in offline mode.") def write_nodes(self, nodes, batch_size: int = int(1e6)) -> bool: """ Write nodes to database. Either takes an iterable of tuples (if given, - translates to ``BioCypherNode`` objects) or an iterable of + translates to ``BioCypherNode`` objects) or an iterable of ``BioCypherNode`` objects. Args: @@ -287,7 +289,7 @@ def write_edges(self, edges, batch_size: int = int(1e6)) -> bool: # write edge files return self._writer.write_edges(tedges, batch_size=batch_size) - def to_df(self) -> List[pd.DataFrame]: + def to_df(self) -> list[pd.DataFrame]: """ Convert entities to a pandas DataFrame for each entity type and return a list. @@ -303,9 +305,8 @@ def to_df(self) -> List[pd.DataFrame]: raise ValueError( "No pandas instance found. Please call `add()` first." ) - + return self._pd.dfs - def add(self, entities): """ @@ -323,7 +324,9 @@ def add(self, entities): entities = peekable(entities) - if isinstance(entities.peek(), BioCypherNode) or isinstance(entities.peek(), BioCypherEdge): + if isinstance(entities.peek(), BioCypherNode) or isinstance( + entities.peek(), BioCypherEdge + ): tentities = entities elif len(entities.peek()) < 4: tentities = self._translator.translate_nodes(entities) @@ -367,11 +370,11 @@ def merge_edges(self, edges) -> bool: Merge edges into database. Either takes an iterable of tuples (if given, translates to ``BioCypherEdge`` objects) or an iterable of ``BioCypherEdge`` objects. - + Args: - edges (iterable): An iterable of edges to merge into the database. + edges (iterable): An iterable of edges to merge into the database. - Returns: + Returns: bool: True if successful. """ @@ -388,7 +391,7 @@ def merge_edges(self, edges) -> bool: # OVERVIEW AND CONVENIENCE METHODS ### - def log_missing_input_labels(self) -> Optional[Dict[str, List[str]]]: + def log_missing_input_labels(self) -> Optional[dict[str, list[str]]]: """ Get the set of input labels encountered without an entry in the @@ -405,19 +408,19 @@ def log_missing_input_labels(self) -> Optional[Dict[str, List[str]]]: if mt: msg = ( - 'Input entities not accounted for due to them not being ' - 'present in the `schema_config.yaml` configuration file ' - '(this is not necessarily a problem, if you did not intend ' - 'to include them in the database; see the log for details): \n' + "Input entities not accounted for due to them not being " + "present in the `schema_config.yaml` configuration file " + "(this is not necessarily a problem, if you did not intend " + "to include them in the database; see the log for details): \n" ) for k, v in mt.items(): - msg += f' {k}: {v} \n' + msg += f" {k}: {v} \n" logger.info(msg) return mt else: - logger.info('No missing labels in input.') + logger.info("No missing labels in input.") return None def log_duplicates(self) -> None: @@ -429,46 +432,44 @@ def log_duplicates(self) -> None: dn = self._deduplicator.get_duplicate_nodes() if dn: - ntypes = dn[0] nids = dn[1] - msg = ('Duplicate node types encountered (IDs in log): \n') + msg = "Duplicate node types encountered (IDs in log): \n" for typ in ntypes: - msg += f' {typ}\n' + msg += f" {typ}\n" logger.info(msg) - idmsg = ('Duplicate node IDs encountered: \n') + idmsg = "Duplicate node IDs encountered: \n" for _id in nids: - idmsg += f' {_id}\n' + idmsg += f" {_id}\n" logger.debug(idmsg) else: - logger.info('No duplicate nodes in input.') + logger.info("No duplicate nodes in input.") de = self._deduplicator.get_duplicate_edges() if de: - etypes = de[0] eids = de[1] - msg = ('Duplicate edge types encountered (IDs in log): \n') + msg = "Duplicate edge types encountered (IDs in log): \n" for typ in etypes: - msg += f' {typ}\n' + msg += f" {typ}\n" logger.info(msg) - idmsg = ('Duplicate edge IDs encountered: \n') + idmsg = "Duplicate edge IDs encountered: \n" for _id in eids: - idmsg += f' {_id}\n' + idmsg += f" {_id}\n" logger.debug(idmsg) else: - logger.info('No duplicate edges in input.') + logger.info("No duplicate edges in input.") def show_ontology_structure(self, **kwargs) -> None: """ @@ -498,7 +499,7 @@ def write_import_call(self) -> None: if not self._offline: raise NotImplementedError( - 'Cannot write import call in online mode.' + "Cannot write import call in online mode." ) self._writer.write_import_call() @@ -520,7 +521,7 @@ def translate_term(self, term: str) -> str: self.start_ontology() return self._translator.translate_term(term) - + def summary(self) -> None: """ Wrapper for showing ontology structure and logging duplicates and diff --git a/biocypher/_create.py b/biocypher/_create.py index ca33e21b..0e6b7c00 100644 --- a/biocypher/_create.py +++ b/biocypher/_create.py @@ -13,16 +13,16 @@ """ from ._logger import logger -logger.debug(f'Loading module {__name__}.') +logger.debug(f"Loading module {__name__}.") from typing import Union from dataclasses import field, dataclass import os __all__ = [ - 'BioCypherEdge', - 'BioCypherNode', - 'BioCypherRelAsNode', + "BioCypherEdge", + "BioCypherNode", + "BioCypherRelAsNode", ] @@ -53,7 +53,7 @@ class BioCypherNode: node_id: str node_label: str - preferred_id: str = 'id' + preferred_id: str = "id" properties: dict = field(default_factory=dict) def __post_init__(self): @@ -64,47 +64,50 @@ def __post_init__(self): Replace unwanted characters in properties. """ - self.properties['id'] = self.node_id - self.properties['preferred_id'] = self.preferred_id or None + self.properties["id"] = self.node_id + self.properties["preferred_id"] = self.preferred_id or None # TODO actually make None possible here; as is, "id" is the default in # the dataclass as well as in the configuration file - if ':TYPE' in self.properties.keys(): + if ":TYPE" in self.properties.keys(): logger.warning( "Keyword ':TYPE' is reserved for Neo4j. " - 'Removing from properties.', + "Removing from properties.", # "Renaming to 'type'." ) # self.properties["type"] = self.properties[":TYPE"] - del self.properties[':TYPE'] + del self.properties[":TYPE"] for k, v in self.properties.items(): if isinstance(v, str): self.properties[k] = ( v.replace( os.linesep, - ' ', - ).replace( - '\n', - ' ', - ).replace( - '\r', - ' ', + " ", + ) + .replace( + "\n", + " ", + ) + .replace( + "\r", + " ", ) ) elif isinstance(v, list): - self.properties[k] = ( - [ - val.replace( - os.linesep, - ' ', - ).replace( - '\n', - ' ', - ).replace('\r', ' ') for val in v - ] - ) + self.properties[k] = [ + val.replace( + os.linesep, + " ", + ) + .replace( + "\n", + " ", + ) + .replace("\r", " ") + for val in v + ] def get_id(self) -> str: """ @@ -123,7 +126,7 @@ def get_label(self) -> str: str: node_label """ return self.node_label - + def get_type(self) -> str: """ Returns primary node label. @@ -161,9 +164,9 @@ def get_dict(self) -> dict: properties as second-level dict. """ return { - 'node_id': self.node_id, - 'node_label': self.node_label, - 'properties': self.properties, + "node_id": self.node_id, + "node_label": self.node_label, + "properties": self.properties, } @@ -204,30 +207,30 @@ def __post_init__(self): Check for reserved keywords. """ - if ':TYPE' in self.properties.keys(): + if ":TYPE" in self.properties.keys(): logger.debug( "Keyword ':TYPE' is reserved for Neo4j. " - 'Removing from properties.', + "Removing from properties.", # "Renaming to 'type'." ) # self.properties["type"] = self.properties[":TYPE"] - del self.properties[':TYPE'] - elif 'id' in self.properties.keys(): + del self.properties[":TYPE"] + elif "id" in self.properties.keys(): logger.debug( "Keyword 'id' is reserved for Neo4j. " - 'Removing from properties.', + "Removing from properties.", # "Renaming to 'type'." ) # self.properties["type"] = self.properties[":TYPE"] - del self.properties['id'] - elif '_ID' in self.properties.keys(): + del self.properties["id"] + elif "_ID" in self.properties.keys(): logger.debug( "Keyword '_ID' is reserved for Postgres. " - 'Removing from properties.', + "Removing from properties.", # "Renaming to 'type'." ) # self.properties["type"] = self.properties[":TYPE"] - del self.properties['_ID'] + del self.properties["_ID"] def get_id(self) -> Union[str, None]: """ @@ -295,11 +298,11 @@ def get_dict(self) -> dict: dict. """ return { - 'relationship_id': self.relationship_id or None, - 'source_id': self.source_id, - 'target_id': self.target_id, - 'relationship_label': self.relationship_label, - 'properties': self.properties, + "relationship_id": self.relationship_id or None, + "source_id": self.source_id, + "target_id": self.target_id, + "relationship_label": self.relationship_label, + "properties": self.properties, } @@ -331,20 +334,20 @@ class BioCypherRelAsNode: def __post_init__(self): if not isinstance(self.node, BioCypherNode): raise TypeError( - f'BioCypherRelAsNode.node must be a BioCypherNode, ' - f'not {type(self.node)}.', + f"BioCypherRelAsNode.node must be a BioCypherNode, " + f"not {type(self.node)}.", ) if not isinstance(self.source_edge, BioCypherEdge): raise TypeError( - f'BioCypherRelAsNode.source_edge must be a BioCypherEdge, ' - f'not {type(self.source_edge)}.', + f"BioCypherRelAsNode.source_edge must be a BioCypherEdge, " + f"not {type(self.source_edge)}.", ) if not isinstance(self.target_edge, BioCypherEdge): raise TypeError( - f'BioCypherRelAsNode.target_edge must be a BioCypherEdge, ' - f'not {type(self.target_edge)}.', + f"BioCypherRelAsNode.target_edge must be a BioCypherEdge, " + f"not {type(self.target_edge)}.", ) def get_node(self) -> BioCypherNode: diff --git a/biocypher/_deduplicate.py b/biocypher/_deduplicate.py index e1cd5c69..5ac79abb 100644 --- a/biocypher/_deduplicate.py +++ b/biocypher/_deduplicate.py @@ -1,9 +1,10 @@ from ._logger import logger -logger.debug(f'Loading module {__name__}.') +logger.debug(f"Loading module {__name__}.") from ._create import BioCypherEdge, BioCypherNode + class Deduplicator: """ Singleton class responsible of deduplicating BioCypher inputs. Maintains @@ -18,13 +19,13 @@ class Deduplicator: """ def __init__(self): - self.seen_node_ids = set() - self.duplicate_node_ids = set() - self.duplicate_node_types = set() + self.seen_node_ids = set() + self.duplicate_node_ids = set() + self.duplicate_node_types = set() - self.seen_edges = {} - self.duplicate_edge_ids = set() - self.duplicate_edge_types = set() + self.seen_edges = {} + self.duplicate_edge_ids = set() + self.duplicate_edge_types = set() def node_seen(self, node: BioCypherNode) -> bool: """ @@ -39,13 +40,15 @@ def node_seen(self, node: BioCypherNode) -> bool: if node.get_id() in self.seen_node_ids: self.duplicate_node_ids.add(node.get_id()) if node.get_label() not in self.duplicate_node_types: - logger.warning(f"Duplicate node type {node.get_label()} found. ") + logger.warning( + f"Duplicate node type {node.get_label()} found. " + ) self.duplicate_node_types.add(node.get_label()) return True - + self.seen_node_ids.add(node.get_id()) return False - + def edge_seen(self, edge: BioCypherEdge) -> bool: """ Adds an edge to the instance and checks if it has been seen before. @@ -71,10 +74,10 @@ def edge_seen(self, edge: BioCypherEdge) -> bool: logger.warning(f"Duplicate edge type {edge.get_type()} found. ") self.duplicate_edge_types.add(edge.get_type()) return True - + self.seen_edges[edge.get_type()].add(_id) return False - + def get_duplicate_nodes(self): """ Function to return a list of duplicate nodes. @@ -99,4 +102,4 @@ def get_duplicate_edges(self): if self.duplicate_edge_types: return (self.duplicate_edge_types, self.duplicate_edge_ids) else: - return None \ No newline at end of file + return None diff --git a/biocypher/_logger.py b/biocypher/_logger.py index bb09a825..c936a44f 100644 --- a/biocypher/_logger.py +++ b/biocypher/_logger.py @@ -12,7 +12,7 @@ Configuration of the module logger. """ -__all__ = ['get_logger', 'log', 'logfile'] +__all__ = ["get_logger", "log", "logfile"] from datetime import datetime import os @@ -23,7 +23,7 @@ from biocypher._metadata import __version__ -def get_logger(name: str = 'biocypher') -> logging.Logger: +def get_logger(name: str = "biocypher") -> logging.Logger: """ Access the module logger, create a new one if does not exist yet. @@ -45,7 +45,6 @@ def get_logger(name: str = 'biocypher') -> logging.Logger: """ if not logging.getLogger(name).hasHandlers(): - # create logger logger = logging.getLogger(name) logger.setLevel(logging.DEBUG) @@ -53,18 +52,19 @@ def get_logger(name: str = 'biocypher') -> logging.Logger: # formatting file_formatter = logging.Formatter( - '%(asctime)s\t%(levelname)s\tmodule:%(module)s\n%(message)s', + "%(asctime)s\t%(levelname)s\tmodule:%(module)s\n%(message)s", ) - stdout_formatter = logging.Formatter('%(levelname)s -- %(message)s') + stdout_formatter = logging.Formatter("%(levelname)s -- %(message)s") # file name and creation now = datetime.now() - date_time = now.strftime('%Y%m%d-%H%M%S') + date_time = now.strftime("%Y%m%d-%H%M%S") - logdir = _config.config('biocypher' - ).get('log_directory') or 'biocypher-log' + logdir = ( + _config.config("biocypher").get("log_directory") or "biocypher-log" + ) os.makedirs(logdir, exist_ok=True) - logfile = os.path.join(logdir, f'biocypher-{date_time}.log') + logfile = os.path.join(logdir, f"biocypher-{date_time}.log") # handlers # stream handler @@ -75,7 +75,7 @@ def get_logger(name: str = 'biocypher') -> logging.Logger: # file handler file_handler = logging.FileHandler(logfile) - if _config.config('biocypher').get('debug'): + if _config.config("biocypher").get("debug"): file_handler.setLevel(logging.DEBUG) else: file_handler.setLevel(logging.INFO) @@ -87,8 +87,8 @@ def get_logger(name: str = 'biocypher') -> logging.Logger: logger.addHandler(stdout_handler) # startup message - logger.info(f'This is BioCypher v{__version__}.') - logger.info(f'Logging into `{logfile}`.') + logger.info(f"This is BioCypher v{__version__}.") + logger.info(f"Logging into `{logfile}`.") return logging.getLogger(name) @@ -107,7 +107,6 @@ def log(): """ with open(logfile()) as fp: - pydoc.pager(fp.read()) diff --git a/biocypher/_mapping.py b/biocypher/_mapping.py index 7a242bfe..1269b28a 100644 --- a/biocypher/_mapping.py +++ b/biocypher/_mapping.py @@ -14,7 +14,7 @@ """ from ._logger import logger -logger.debug(f'Loading module {__name__}.') +logger.debug(f"Loading module {__name__}.") from typing import Optional from urllib.request import urlopen @@ -29,8 +29,8 @@ class OntologyMapping: """ Class to store the ontology mapping and extensions. """ - def __init__(self, config_file: str = None): + def __init__(self, config_file: str = None): self.schema = self._read_config(config_file) self.extended_schema = self._extend_schema() @@ -40,21 +40,16 @@ def _read_config(self, config_file: str = None): Read the configuration file and store the ontology mapping and extensions. """ if config_file is None: - - schema_config = _config.module_data('schema_config') + schema_config = _config.module_data("schema_config") # load yaml file from web - elif config_file.startswith('http'): - + elif config_file.startswith("http"): with urlopen(config_file) as f: - schema_config = yaml.safe_load(f) # get graph state from config (assume file is local) else: - - with open(config_file, 'r') as f: - + with open(config_file, "r") as f: schema_config = yaml.safe_load(f) return schema_config @@ -78,30 +73,28 @@ def _extend_schema(self, d: Optional[dict] = None) -> dict: # first pass: get parent leaves with direct representation in ontology for k, v in d.items(): - # k is not an entity - if 'represented_as' not in v: + if "represented_as" not in v: continue # preferred_id optional: if not provided, use `id` - if not v.get('preferred_id'): - v['preferred_id'] = 'id' + if not v.get("preferred_id"): + v["preferred_id"] = "id" # k is an entity that is present in the ontology - if 'is_a' not in v: + if "is_a" not in v: extended_schema[k] = v # second pass: "vertical" inheritance d = self._vertical_property_inheritance(d) for k, v in d.items(): - if 'is_a' in v: - + if "is_a" in v: # prevent loops - if k == v['is_a']: + if k == v["is_a"]: logger.warning( - f'Loop detected in ontology mapping: {k} -> {v}. ' - 'Removing item. Please fix the inheritance if you want ' - 'to use this item.' + f"Loop detected in ontology mapping: {k} -> {v}. " + "Removing item. Please fix the inheritance if you want " + "to use this item." ) continue @@ -112,16 +105,15 @@ def _extend_schema(self, d: Optional[dict] = None) -> dict: mi_leaves = {} ms_leaves = {} for k, v in d.items(): - # k is not an entity - if 'represented_as' not in v: + if "represented_as" not in v: continue - if isinstance(v.get('preferred_id'), list): + if isinstance(v.get("preferred_id"), list): mi_leaves = self._horizontal_inheritance_pid(k, v) extended_schema.update(mi_leaves) - elif isinstance(v.get('source'), list): + elif isinstance(v.get("source"), list): ms_leaves = self._horizontal_inheritance_source(k, v) extended_schema.update(ms_leaves) @@ -132,40 +124,38 @@ def _vertical_property_inheritance(self, d): Inherit properties from parents to children and update `d` accordingly. """ for k, v in d.items(): - # k is not an entity - if 'represented_as' not in v: + if "represented_as" not in v: continue # k is an entity that is present in the ontology - if 'is_a' not in v: + if "is_a" not in v: continue # "vertical" inheritance: inherit properties from parent - if v.get('inherit_properties', False): - + if v.get("inherit_properties", False): # get direct ancestor - if isinstance(v['is_a'], list): - parent = v['is_a'][0] + if isinstance(v["is_a"], list): + parent = v["is_a"][0] else: - parent = v['is_a'] + parent = v["is_a"] # ensure child has properties and exclude_properties - if 'properties' not in v: - v['properties'] = {} - if 'exclude_properties' not in v: - v['exclude_properties'] = {} + if "properties" not in v: + v["properties"] = {} + if "exclude_properties" not in v: + v["exclude_properties"] = {} # update properties of child - parent_props = self.schema[parent].get('properties', {}) + parent_props = self.schema[parent].get("properties", {}) if parent_props: - v['properties'].update(parent_props) + v["properties"].update(parent_props) parent_excl_props = self.schema[parent].get( - 'exclude_properties', {} + "exclude_properties", {} ) if parent_excl_props: - v['exclude_properties'].update(parent_excl_props) + v["exclude_properties"].update(parent_excl_props) # update schema (d) d[k] = v @@ -182,9 +172,9 @@ def _horizontal_inheritance_pid(self, key, value): leaves = {} - preferred_id = value['preferred_id'] - input_label = value.get('input_label') or value['label_in_input'] - represented_as = value['represented_as'] + preferred_id = value["preferred_id"] + input_label = value.get("input_label") or value["label_in_input"] + represented_as = value["represented_as"] # adjust lengths max_l = max( @@ -208,40 +198,38 @@ def _horizontal_inheritance_pid(self, key, value): reps = represented_as for pid, lab, rep in zip(pids, input_label, reps): - - skey = pid + '.' + key + skey = pid + "." + key svalue = { - 'preferred_id': pid, - 'input_label': lab, - 'represented_as': rep, + "preferred_id": pid, + "input_label": lab, + "represented_as": rep, # mark as virtual - 'virtual': True, + "virtual": True, } # inherit is_a if exists - if 'is_a' in value.keys(): - + if "is_a" in value.keys(): # treat as multiple inheritance - if isinstance(value['is_a'], list): - v = list(value['is_a']) + if isinstance(value["is_a"], list): + v = list(value["is_a"]) v.insert(0, key) - svalue['is_a'] = v + svalue["is_a"] = v else: - svalue['is_a'] = [key, value['is_a']] + svalue["is_a"] = [key, value["is_a"]] else: # set parent as is_a - svalue['is_a'] = key + svalue["is_a"] = key # inherit everything except core attributes for k, v in value.items(): if k not in [ - 'is_a', - 'preferred_id', - 'input_label', - 'label_in_input', - 'represented_as', + "is_a", + "preferred_id", + "input_label", + "label_in_input", + "represented_as", ]: svalue[k] = v @@ -259,9 +247,9 @@ def _horizontal_inheritance_source(self, key, value): leaves = {} - source = value['source'] - input_label = value.get('input_label') or value['label_in_input'] - represented_as = value['represented_as'] + source = value["source"] + input_label = value.get("input_label") or value["label_in_input"] + represented_as = value["represented_as"] # adjust lengths src_l = len(source) @@ -279,40 +267,38 @@ def _horizontal_inheritance_source(self, key, value): reps = represented_as for src, lab, rep in zip(source, labels, reps): - - skey = src + '.' + key + skey = src + "." + key svalue = { - 'source': src, - 'input_label': lab, - 'represented_as': rep, + "source": src, + "input_label": lab, + "represented_as": rep, # mark as virtual - 'virtual': True, + "virtual": True, } # inherit is_a if exists - if 'is_a' in value.keys(): - + if "is_a" in value.keys(): # treat as multiple inheritance - if isinstance(value['is_a'], list): - v = list(value['is_a']) + if isinstance(value["is_a"], list): + v = list(value["is_a"]) v.insert(0, key) - svalue['is_a'] = v + svalue["is_a"] = v else: - svalue['is_a'] = [key, value['is_a']] + svalue["is_a"] = [key, value["is_a"]] else: # set parent as is_a - svalue['is_a'] = key + svalue["is_a"] = key # inherit everything except core attributes for k, v in value.items(): if k not in [ - 'is_a', - 'source', - 'input_label', - 'label_in_input', - 'represented_as', + "is_a", + "source", + "input_label", + "label_in_input", + "represented_as", ]: svalue[k] = v diff --git a/biocypher/_metadata.py b/biocypher/_metadata.py index e8cac084..cbc1426c 100644 --- a/biocypher/_metadata.py +++ b/biocypher/_metadata.py @@ -11,7 +11,7 @@ Package metadata (version, authors, etc). """ -__all__ = ['get_metadata'] +__all__ = ["get_metadata"] import os import pathlib @@ -19,7 +19,7 @@ import toml -_VERSION = '0.5.17' +_VERSION = "0.5.17" def get_metadata(): @@ -31,46 +31,41 @@ def get_metadata(): """ here = pathlib.Path(__file__).parent - pyproj_toml = 'pyproject.toml' + pyproj_toml = "pyproject.toml" meta = {} for project_dir in (here, here.parent): - toml_path = str(project_dir.joinpath(pyproj_toml).absolute()) if os.path.exists(toml_path): - pyproject = toml.load(toml_path) meta = { - 'name': pyproject['tool']['poetry']['name'], - 'version': pyproject['tool']['poetry']['version'], - 'author': pyproject['tool']['poetry']['authors'], - 'license': pyproject['tool']['poetry']['license'], - 'full_metadata': pyproject, + "name": pyproject["tool"]["poetry"]["name"], + "version": pyproject["tool"]["poetry"]["version"], + "author": pyproject["tool"]["poetry"]["authors"], + "license": pyproject["tool"]["poetry"]["license"], + "full_metadata": pyproject, } break if not meta: - try: - meta = { k.lower(): v for k, v in importlib.metadata.metadata(here.name).items() } except importlib.metadata.PackageNotFoundError: - pass - meta['version'] = meta.get('version', None) or _VERSION + meta["version"] = meta.get("version", None) or _VERSION return meta metadata = get_metadata() -__version__ = metadata.get('version', None) -__author__ = metadata.get('author', None) -__license__ = metadata.get('license', None) +__version__ = metadata.get("version", None) +__author__ = metadata.get("author", None) +__license__ = metadata.get("license", None) diff --git a/biocypher/_misc.py b/biocypher/_misc.py index 82fc0b40..b516a048 100644 --- a/biocypher/_misc.py +++ b/biocypher/_misc.py @@ -13,7 +13,7 @@ """ from ._logger import logger -logger.debug(f'Loading module {__name__}.') +logger.debug(f"Loading module {__name__}.") from typing import ( Any, @@ -31,7 +31,7 @@ import networkx as nx import stringcase -__all__ = ['LIST_LIKE', 'SIMPLE_TYPES', 'ensure_iterable', 'to_list'] +__all__ = ["LIST_LIKE", "SIMPLE_TYPES", "ensure_iterable", "to_list"] SIMPLE_TYPES = ( bytes, @@ -60,11 +60,9 @@ def to_list(value: Any) -> list: """ if isinstance(value, LIST_LIKE): - value = list(value) else: - value = [value] return value @@ -75,7 +73,7 @@ def ensure_iterable(value: Any) -> Iterable: Returns iterables, except strings, wraps simple types into tuple. """ - return value if isinstance(value, LIST_LIKE) else (value, ) + return value if isinstance(value, LIST_LIKE) else (value,) def create_tree_visualisation(inheritance_tree: Union[dict, nx.Graph]) -> str: @@ -84,7 +82,6 @@ def create_tree_visualisation(inheritance_tree: Union[dict, nx.Graph]) -> str: """ if isinstance(inheritance_tree, nx.Graph): - inheritance_tree = nx.to_dict_of_lists(inheritance_tree) # unlist values inheritance_tree = {k: v[0] for k, v in inheritance_tree.items() if v} @@ -95,56 +92,48 @@ def create_tree_visualisation(inheritance_tree: Union[dict, nx.Graph]) -> str: root = list(parents - classes) if len(root) > 1: - - if 'entity' in root: - - root = 'entity' # default: good standard? TODO + if "entity" in root: + root = "entity" # default: good standard? TODO else: - raise ValueError( - 'Inheritance tree cannot have more than one root node. ' - f'Found {len(root)}: {root}.' + "Inheritance tree cannot have more than one root node. " + f"Found {len(root)}: {root}." ) else: - root = root[0] if not root: # find key whose value is None - root = list(inheritance_tree.keys())[list(inheritance_tree.values() - ).index(None)] + root = list(inheritance_tree.keys())[ + list(inheritance_tree.values()).index(None) + ] tree = Tree() tree.create_node(root, root) while classes: - for child in classes: - parent = inheritance_tree[child] if parent in tree.nodes.keys() or parent == root: - tree.create_node(child, child, parent=parent) for node in tree.nodes.keys(): - if node in classes: - classes.remove(node) return tree # string conversion, adapted from Biolink Model Toolkit -lowercase_pattern = re.compile(r'[a-zA-Z]*[a-z][a-zA-Z]*') -underscore_pattern = re.compile(r'(? str: +def from_pascal(s: str, sep: str = " ") -> str: underscored = underscore_pattern.sub(sep, s) lowercased = lowercase_pattern.sub( lambda match: match.group(0).lower(), @@ -163,7 +152,7 @@ def pascalcase_to_sentencecase(s: str) -> str: Returns: string in sentence case form """ - return from_pascal(s, sep=' ') + return from_pascal(s, sep=" ") def snakecase_to_sentencecase(s: str) -> str: @@ -202,7 +191,7 @@ def sentencecase_to_pascalcase(s: str) -> str: Returns: string in PascalCase form """ - return re.sub(r'(?:^| )([a-zA-Z])', lambda match: match.group(1).upper(), s) + return re.sub(r"(?:^| )([a-zA-Z])", lambda match: match.group(1).upper(), s) def to_lower_sentence_case(s: str) -> str: @@ -216,9 +205,9 @@ def to_lower_sentence_case(s: str) -> str: Returns: string in lower sentence case form """ - if '_' in s: + if "_" in s: return snakecase_to_sentencecase(s) - elif ' ' in s: + elif " " in s: return s.lower() elif s[0].isupper(): return pascalcase_to_sentencecase(s) diff --git a/biocypher/_ontology.py b/biocypher/_ontology.py index 0738d7b9..e22e4465 100644 --- a/biocypher/_ontology.py +++ b/biocypher/_ontology.py @@ -17,7 +17,7 @@ from ._logger import logger -logger.debug(f'Loading module {__name__}.') +logger.debug(f"Loading module {__name__}.") from typing import Optional from datetime import datetime @@ -40,6 +40,7 @@ class OntologyAdapter: labels are formatted in lower sentence case. In some cases, this means that we replace underscores with spaces. """ + def __init__( self, ontology_file: str, @@ -63,7 +64,7 @@ def __init__( node in the head ontology that should be used to join to the root node of the tail ontology. Defaults to None. - merge_nodes (bool): If True, head and tail join nodes will be + merge_nodes (bool): If True, head and tail join nodes will be merged, using the label of the head join node. If False, the tail join node will be attached as a child of the head join node. @@ -76,7 +77,7 @@ def __init__( be removed. Defaults to True. """ - logger.info(f'Instantiating OntologyAdapter class for {ontology_file}.') + logger.info(f"Instantiating OntologyAdapter class for {ontology_file}.") self._ontology_file = ontology_file self._root_label = root_label @@ -93,7 +94,6 @@ def __init__( ) def _rdf_to_nx(self, g, root_label, switch_id_and_label=True): - # Loop through all labels in the ontology for s, _, o in g.triples((None, rdflib.RDFS.label, None)): # If the label is the root label, set the root node to the subject of the label @@ -102,7 +102,7 @@ def _rdf_to_nx(self, g, root_label, switch_id_and_label=True): break else: raise ValueError( - f'Could not find root node with label {root_label}' + f"Could not find root node with label {root_label}" ) # Create a directed graph to represent the ontology as a tree @@ -110,7 +110,6 @@ def _rdf_to_nx(self, g, root_label, switch_id_and_label=True): # Define a recursive function to add subclasses to the graph def add_subclasses(node): - # Only add nodes that have a label if (node, rdflib.RDFS.label, None) not in g: return @@ -119,25 +118,23 @@ def add_subclasses(node): if nx_id not in G: G.add_node(nx_id) - G.nodes[nx_id]['label'] = nx_label + G.nodes[nx_id]["label"] = nx_label # Recursively add all subclasses of the node to the graph for s, _, o in g.triples((None, rdflib.RDFS.subClassOf, node)): - # Only add nodes that have a label if (s, rdflib.RDFS.label, None) not in g: continue s_id, s_label = _get_nx_id_and_label(s) G.add_node(s_id) - G.nodes[s_id]['label'] = s_label + G.nodes[s_id]["label"] = s_label G.add_edge(s_id, nx_id) add_subclasses(s) add_parents(s) def add_parents(node): - # Only add nodes that have a label if (node, rdflib.RDFS.label, None) not in g: return @@ -146,7 +143,6 @@ def add_parents(node): # Recursively add all parents of the node to the graph for s, _, o in g.triples((node, rdflib.RDFS.subClassOf, None)): - # Only add nodes that have a label if (o, rdflib.RDFS.label, None) not in g: continue @@ -158,15 +154,16 @@ def add_parents(node): continue G.add_node(o_id) - G.nodes[o_id]['label'] = o_label + G.nodes[o_id]["label"] = o_label G.add_edge(nx_id, o_id) add_parents(o) def _get_nx_id_and_label(node): node_id_str = self._remove_prefix(str(node)) - node_label_str = str(g.value(node, - rdflib.RDFS.label)).replace('_', ' ') + node_label_str = str(g.value(node, rdflib.RDFS.label)).replace( + "_", " " + ) node_label_str = _misc.to_lower_sentence_case(node_label_str) nx_id = node_label_str if switch_id_and_label else node_id_str @@ -185,7 +182,7 @@ def _remove_prefix(self, uri: str) -> str: everything before the last separator. """ if self._remove_prefixes: - return uri.rsplit('#', 1)[-1].rsplit('/', 1)[-1] + return uri.rsplit("#", 1)[-1].rsplit("/", 1)[-1] else: return uri @@ -202,17 +199,17 @@ def _get_format(self, ontology_file): """ Get the format of the ontology file. """ - if ontology_file.endswith('.owl'): - return 'application/rdf+xml' - elif ontology_file.endswith('.obo'): - raise NotImplementedError('OBO format not yet supported') - elif ontology_file.endswith('.rdf'): - return 'application/rdf+xml' - elif ontology_file.endswith('.ttl'): - return 'ttl' + if ontology_file.endswith(".owl"): + return "application/rdf+xml" + elif ontology_file.endswith(".obo"): + raise NotImplementedError("OBO format not yet supported") + elif ontology_file.endswith(".rdf"): + return "application/rdf+xml" + elif ontology_file.endswith(".ttl"): + return "ttl" else: raise ValueError( - f'Could not determine format of ontology file {ontology_file}' + f"Could not determine format of ontology file {ontology_file}" ) def get_nx_graph(self): @@ -254,10 +251,11 @@ class Ontology: while an arbitrary number of other resources can become "tail" ontologies at arbitrary fusion points inside the "head" ontology. """ + def __init__( self, head_ontology: dict, - ontology_mapping: 'OntologyMapping', + ontology_mapping: "OntologyMapping", tail_ontologies: Optional[dict] = None, ): """ @@ -311,21 +309,21 @@ def _load_ontologies(self) -> None: instance variable (head) or a dictionary (tail). """ - logger.info('Loading ontologies...') + logger.info("Loading ontologies...") self._head_ontology = OntologyAdapter( - self._head_ontology_meta['url'], - self._head_ontology_meta['root_node'], + self._head_ontology_meta["url"], + self._head_ontology_meta["root_node"], ) if self._tail_ontology_meta: self._tail_ontologies = {} for key, value in self._tail_ontology_meta.items(): self._tail_ontologies[key] = OntologyAdapter( - ontology_file = value['url'], - root_label = value['tail_join_node'], - head_join_node = value['head_join_node'], - merge_nodes = value.get('merge_nodes', True), + ontology_file=value["url"], + root_label=value["tail_join_node"], + head_join_node=value["head_join_node"], + merge_nodes=value.get("merge_nodes", True), ) def _assert_join_node(self, adapter: OntologyAdapter) -> None: @@ -342,10 +340,9 @@ def _assert_join_node(self, adapter: OntologyAdapter) -> None: head_join_node = adapter.get_head_join_node() if head_join_node not in self._head_ontology.get_nx_graph().nodes: - raise ValueError( - f'Head join node {head_join_node} not found in ' - f'head ontology.' + f"Head join node {head_join_node} not found in " + f"head ontology." ) def _join_ontologies(self, adapter: OntologyAdapter) -> None: @@ -383,11 +380,9 @@ def _join_ontologies(self, adapter: OntologyAdapter) -> None: # as parent of tail join node tail_ontology_subtree.add_node( head_join_node, - **self._head_ontology.get_nx_graph().nodes[head_join_node] - ) - tail_ontology_subtree.add_edge( - tail_join_node, head_join_node + **self._head_ontology.get_nx_graph().nodes[head_join_node], ) + tail_ontology_subtree.add_edge(tail_join_node, head_join_node) # else rename tail join node to match head join node if necessary elif not tail_join_node == head_join_node: @@ -409,46 +404,43 @@ def _extend_ontology(self) -> None: self._nx_graph = self._head_ontology.get_nx_graph().copy() for key, value in self.extended_schema.items(): - - if not value.get('is_a'): - - if self._nx_graph.has_node(value.get('synonym_for')): - + if not value.get("is_a"): + if self._nx_graph.has_node(value.get("synonym_for")): continue - + if not self._nx_graph.has_node(key): - raise ValueError( - f'Node {key} not found in ontology, but also has no ' - 'inheritance definition. Please check your schema for ' - 'spelling errors or a missing `is_a` definition.' + f"Node {key} not found in ontology, but also has no " + "inheritance definition. Please check your schema for " + "spelling errors or a missing `is_a` definition." ) - + continue - parents = _misc.to_list(value.get('is_a')) + parents = _misc.to_list(value.get("is_a")) child = key while parents: parent = parents.pop(0) if parent not in self._nx_graph.nodes: - self._nx_graph.add_node(parent) self._nx_graph.nodes[parent][ - 'label'] = _misc.sentencecase_to_pascalcase(parent) + "label" + ] = _misc.sentencecase_to_pascalcase(parent) # mark parent as user extension - self._nx_graph.nodes[parent]['user_extension'] = True + self._nx_graph.nodes[parent]["user_extension"] = True self._extended_nodes.add(parent) if child not in self._nx_graph.nodes: self._nx_graph.add_node(child) self._nx_graph.nodes[child][ - 'label'] = _misc.sentencecase_to_pascalcase(child) + "label" + ] = _misc.sentencecase_to_pascalcase(child) # mark child as user extension - self._nx_graph.nodes[child]['user_extension'] = True + self._nx_graph.nodes[child]["user_extension"] = True self._extended_nodes.add(child) self._nx_graph.add_edge(child, parent) @@ -463,29 +455,28 @@ def _connect_biolink_classes(self) -> None: if not self._nx_graph: self._nx_graph = self._head_ontology.get_nx_graph().copy() - if 'entity' not in self._nx_graph.nodes: + if "entity" not in self._nx_graph.nodes: return # biolink classes that are disjoint from entity disjoint_classes = [ - 'frequency qualifier mixin', - 'chemical entity to entity association mixin', - 'ontology class', - 'relationship quantifier', - 'physical essence or occurrent', - 'gene or gene product', - 'subject of investigation', + "frequency qualifier mixin", + "chemical entity to entity association mixin", + "ontology class", + "relationship quantifier", + "physical essence or occurrent", + "gene or gene product", + "subject of investigation", ] for node in disjoint_classes: - if not self._nx_graph.nodes.get(node): - self._nx_graph.add_node(node) self._nx_graph.nodes[node][ - 'label'] = _misc.sentencecase_to_pascalcase(node) + "label" + ] = _misc.sentencecase_to_pascalcase(node) - self._nx_graph.add_edge(node, 'entity') + self._nx_graph.add_edge(node, "entity") def _add_properties(self) -> None: """ @@ -495,21 +486,18 @@ def _add_properties(self) -> None: """ for key, value in self.extended_schema.items(): - if key in self._nx_graph.nodes: - self._nx_graph.nodes[key].update(value) - if value.get('synonym_for'): - + if value.get("synonym_for"): # change node label to synonym - if value['synonym_for'] not in self._nx_graph.nodes: + if value["synonym_for"] not in self._nx_graph.nodes: raise ValueError( f'Node {value["synonym_for"]} not found in ontology.' ) self._nx_graph = nx.relabel_nodes( - self._nx_graph, {value['synonym_for']: key} + self._nx_graph, {value["synonym_for"]: key} ) def get_ancestors(self, node_label: str) -> list: @@ -541,18 +529,17 @@ def show_ontology_structure(self, to_disk: str = None, full: bool = False): """ if not self._nx_graph: - raise ValueError('Ontology not loaded.') + raise ValueError("Ontology not loaded.") if not self._tail_ontologies: - msg = f'Showing ontology structure based on {self._head_ontology._ontology_file}' + msg = f"Showing ontology structure based on {self._head_ontology._ontology_file}" else: - msg = f'Showing ontology structure based on {len(self._tail_ontology_meta)+1} ontologies: ' + msg = f"Showing ontology structure based on {len(self._tail_ontology_meta)+1} ontologies: " print(msg) if not full: - # set of leaves and their intermediate parents up to the root filter_nodes = set(self.extended_schema.keys()) @@ -563,19 +550,17 @@ def show_ontology_structure(self, to_disk: str = None, full: bool = False): G = self._nx_graph.subgraph(filter_nodes) else: - G = self._nx_graph if not to_disk: - # create tree tree = _misc.create_tree_visualisation(G) # add synonym information for node in self.extended_schema: - if self.extended_schema[node].get('synonym_for'): + if self.extended_schema[node].get("synonym_for"): tree.nodes[node].tag = ( - f'{node} = ' + f"{node} = " f"{self.extended_schema[node].get('synonym_for')}" ) @@ -584,26 +569,24 @@ def show_ontology_structure(self, to_disk: str = None, full: bool = False): return tree else: - # convert lists/dicts to strings for vis only for node in G.nodes: - # rename node and use former id as label - label = G.nodes[node].get('label') + label = G.nodes[node].get("label") if not label: label = node G = nx.relabel_nodes(G, {node: label}) - G.nodes[label]['label'] = node + G.nodes[label]["label"] = node for attrib in G.nodes[label]: if type(G.nodes[label][attrib]) in [list, dict]: G.nodes[label][attrib] = str(G.nodes[label][attrib]) - path = os.path.join(to_disk, 'ontology_structure.graphml') + path = os.path.join(to_disk, "ontology_structure.graphml") - logger.info(f'Writing ontology structure to {path}.') + logger.info(f"Writing ontology structure to {path}.") nx.write_graphml(G, path) @@ -616,10 +599,10 @@ def get_dict(self) -> dict: """ d = { - 'node_id': self._get_current_id(), - 'node_label': 'BioCypher', - 'properties': { - 'schema': 'self.extended_schema', + "node_id": self._get_current_id(), + "node_label": "BioCypher", + "properties": { + "schema": "self.extended_schema", }, } @@ -635,5 +618,4 @@ def _get_current_id(self): """ now = datetime.now() - return now.strftime('v%Y%m%d-%H%M%S') - \ No newline at end of file + return now.strftime("v%Y%m%d-%H%M%S") diff --git a/biocypher/_pandas.py b/biocypher/_pandas.py index 44821d91..24898b4a 100644 --- a/biocypher/_pandas.py +++ b/biocypher/_pandas.py @@ -1,5 +1,7 @@ import pandas as pd -from ._create import BioCypherNode, BioCypherEdge + +from ._create import BioCypherEdge, BioCypherNode + class Pandas: def __init__(self, ontology, translator, deduplicator): @@ -16,9 +18,13 @@ def _separate_entity_types(self, entities): """ lists = {} for entity in entities: - if not isinstance(entity, BioCypherNode) and not isinstance(entity, BioCypherEdge): - raise TypeError(f"Expected a BioCypherNode or BioCypherEdge, got {type(entity)}.") - + if not isinstance(entity, BioCypherNode) and not isinstance( + entity, BioCypherEdge + ): + raise TypeError( + f"Expected a BioCypherNode or BioCypherEdge, got {type(entity)}." + ) + if isinstance(entity, BioCypherNode): seen = self.deduplicator.node_seen(entity) elif isinstance(entity, BioCypherEdge): @@ -26,7 +32,7 @@ def _separate_entity_types(self, entities): if seen: continue - + _type = entity.get_label() if not _type in lists: lists[_type] = [] @@ -45,10 +51,14 @@ def add_tables(self, entities): self._add_entity_df(_type, _entities) def _add_entity_df(self, _type, _entities): - df = pd.DataFrame(pd.json_normalize([node.get_dict() for node in _entities])) - #replace "properties." with "" in column names + df = pd.DataFrame( + pd.json_normalize([node.get_dict() for node in _entities]) + ) + # replace "properties." with "" in column names df.columns = [col.replace("properties.", "") for col in df.columns] if _type not in self.dfs: self.dfs[_type] = df else: - self.dfs[_type] = pd.concat([self.dfs[_type], df], ignore_index=True) + self.dfs[_type] = pd.concat( + [self.dfs[_type], df], ignore_index=True + ) diff --git a/biocypher/_translate.py b/biocypher/_translate.py index 3b3bee29..663d11ab 100644 --- a/biocypher/_translate.py +++ b/biocypher/_translate.py @@ -14,7 +14,7 @@ """ from ._logger import logger -logger.debug(f'Loading module {__name__}.') +logger.debug(f"Loading module {__name__}.") from typing import Any, Union, Optional from collections.abc import Iterable, Generator @@ -25,7 +25,7 @@ from ._create import BioCypherEdge, BioCypherNode, BioCypherRelAsNode from ._mapping import OntologyMapping -__all__ = ['BiolinkAdapter', 'Translator'] +__all__ = ["BiolinkAdapter", "Translator"] class Translator: @@ -40,8 +40,9 @@ class Translator: Provides utility functions for translating between input and output labels and cypher queries. """ + def __init__( - self, ontology_mapping: 'OntologyMapping', strict_mode: bool = False + self, ontology_mapping: "OntologyMapping", strict_mode: bool = False ): """ Args: @@ -85,30 +86,28 @@ def translate_nodes( """ - self._log_begin_translate(id_type_prop_tuples, 'nodes') + self._log_begin_translate(id_type_prop_tuples, "nodes") for _id, _type, _props in id_type_prop_tuples: - # check for strict mode requirements - required_props = ['source', 'licence', 'version'] + required_props = ["source", "licence", "version"] if self.strict_mode: # rename 'license' to 'licence' in _props - if _props.get('license'): - _props['licence'] = _props.pop('license') + if _props.get("license"): + _props["licence"] = _props.pop("license") for prop in required_props: if prop not in _props: raise ValueError( - f'Property `{prop}` missing from node {_id}. ' - 'Strict mode is enabled, so this is not allowed.' + f"Property `{prop}` missing from node {_id}. " + "Strict mode is enabled, so this is not allowed." ) # find the node in leaves that represents biolink node type _ontology_class = self._get_ontology_mapping(_type) if _ontology_class: - # filter properties for those specified in schema_config if any _filtered_props = self._filter_props(_ontology_class, _props) @@ -123,10 +122,9 @@ def translate_nodes( ) else: - self._record_no_type(_type, _id) - self._log_finish_translate('nodes') + self._log_finish_translate("nodes") def _get_preferred_id(self, _bl_type: str) -> str: """ @@ -134,8 +132,9 @@ def _get_preferred_id(self, _bl_type: str) -> str: """ return ( - self.extended_schema[_bl_type]['preferred_id'] if 'preferred_id' - in self.extended_schema.get(_bl_type, {}) else 'id' + self.extended_schema[_bl_type]["preferred_id"] + if "preferred_id" in self.extended_schema.get(_bl_type, {}) + else "id" ) def _filter_props(self, bl_type: str, props: dict) -> dict: @@ -143,27 +142,22 @@ def _filter_props(self, bl_type: str, props: dict) -> dict: Filters properties for those specified in schema_config if any. """ - filter_props = self.extended_schema[bl_type].get('properties', {}) + filter_props = self.extended_schema[bl_type].get("properties", {}) # strict mode: add required properties (only if there is a whitelist) if self.strict_mode and filter_props: filter_props.update( - { - 'source': 'str', - 'licence': 'str', - 'version': 'str' - }, + {"source": "str", "licence": "str", "version": "str"}, ) exclude_props = self.extended_schema[bl_type].get( - 'exclude_properties', [] + "exclude_properties", [] ) if isinstance(exclude_props, str): exclude_props = [exclude_props] if filter_props and exclude_props: - filtered_props = { k: v for k, v in props.items() @@ -171,21 +165,16 @@ def _filter_props(self, bl_type: str, props: dict) -> dict: } elif filter_props: - filtered_props = { - k: v - for k, v in props.items() if k in filter_props.keys() + k: v for k, v in props.items() if k in filter_props.keys() } elif exclude_props: - filtered_props = { - k: v - for k, v in props.items() if k not in exclude_props + k: v for k, v in props.items() if k not in exclude_props } else: - return props missing_props = [ @@ -193,7 +182,6 @@ def _filter_props(self, bl_type: str, props: dict) -> dict: ] # add missing properties with default values for k in missing_props: - filtered_props[k] = None return filtered_props @@ -218,7 +206,7 @@ def translate_edges( Can optionally possess its own ID. """ - self._log_begin_translate(id_src_tar_type_prop_tuples, 'edges') + self._log_begin_translate(id_src_tar_type_prop_tuples, "edges") # legacy: deal with 4-tuples (no edge id) # TODO remove for performance reasons once safe @@ -230,18 +218,17 @@ def translate_edges( ] for _id, _src, _tar, _type, _props in id_src_tar_type_prop_tuples: - # check for strict mode requirements if self.strict_mode: - if not 'source' in _props: + if not "source" in _props: raise ValueError( - f'Edge {_id if _id else (_src, _tar)} does not have a `source` property.', - ' This is required in strict mode.', + f"Edge {_id if _id else (_src, _tar)} does not have a `source` property.", + " This is required in strict mode.", ) - if not 'licence' in _props: + if not "licence" in _props: raise ValueError( - f'Edge {_id if _id else (_src, _tar)} does not have a `licence` property.', - ' This is required in strict mode.', + f"Edge {_id if _id else (_src, _tar)} does not have a `licence` property.", + " This is required in strict mode.", ) # match the input label (_type) to @@ -249,14 +236,12 @@ def translate_edges( bl_type = self._get_ontology_mapping(_type) if bl_type: - # filter properties for those specified in schema_config if any _filtered_props = self._filter_props(bl_type, _props) - rep = self.extended_schema[bl_type]['represented_as'] - - if rep == 'node': + rep = self.extended_schema[bl_type]["represented_as"] + if rep == "node": if _id: # if it brings its own ID, use it node_id = _id @@ -264,8 +249,11 @@ def translate_edges( else: # source target concat node_id = ( - str(_src) + '_' + str(_tar) + '_' + - '_'.join(str(v) for v in _filtered_props.values()) + str(_src) + + "_" + + str(_tar) + + "_" + + "_".join(str(v) for v in _filtered_props.values()) ) n = BioCypherNode( @@ -277,21 +265,18 @@ def translate_edges( # directionality check TODO generalise to account for # different descriptions of directionality or find a # more consistent solution for indicating directionality - if _filtered_props.get('directed') == True: - - l1 = 'IS_SOURCE_OF' - l2 = 'IS_TARGET_OF' + if _filtered_props.get("directed") == True: + l1 = "IS_SOURCE_OF" + l2 = "IS_TARGET_OF" elif _filtered_props.get( - 'src_role', - ) and _filtered_props.get('tar_role'): - - l1 = _filtered_props.get('src_role') - l2 = _filtered_props.get('tar_role') + "src_role", + ) and _filtered_props.get("tar_role"): + l1 = _filtered_props.get("src_role") + l2 = _filtered_props.get("tar_role") else: - - l1 = l2 = 'IS_PART_OF' + l1 = l2 = "IS_PART_OF" e_s = BioCypherEdge( source_id=_src, @@ -310,13 +295,11 @@ def translate_edges( yield BioCypherRelAsNode(n, e_s, e_t) else: - edge_label = self.extended_schema[bl_type].get( - 'label_as_edge' + "label_as_edge" ) if edge_label is None: - edge_label = bl_type yield BioCypherEdge( @@ -328,10 +311,9 @@ def translate_edges( ) else: - self._record_no_type(_type, (_src, _tar)) - self._log_finish_translate('edges') + self._log_finish_translate("edges") def _record_no_type(self, _type: Any, what: Any) -> None: """ @@ -339,14 +321,12 @@ def _record_no_type(self, _type: Any, what: Any) -> None: schema_config. """ - logger.debug(f'No Biolink type defined for `{_type}`: {what}') + logger.debug(f"No Biolink type defined for `{_type}`: {what}") if self.notype.get(_type, None): - self.notype[_type] += 1 else: - self.notype[_type] = 1 def get_missing_biolink_types(self) -> dict: @@ -359,15 +339,13 @@ def get_missing_biolink_types(self) -> dict: @staticmethod def _log_begin_translate(_input: Iterable, what: str): + n = f"{len(_input)} " if hasattr(_input, "__len__") else "" - n = f'{len(_input)} ' if hasattr(_input, '__len__') else '' - - logger.debug(f'Translating {n}{what} to BioCypher') + logger.debug(f"Translating {n}{what} to BioCypher") @staticmethod def _log_finish_translate(what: str): - - logger.debug(f'Finished translating {what} to BioCypher.') + logger.debug(f"Finished translating {what} to BioCypher.") def _update_ontology_types(self): """ @@ -379,24 +357,19 @@ def _update_ontology_types(self): self._ontology_mapping = {} for key, value in self.extended_schema.items(): - - labels = value.get('input_label') or value.get('label_in_input') + labels = value.get("input_label") or value.get("label_in_input") if isinstance(labels, str): - self._ontology_mapping[labels] = key elif isinstance(labels, list): - for label in labels: self._ontology_mapping[label] = key - if value.get('label_as_edge'): - - self._add_translation_mappings(labels, value['label_as_edge']) + if value.get("label_as_edge"): + self._add_translation_mappings(labels, value["label_as_edge"]) else: - self._add_translation_mappings(labels, key) def _get_ontology_mapping(self, label: str) -> Optional[str]: @@ -433,7 +406,7 @@ def translate(self, query): Translate a cypher query. Only translates labels as of now. """ for key in self.mappings: - query = query.replace(':' + key, ':' + self.mappings[key]) + query = query.replace(":" + key, ":" + self.mappings[key]) return query def reverse_translate(self, query): @@ -442,23 +415,22 @@ def reverse_translate(self, query): now. """ for key in self.reverse_mappings: - - a = ':' + key + ')' - b = ':' + key + ']' + a = ":" + key + ")" + b = ":" + key + "]" # TODO this conditional probably does not cover all cases if a in query or b in query: if isinstance(self.reverse_mappings[key], list): raise NotImplementedError( - 'Reverse translation of multiple inputs not ' - 'implemented yet. Many-to-one mappings are ' - 'not reversible. ' - f'({key} -> {self.reverse_mappings[key]})', + "Reverse translation of multiple inputs not " + "implemented yet. Many-to-one mappings are " + "not reversible. " + f"({key} -> {self.reverse_mappings[key]})", ) else: query = query.replace( a, - ':' + self.reverse_mappings[key] + ')', - ).replace(b, ':' + self.reverse_mappings[key] + ']') + ":" + self.reverse_mappings[key] + ")", + ).replace(b, ":" + self.reverse_mappings[key] + "]") return query def _add_translation_mappings(self, original_name, biocypher_name): @@ -479,12 +451,17 @@ def _add_translation_mappings(self, original_name, biocypher_name): if isinstance(biocypher_name, list): for bn in biocypher_name: - self.reverse_mappings[self.name_sentence_to_pascal(bn, ) - ] = original_name + self.reverse_mappings[ + self.name_sentence_to_pascal( + bn, + ) + ] = original_name else: - self.reverse_mappings[self.name_sentence_to_pascal( - biocypher_name, - )] = original_name + self.reverse_mappings[ + self.name_sentence_to_pascal( + biocypher_name, + ) + ] = original_name @staticmethod def name_sentence_to_pascal(name: str) -> str: @@ -492,9 +469,9 @@ def name_sentence_to_pascal(name: str) -> str: Converts a name in sentence case to pascal case. """ # split on dots if dot is present - if '.' in name: - return '.'.join( - [_misc.sentencecase_to_pascalcase(n) for n in name.split('.')], + if "." in name: + return ".".join( + [_misc.sentencecase_to_pascalcase(n) for n in name.split(".")], ) else: return _misc.sentencecase_to_pascalcase(name) diff --git a/biocypher/_write.py b/biocypher/_write.py index efbd60fb..233b69f9 100644 --- a/biocypher/_write.py +++ b/biocypher/_write.py @@ -17,7 +17,7 @@ from ._logger import logger -logger.debug(f'Loading module {__name__}.') +logger.debug(f"Loading module {__name__}.") from abc import ABC, abstractmethod from types import GeneratorType @@ -31,10 +31,9 @@ from ._config import config as _config from ._create import BioCypherEdge, BioCypherNode, BioCypherRelAsNode -__all__ = ['get_writer'] +__all__ = ["get_writer"] if TYPE_CHECKING: - from ._ontology import Ontology from ._translate import Translator from ._deduplicate import Deduplicator @@ -92,7 +91,7 @@ class _BatchWriter(ABC): Path prefix for the admin import call binary. import_call_file_prefix: - Path prefix for the data files (headers and parts) in the import + Path prefix for the data files (headers and parts) in the import call. wipe: @@ -108,6 +107,7 @@ class _BatchWriter(ABC): skip_duplicate_nodes: Whether to skip duplicate nodes. (Specific to Neo4j.) """ + @abstractmethod def _get_default_import_call_bin_prefix(self): """ @@ -193,14 +193,14 @@ def _get_import_script_name(self) -> str: def __init__( self, - ontology: 'Ontology', - translator: 'Translator', - deduplicator: 'Deduplicator', + ontology: "Ontology", + translator: "Translator", + deduplicator: "Deduplicator", delimiter: str, - array_delimiter: str = ',', + array_delimiter: str = ",", quote: str = '"', output_directory: Optional[str] = None, - db_name: str = 'neo4j', + db_name: str = "neo4j", import_call_bin_prefix: Optional[str] = None, import_call_file_prefix: Optional[str] = None, wipe: bool = True, @@ -209,7 +209,7 @@ def __init__( skip_duplicate_nodes: bool = False, db_user: str = None, db_password: str = None, - db_port: str = None + db_port: str = None, ): self.db_name = db_name self.db_user = db_user @@ -225,7 +225,8 @@ def __init__( self.skip_duplicate_nodes = skip_duplicate_nodes if import_call_bin_prefix is None: - self.import_call_bin_prefix = self._get_default_import_call_bin_prefix( + self.import_call_bin_prefix = ( + self._get_default_import_call_bin_prefix() ) else: self.import_call_bin_prefix = import_call_bin_prefix @@ -248,11 +249,11 @@ def __init__( if os.path.exists(self.outdir): logger.warning( - f'Output directory `{self.outdir}` already exists. ' - 'If this is not planned, file consistency may be compromised.' + f"Output directory `{self.outdir}` already exists. " + "If this is not planned, file consistency may be compromised." ) else: - logger.info(f'Creating output directory `{self.outdir}`.') + logger.info(f"Creating output directory `{self.outdir}`.") os.makedirs(self.outdir) self.parts = {} # dict to store the paths of part files for each label @@ -268,7 +269,6 @@ def outdir(self): return self._outdir - @property def import_call_file_prefix(self): """ @@ -286,12 +286,10 @@ def _process_delimiter(self, delimiter: str) -> str: representation (e.g. tab for '\t'). """ - if delimiter == '\\t': - - return '\t', '\\t' + if delimiter == "\\t": + return "\t", "\\t" else: - return delimiter, delimiter def write_nodes(self, nodes, batch_size: int = int(1e6)): @@ -310,12 +308,12 @@ def write_nodes(self, nodes, batch_size: int = int(1e6)): # write node data passed = self._write_node_data(nodes, batch_size) if not passed: - logger.error('Error while writing node data.') + logger.error("Error while writing node data.") return False # pass property data to header writer per node type written passed = self._write_node_headers() if not passed: - logger.error('Error while writing node headers.') + logger.error("Error while writing node headers.") return False return True @@ -348,7 +346,9 @@ def write_edges( e.get_source_edge(), e.get_target_edge(), ], - ) if isinstance(e, BioCypherRelAsNode) else (None, [e]) + ) + if isinstance(e, BioCypherRelAsNode) + else (None, [e]) for e in edges ) ) @@ -368,17 +368,17 @@ def write_edges( # is this a problem? if the generator or list is empty, we # don't write anything. logger.debug( - 'No edges to write, possibly due to no matched Biolink classes.', + "No edges to write, possibly due to no matched Biolink classes.", ) pass if not passed: - logger.error('Error while writing edge data.') + logger.error("Error while writing edge data.") return False # pass property data to header writer per edge type written passed = self._write_edge_headers() if not passed: - logger.error('Error while writing edge headers.') + logger.error("Error while writing edge headers.") return False return True @@ -401,7 +401,7 @@ def _write_node_data(self, nodes, batch_size): """ if isinstance(nodes, GeneratorType) or isinstance(nodes, peekable): - logger.debug('Writing node CSV from generator.') + logger.debug("Writing node CSV from generator.") bins = defaultdict(list) # dict to store a list for each # label that is passed in @@ -424,7 +424,7 @@ def _write_node_data(self, nodes, batch_size): # check for non-id if not _id: - logger.warning(f'Node {label} has no id; skipping.') + logger.warning(f"Node {label} has no id; skipping.") continue if not label in bins.keys(): @@ -434,20 +434,22 @@ def _write_node_data(self, nodes, batch_size): bin_l[label] = 1 # get properties from config if present - cprops = self.extended_schema.get(label).get('properties', ) + cprops = self.extended_schema.get(label).get( + "properties", + ) if cprops: d = dict(cprops) # add id and preferred id to properties; these are # created in node creation (`_create.BioCypherNode`) - d['id'] = 'str' - d['preferred_id'] = 'str' + d["id"] = "str" + d["preferred_id"] = "str" # add strict mode properties if self.strict_mode: - d['source'] = 'str' - d['version'] = 'str' - d['licence'] = 'str' + d["source"] = "str" + d["version"] = "str" + d["licence"] = "str" else: d = dict(node.get_properties()) @@ -531,7 +533,7 @@ def _write_node_data(self, nodes, batch_size): return True else: if type(nodes) is not list: - logger.error('Nodes must be passed as list or generator.') + logger.error("Nodes must be passed as list or generator.") return False else: @@ -563,14 +565,13 @@ def _write_single_node_list_to_file( bool: The return value. True for success, False otherwise. """ if not all(isinstance(n, BioCypherNode) for n in node_list): - logger.error('Nodes must be passed as type BioCypherNode.') + logger.error("Nodes must be passed as type BioCypherNode.") return False # from list of nodes to list of strings lines = [] for n in node_list: - # check for deviations in properties # node properties n_props = n.get_properties() @@ -584,46 +585,45 @@ def _write_single_node_list_to_file( oprop1 = set(ref_props).difference(n_keys) oprop2 = set(n_keys).difference(ref_props) logger.error( - f'At least one node of the class {n.get_label()} ' - f'has more or fewer properties than another. ' - f'Offending node: {onode!r}, offending property: ' - f'{max([oprop1, oprop2])}. ' - f'All reference properties: {ref_props}, ' - f'All node properties: {n_keys}.', + f"At least one node of the class {n.get_label()} " + f"has more or fewer properties than another. " + f"Offending node: {onode!r}, offending property: " + f"{max([oprop1, oprop2])}. " + f"All reference properties: {ref_props}, " + f"All node properties: {n_keys}.", ) return False line = [n.get_id()] if ref_props: - plist = [] # make all into strings, put actual strings in quotes for k, v in prop_dict.items(): p = n_props.get(k) if p is None: # TODO make field empty instead of ""? - plist.append('') + plist.append("") elif v in [ - 'int', - 'integer', - 'long', - 'float', - 'double', - 'dbl', - 'bool', - 'boolean', + "int", + "integer", + "long", + "float", + "double", + "dbl", + "bool", + "boolean", ]: plist.append(str(p)) else: if isinstance(p, list): plist.append(self._write_array_string(p)) else: - plist.append(f'{self.quote}{str(p)}{self.quote}') + plist.append(f"{self.quote}{str(p)}{self.quote}") line.append(self.delim.join(plist)) line.append(labels) - lines.append(self.delim.join(line) + '\n') + lines.append(self.delim.join(line) + "\n") # avoid writing empty files if lines: @@ -653,7 +653,7 @@ def _write_edge_data(self, edges, batch_size): """ if isinstance(edges, GeneratorType): - logger.debug('Writing edge CSV from generator.') + logger.debug("Writing edge CSV from generator.") bins = defaultdict(list) # dict to store a list for each # label that is passed in @@ -671,8 +671,8 @@ def _write_edge_data(self, edges, batch_size): if not (edge.get_source_id() and edge.get_target_id()): logger.error( - 'Edge must have source and target node. ' - f'Caused by: {edge}', + "Edge must have source and target node. " + f"Caused by: {edge}", ) continue @@ -691,23 +691,23 @@ def _write_edge_data(self, edges, batch_size): cprops = None if label in self.extended_schema: cprops = self.extended_schema.get(label).get( - 'properties', + "properties", ) else: # try via "label_as_edge" for k, v in self.extended_schema.items(): if isinstance(v, dict): - if v.get('label_as_edge') == label: - cprops = v.get('properties') + if v.get("label_as_edge") == label: + cprops = v.get("properties") break if cprops: d = cprops # add strict mode properties if self.strict_mode: - d['source'] = 'str' - d['version'] = 'str' - d['licence'] = 'str' + d["source"] = "str" + d["version"] = "str" + d["licence"] = "str" else: d = dict(edge.get_properties()) @@ -746,7 +746,6 @@ def _write_edge_data(self, edges, batch_size): # after generator depleted, write remainder of bins for label, nl in bins.items(): - passed = self._write_single_edge_list_to_file( nl, label, @@ -768,7 +767,7 @@ def _write_edge_data(self, edges, batch_size): return True else: if type(edges) is not list: - logger.error('Edges must be passed as list or generator.') + logger.error("Edges must be passed as list or generator.") return False else: @@ -800,8 +799,7 @@ def _write_single_edge_list_to_file( """ if not all(isinstance(n, BioCypherEdge) for n in edge_list): - - logger.error('Edges must be passed as type BioCypherEdge.') + logger.error("Edges must be passed as type BioCypherEdge.") return False # from list of edges to list of strings @@ -815,16 +813,16 @@ def _write_single_edge_list_to_file( # compare list order invariant if not set(ref_props) == set(e_keys): - oedge = f'{e.get_source_id()}-{e.get_target_id()}' + oedge = f"{e.get_source_id()}-{e.get_target_id()}" oprop1 = set(ref_props).difference(e_keys) oprop2 = set(e_keys).difference(ref_props) logger.error( - f'At least one edge of the class {e.get_label()} ' - f'has more or fewer properties than another. ' - f'Offending edge: {oedge!r}, offending property: ' - f'{max([oprop1, oprop2])}. ' - f'All reference properties: {ref_props}, ' - f'All edge properties: {e_keys}.', + f"At least one edge of the class {e.get_label()} " + f"has more or fewer properties than another. " + f"Offending edge: {oedge!r}, offending property: " + f"{max([oprop1, oprop2])}. " + f"All reference properties: {ref_props}, " + f"All edge properties: {e_keys}.", ) return False @@ -833,16 +831,16 @@ def _write_single_edge_list_to_file( for k, v in prop_dict.items(): p = e_props.get(k) if p is None: # TODO make field empty instead of ""? - plist.append('') + plist.append("") elif v in [ - 'int', - 'integer', - 'long', - 'float', - 'double', - 'dbl', - 'bool', - 'boolean', + "int", + "integer", + "long", + "float", + "double", + "dbl", + "bool", + "boolean", ]: plist.append(str(p)) else: @@ -850,7 +848,7 @@ def _write_single_edge_list_to_file( plist.append(self._write_array_string(p)) else: plist.append(self.quote + str(p) + self.quote) - + entries = [e.get_source_id()] skip_id = False @@ -861,29 +859,34 @@ def _write_single_edge_list_to_file( elif not self.extended_schema.get(label): # find label in schema by label_as_edge for k, v in self.extended_schema.items(): - if v.get('label_as_edge') == label: + if v.get("label_as_edge") == label: schema_label = k break else: schema_label = label if schema_label: - if self.extended_schema.get(schema_label).get('use_id') == False: + if ( + self.extended_schema.get(schema_label).get("use_id") + == False + ): skip_id = True if not skip_id: - entries.append(e.get_id() or '') + entries.append(e.get_id() or "") if ref_props: entries.append(self.delim.join(plist)) entries.append(e.get_target_id()) - entries.append(self.translator.name_sentence_to_pascal( - e.get_label(), - )) + entries.append( + self.translator.name_sentence_to_pascal( + e.get_label(), + ) + ) lines.append( - self.delim.join(entries) + '\n', + self.delim.join(entries) + "\n", ) # avoid writing empty files @@ -911,39 +914,34 @@ def _write_next_part(self, label: str, lines: list): # list files in self.outdir files = glob.glob( - os.path.join(self.outdir, f'{label_pascal}-part*.csv') + os.path.join(self.outdir, f"{label_pascal}-part*.csv") ) # find file with highest part number if not files: - next_part = 0 else: - next_part = ( max( [ - int( - f.split('.')[-2].split('-')[-1].replace('part', '') - ) for f in files + int(f.split(".")[-2].split("-")[-1].replace("part", "")) + for f in files ], - ) + 1 + ) + + 1 ) # write to file padded_part = str(next_part).zfill(3) logger.info( - f'Writing {len(lines)} entries to {label_pascal}-part{padded_part}.csv', + f"Writing {len(lines)} entries to {label_pascal}-part{padded_part}.csv", ) # store name only in case import_call_file_prefix is set - part = f'{label_pascal}-part{padded_part}.csv' - file_path = os.path.join( - self.outdir, part - ) - - with open(file_path, 'w', encoding='utf-8') as f: + part = f"{label_pascal}-part{padded_part}.csv" + file_path = os.path.join(self.outdir, part) + with open(file_path, "w", encoding="utf-8") as f: # concatenate with delimiter f.writelines(lines) @@ -975,10 +973,9 @@ def write_import_call(self) -> bool: """ file_path = os.path.join(self.outdir, self._get_import_script_name()) - logger.info(f'Writing {self.db_name} import call to `{file_path}`.') - - with open(file_path, 'w', encoding='utf-8') as f: + logger.info(f"Writing {self.db_name} import call to `{file_path}`.") + with open(file_path, "w", encoding="utf-8") as f: f.write(self._construct_import_call()) return True @@ -1000,6 +997,7 @@ class _Neo4jBatchWriter(_BatchWriter): - _construct_import_call - _write_array_string """ + def _get_default_import_call_bin_prefix(self): """ Method to provide the default string for the import call bin prefix. @@ -1007,7 +1005,7 @@ def _get_default_import_call_bin_prefix(self): Returns: str: The default location for the neo4j admin import location """ - return 'bin/' + return "bin/" def _write_array_string(self, string_list): """ @@ -1021,7 +1019,7 @@ def _write_array_string(self, string_list): str: The string representation of an array for the neo4j admin import """ string = self.adelim.join(string_list) - return f'{self.quote}{string}{self.quote}' + return f"{self.quote}{string}{self.quote}" def _write_node_headers(self): """ @@ -1035,56 +1033,55 @@ def _write_node_headers(self): # load headers from data parse if not self.node_property_dict: logger.error( - 'Header information not found. Was the data parsed first?', + "Header information not found. Was the data parsed first?", ) return False for label, props in self.node_property_dict.items(): - - _id = ':ID' + _id = ":ID" # translate label to PascalCase pascal_label = self.translator.name_sentence_to_pascal(label) - header = f'{pascal_label}-header.csv' + header = f"{pascal_label}-header.csv" header_path = os.path.join( self.outdir, header, ) - parts = f'{pascal_label}-part.*' + parts = f"{pascal_label}-part.*" # check if file already exists if os.path.exists(header_path): logger.warning( - f'Header file `{header_path}` already exists. Overwriting.', + f"Header file `{header_path}` already exists. Overwriting.", ) # concatenate key:value in props props_list = [] for k, v in props.items(): - if v in ['int', 'long', 'integer']: - props_list.append(f'{k}:long') - elif v in ['int[]', 'long[]', 'integer[]']: - props_list.append(f'{k}:long[]') - elif v in ['float', 'double', 'dbl']: - props_list.append(f'{k}:double') - elif v in ['float[]', 'double[]']: - props_list.append(f'{k}:double[]') - elif v in ['bool', 'boolean']: + if v in ["int", "long", "integer"]: + props_list.append(f"{k}:long") + elif v in ["int[]", "long[]", "integer[]"]: + props_list.append(f"{k}:long[]") + elif v in ["float", "double", "dbl"]: + props_list.append(f"{k}:double") + elif v in ["float[]", "double[]"]: + props_list.append(f"{k}:double[]") + elif v in ["bool", "boolean"]: # TODO Neo4j boolean support / spelling? - props_list.append(f'{k}:boolean') - elif v in ['bool[]', 'boolean[]']: - props_list.append(f'{k}:boolean[]') - elif v in ['str[]', 'string[]']: - props_list.append(f'{k}:string[]') + props_list.append(f"{k}:boolean") + elif v in ["bool[]", "boolean[]"]: + props_list.append(f"{k}:boolean[]") + elif v in ["str[]", "string[]"]: + props_list.append(f"{k}:string[]") else: - props_list.append(f'{k}') + props_list.append(f"{k}") # create list of lists and flatten - out_list = [[_id], props_list, [':LABEL']] + out_list = [[_id], props_list, [":LABEL"]] out_list = [val for sublist in out_list for val in sublist] - with open(header_path, 'w', encoding='utf-8') as f: + with open(header_path, "w", encoding="utf-8") as f: # concatenate with delimiter row = self.delim.join(out_list) f.write(row) @@ -1099,7 +1096,9 @@ def _write_node_headers(self): self.import_call_file_prefix, parts, ) - self.import_call_nodes.add((import_call_header_path, import_call_parts_path)) + self.import_call_nodes.add( + (import_call_header_path, import_call_parts_path) + ) return True @@ -1115,51 +1114,50 @@ def _write_edge_headers(self): # load headers from data parse if not self.edge_property_dict: logger.error( - 'Header information not found. Was the data parsed first?', + "Header information not found. Was the data parsed first?", ) return False for label, props in self.edge_property_dict.items(): - # translate label to PascalCase pascal_label = self.translator.name_sentence_to_pascal(label) # paths - header = f'{pascal_label}-header.csv' + header = f"{pascal_label}-header.csv" header_path = os.path.join( self.outdir, header, ) - parts = f'{pascal_label}-part.*' + parts = f"{pascal_label}-part.*" # check for file exists if os.path.exists(header_path): logger.warning( - f'File {header_path} already exists. Overwriting.' + f"File {header_path} already exists. Overwriting." ) # concatenate key:value in props props_list = [] for k, v in props.items(): - if v in ['int', 'long', 'integer']: - props_list.append(f'{k}:long') - elif v in ['int[]', 'long[]', 'integer[]']: - props_list.append(f'{k}:long[]') - elif v in ['float', 'double']: - props_list.append(f'{k}:double') - elif v in ['float[]', 'double[]']: - props_list.append(f'{k}:double[]') + if v in ["int", "long", "integer"]: + props_list.append(f"{k}:long") + elif v in ["int[]", "long[]", "integer[]"]: + props_list.append(f"{k}:long[]") + elif v in ["float", "double"]: + props_list.append(f"{k}:double") + elif v in ["float[]", "double[]"]: + props_list.append(f"{k}:double[]") elif v in [ - 'bool', - 'boolean', + "bool", + "boolean", ]: # TODO does Neo4j support bool? - props_list.append(f'{k}:boolean') - elif v in ['bool[]', 'boolean[]']: - props_list.append(f'{k}:boolean[]') - elif v in ['str[]', 'string[]']: - props_list.append(f'{k}:string[]') + props_list.append(f"{k}:boolean") + elif v in ["bool[]", "boolean[]"]: + props_list.append(f"{k}:boolean[]") + elif v in ["str[]", "string[]"]: + props_list.append(f"{k}:string[]") else: - props_list.append(f'{k}') + props_list.append(f"{k}") skip_id = False schema_label = None @@ -1169,25 +1167,28 @@ def _write_edge_headers(self): elif not self.extended_schema.get(label): # find label in schema by label_as_edge for k, v in self.extended_schema.items(): - if v.get('label_as_edge') == label: + if v.get("label_as_edge") == label: schema_label = k break else: schema_label = label - out_list = [':START_ID'] + out_list = [":START_ID"] if schema_label: - if self.extended_schema.get(schema_label).get('use_id') == False: + if ( + self.extended_schema.get(schema_label).get("use_id") + == False + ): skip_id = True if not skip_id: - out_list.append('id') + out_list.append("id") out_list.extend(props_list) - out_list.extend([':END_ID', ':TYPE']) + out_list.extend([":END_ID", ":TYPE"]) - with open(header_path, 'w', encoding='utf-8') as f: + with open(header_path, "w", encoding="utf-8") as f: # concatenate with delimiter row = self.delim.join(out_list) f.write(row) @@ -1202,7 +1203,9 @@ def _write_edge_headers(self): self.import_call_file_prefix, parts, ) - self.import_call_edges.add((import_call_header_path, import_call_parts_path)) + self.import_call_edges.add( + (import_call_header_path, import_call_parts_path) + ) return True @@ -1213,7 +1216,7 @@ def _get_import_script_name(self) -> str: Returns: str: The name of the import script (ending in .sh) """ - return 'neo4j-admin-import-call.sh' + return "neo4j-admin-import-call.sh" def _construct_import_call(self) -> str: """ @@ -1226,8 +1229,8 @@ def _construct_import_call(self) -> str: str: a bash command for neo4j-admin import """ import_call = ( - f'{self.import_call_bin_prefix}neo4j-admin import ' - f'--database={self.db_name} ' + f"{self.import_call_bin_prefix}neo4j-admin import " + f"--database={self.db_name} " f'--delimiter="{self.escaped_delim}" ' f'--array-delimiter="{self.escaped_adelim}" ' ) @@ -1238,11 +1241,11 @@ def _construct_import_call(self) -> str: import_call += f"--quote='{self.quote}' " if self.wipe: - import_call += f'--force=true ' + import_call += f"--force=true " if self.skip_bad_relationships: - import_call += '--skip-bad-relationships=true ' + import_call += "--skip-bad-relationships=true " if self.skip_duplicate_nodes: - import_call += '--skip-duplicate-nodes=true ' + import_call += "--skip-duplicate-nodes=true " # append node import calls for header_path, parts_path in self.import_call_nodes: @@ -1261,6 +1264,7 @@ class _ArangoDBBatchWriter(_Neo4jBatchWriter): specified by ArangoDB for the use of "arangoimport". Output files are similar to Neo4j, but with a different header format. """ + def _get_default_import_call_bin_prefix(self): """ Method to provide the default string for the import call bin prefix. @@ -1268,7 +1272,7 @@ def _get_default_import_call_bin_prefix(self): Returns: str: The default location for the neo4j admin import location """ - return '' + return "" def _get_import_script_name(self) -> str: """ @@ -1277,7 +1281,7 @@ def _get_import_script_name(self) -> str: Returns: str: The name of the import script (ending in .sh) """ - return 'arangodb-import-call.sh' + return "arangodb-import-call.sh" def _write_node_headers(self): """ @@ -1291,19 +1295,19 @@ def _write_node_headers(self): # load headers from data parse if not self.node_property_dict: logger.error( - 'Header information not found. Was the data parsed first?', + "Header information not found. Was the data parsed first?", ) return False for label, props in self.node_property_dict.items(): # create header CSV with ID, properties, labels - _id = '_key' + _id = "_key" # translate label to PascalCase pascal_label = self.translator.name_sentence_to_pascal(label) - header = f'{pascal_label}-header.csv' + header = f"{pascal_label}-header.csv" header_path = os.path.join( self.outdir, header, @@ -1312,28 +1316,27 @@ def _write_node_headers(self): # check if file already exists if os.path.exists(header_path): logger.warning( - f'File {header_path} already exists. Overwriting.' + f"File {header_path} already exists. Overwriting." ) # concatenate key:value in props props_list = [] for k in props.keys(): - - props_list.append(f'{k}') + props_list.append(f"{k}") # create list of lists and flatten # removes need for empty check of property list out_list = [[_id], props_list] out_list = [val for sublist in out_list for val in sublist] - with open(header_path, 'w', encoding='utf-8') as f: + with open(header_path, "w", encoding="utf-8") as f: # concatenate with delimiter row = self.delim.join(out_list) f.write(row) # add collection from schema config collection = self.extended_schema[label].get( - 'db_collection_name', None + "db_collection_name", None ) # add file path to neo4 admin import statement @@ -1341,14 +1344,12 @@ def _write_node_headers(self): parts = self.parts.get(label, []) if not parts: - raise ValueError( - f'No parts found for node label {label}. ' - f'Check that the data was parsed first.', + f"No parts found for node label {label}. " + f"Check that the data was parsed first.", ) for part in parts: - import_call_header_path = os.path.join( self.import_call_file_prefix, header, @@ -1358,7 +1359,13 @@ def _write_node_headers(self): part, ) - self.import_call_nodes.add((import_call_header_path, import_call_parts_path, collection)) + self.import_call_nodes.add( + ( + import_call_header_path, + import_call_parts_path, + collection, + ) + ) return True @@ -1374,54 +1381,50 @@ def _write_edge_headers(self): # load headers from data parse if not self.edge_property_dict: logger.error( - 'Header information not found. Was the data parsed first?', + "Header information not found. Was the data parsed first?", ) return False for label, props in self.edge_property_dict.items(): - # translate label to PascalCase pascal_label = self.translator.name_sentence_to_pascal(label) # paths - header = f'{pascal_label}-header.csv' + header = f"{pascal_label}-header.csv" header_path = os.path.join( self.outdir, header, ) - parts = f'{pascal_label}-part.*' + parts = f"{pascal_label}-part.*" # check for file exists if os.path.exists(header_path): logger.warning( - f'Header file {header_path} already exists. Overwriting.' + f"Header file {header_path} already exists. Overwriting." ) # concatenate key:value in props props_list = [] for k in props.keys(): + props_list.append(f"{k}") - props_list.append(f'{k}') + out_list = ["_from", "_key", *props_list, "_to"] - out_list = ['_from', '_key', *props_list, '_to'] - - with open(header_path, 'w', encoding='utf-8') as f: + with open(header_path, "w", encoding="utf-8") as f: # concatenate with delimiter row = self.delim.join(out_list) f.write(row) # add collection from schema config if not self.extended_schema.get(label): - for _, v in self.extended_schema.items(): - if v.get('label_as_edge') == label: - collection = v.get('db_collection_name', None) + if v.get("label_as_edge") == label: + collection = v.get("db_collection_name", None) break else: - collection = self.extended_schema[label].get( - 'db_collection_name', None + "db_collection_name", None ) # add file path to neo4 admin import statement (import call path @@ -1434,7 +1437,13 @@ def _write_edge_headers(self): self.import_call_file_prefix, parts, ) - self.import_call_edges.add((header_import_call_path, parts_import_call_path, collection,)) + self.import_call_edges.add( + ( + header_import_call_path, + parts_import_call_path, + collection, + ) + ) return True @@ -1449,8 +1458,8 @@ def _construct_import_call(self) -> str: str: a bash command for neo4j-admin import """ import_call = ( - f'{self.import_call_bin_prefix}arangoimp ' - f'--type csv ' + f"{self.import_call_bin_prefix}arangoimp " + f"--type csv " f'--separator="{self.escaped_delim}" ' ) @@ -1459,23 +1468,22 @@ def _construct_import_call(self) -> str: else: import_call += f"--quote='{self.quote}' " - node_lines = '' + node_lines = "" # node import calls: one line per node type for header_path, parts_path, collection in self.import_call_nodes: - line = ( - f'{import_call} ' - f'--headers-file {header_path} ' - f'--file= {parts_path} ' + f"{import_call} " + f"--headers-file {header_path} " + f"--file= {parts_path} " ) if collection: - line += f'--create-collection --collection {collection} ' + line += f"--create-collection --collection {collection} " - node_lines += f'{line}\n' + node_lines += f"{line}\n" - edge_lines = '' + edge_lines = "" # edge import calls: one line per edge type for header_path, parts_path, collection in self.import_call_edges: @@ -1502,15 +1510,15 @@ class _PostgreSQLBatchWriter(_BatchWriter): """ DATA_TYPE_LOOKUP = { - 'str': 'VARCHAR', # VARCHAR needs limit - 'int': 'INTEGER', - 'long': 'BIGINT', - 'float': 'NUMERIC', - 'double': 'NUMERIC', - 'dbl': 'NUMERIC', - 'boolean': 'BOOLEAN', - 'str[]': 'VARCHAR[]', - 'string[]': 'VARCHAR[]' + "str": "VARCHAR", # VARCHAR needs limit + "int": "INTEGER", + "long": "BIGINT", + "float": "NUMERIC", + "double": "NUMERIC", + "dbl": "NUMERIC", + "boolean": "BOOLEAN", + "str[]": "VARCHAR[]", + "string[]": "VARCHAR[]", } def __init__(self, *args, **kwargs): @@ -1524,7 +1532,7 @@ def _get_default_import_call_bin_prefix(self): Returns: str: The default location for the psql command """ - return '' + return "" def _get_data_type(self, string) -> str: try: @@ -1533,7 +1541,7 @@ def _get_data_type(self, string) -> str: logger.info( 'Could not determine data type {string}. Using default "VARCHAR"' ) - return 'VARCHAR' + return "VARCHAR" def _write_array_string(self, string_list) -> str: """ @@ -1546,7 +1554,7 @@ def _write_array_string(self, string_list) -> str: Returns: str: The string representation of an array for postgres COPY """ - string = ','.join(string_list) + string = ",".join(string_list) string = f'"{{{string}}}"' return string @@ -1557,10 +1565,10 @@ def _get_import_script_name(self) -> str: Returns: str: The name of the import script (ending in .sh) """ - return f'{self.db_name}-import-call.sh' + return f"{self.db_name}-import-call.sh" def _adjust_pascal_to_psql(self, string): - string = string.replace('.', '_') + string = string.replace(".", "_") string = string.lower() return string @@ -1576,7 +1584,7 @@ def _write_node_headers(self): # load headers from data parse if not self.node_property_dict: logger.error( - 'Header information not found. Was the data parsed first?', + "Header information not found. Was the data parsed first?", ) return False @@ -1586,7 +1594,7 @@ def _write_node_headers(self): # translate label to PascalCase pascal_label = self.translator.name_sentence_to_pascal(label) - parts = f'{pascal_label}-part*.csv' + parts = f"{pascal_label}-part*.csv" parts_paths = os.path.join(self.outdir, parts) parts_paths = glob.glob(parts_paths) parts_paths.sort() @@ -1595,36 +1603,36 @@ def _write_node_headers(self): pascal_label = self._adjust_pascal_to_psql(pascal_label) table_create_command_path = os.path.join( self.outdir, - f'{pascal_label}-create_table.sql', + f"{pascal_label}-create_table.sql", ) # check if file already exists if os.path.exists(table_create_command_path): logger.warning( - f'File {table_create_command_path} already exists. Overwriting.', + f"File {table_create_command_path} already exists. Overwriting.", ) # concatenate key:value in props - columns = ['_ID VARCHAR'] + columns = ["_ID VARCHAR"] for col_name, col_type in props.items(): col_type = self._get_data_type(col_type) col_name = self._adjust_pascal_to_psql(col_name) - columns.append(f'{col_name} {col_type}') - columns.append('_LABEL VARCHAR[]') + columns.append(f"{col_name} {col_type}") + columns.append("_LABEL VARCHAR[]") - with open(table_create_command_path, 'w', encoding='utf-8') as f: - - command = '' + with open(table_create_command_path, "w", encoding="utf-8") as f: + command = "" if self.wipe: - command += f'DROP TABLE IF EXISTS {pascal_label};\n' + command += f"DROP TABLE IF EXISTS {pascal_label};\n" # table creation requires comma separation - command += f'CREATE TABLE {pascal_label}({",".join(columns)});\n' + command += ( + f'CREATE TABLE {pascal_label}({",".join(columns)});\n' + ) f.write(command) for parts_path in parts_paths: - - # if import_call_file_prefix is set, replace actual path + # if import_call_file_prefix is set, replace actual path # with prefix if self.import_call_file_prefix != self.outdir: parts_path = parts_path.replace( @@ -1633,7 +1641,7 @@ def _write_node_headers(self): ) self._copy_from_csv_commands.add( - f'\\copy {pascal_label} FROM \'{parts_path}\' DELIMITER E\'{self.delim}\' CSV;' + f"\\copy {pascal_label} FROM '{parts_path}' DELIMITER E'{self.delim}' CSV;" ) # add file path to import statement @@ -1661,16 +1669,15 @@ def _write_edge_headers(self): # load headers from data parse if not self.edge_property_dict: logger.error( - 'Header information not found. Was the data parsed first?', + "Header information not found. Was the data parsed first?", ) return False for label, props in self.edge_property_dict.items(): - # translate label to PascalCase pascal_label = self.translator.name_sentence_to_pascal(label) - parts_paths = os.path.join(self.outdir, f'{pascal_label}-part*.csv') + parts_paths = os.path.join(self.outdir, f"{pascal_label}-part*.csv") parts_paths = glob.glob(parts_paths) parts_paths.sort() @@ -1678,13 +1685,13 @@ def _write_edge_headers(self): pascal_label = self._adjust_pascal_to_psql(pascal_label) table_create_command_path = os.path.join( self.outdir, - f'{pascal_label}-create_table.sql', + f"{pascal_label}-create_table.sql", ) # check for file exists if os.path.exists(table_create_command_path): logger.warning( - f'File {table_create_command_path} already exists. Overwriting.', + f"File {table_create_command_path} already exists. Overwriting.", ) # concatenate key:value in props @@ -1692,7 +1699,7 @@ def _write_edge_headers(self): for col_name, col_type in props.items(): col_type = self._get_data_type(col_type) col_name = self._adjust_pascal_to_psql(col_name) - if col_name == '_ID': + if col_name == "_ID": # should ideally never happen raise ValueError( "Column name '_ID' is reserved for internal use, " @@ -1700,26 +1707,30 @@ def _write_edge_headers(self): "different name for your column." ) - columns.append(f'{col_name} {col_type}') + columns.append(f"{col_name} {col_type}") # create list of lists and flatten # removes need for empty check of property list out_list = [ - '_START_ID VARCHAR', '_ID VARCHAR', *columns, '_END_ID VARCHAR', - '_TYPE VARCHAR' + "_START_ID VARCHAR", + "_ID VARCHAR", + *columns, + "_END_ID VARCHAR", + "_TYPE VARCHAR", ] - with open(table_create_command_path, 'w', encoding='utf-8') as f: - command = '' + with open(table_create_command_path, "w", encoding="utf-8") as f: + command = "" if self.wipe: - command += f'DROP TABLE IF EXISTS {pascal_label};\n' + command += f"DROP TABLE IF EXISTS {pascal_label};\n" # table creation requires comma separation - command += f'CREATE TABLE {pascal_label}({",".join(out_list)});\n' + command += ( + f'CREATE TABLE {pascal_label}({",".join(out_list)});\n' + ) f.write(command) for parts_path in parts_paths: - # if import_call_file_prefix is set, replace actual path # with prefix if self.import_call_file_prefix != self.outdir: @@ -1729,7 +1740,7 @@ def _write_edge_headers(self): ) self._copy_from_csv_commands.add( - f'\\copy {pascal_label} FROM \'{parts_path}\' DELIMITER E\'{self.delim}\' CSV;' + f"\\copy {pascal_label} FROM '{parts_path}' DELIMITER E'{self.delim}' CSV;" ) # add file path to import statement @@ -1740,7 +1751,7 @@ def _write_edge_headers(self): self.outdir, self.import_call_file_prefix, ) - + self.import_call_edges.add(table_create_command_path) return True @@ -1755,59 +1766,62 @@ def _construct_import_call(self) -> str: Returns: str: a bash command for postgresql import """ - import_call = '' + import_call = "" # create tables # At this point, csv files of nodes and edges do not require differentiation for import_file_path in [ - *self.import_call_nodes, *self.import_call_edges + *self.import_call_nodes, + *self.import_call_edges, ]: import_call += f'echo "Setup {import_file_path}..."\n' if {self.db_password}: # set password variable inline - import_call += f'PGPASSWORD={self.db_password} ' - import_call += f'{self.import_call_bin_prefix}psql -f {import_file_path}' - import_call += f' --dbname {self.db_name}' - import_call += f' --port {self.db_port}' - import_call += f' --user {self.db_user}' + import_call += f"PGPASSWORD={self.db_password} " + import_call += ( + f"{self.import_call_bin_prefix}psql -f {import_file_path}" + ) + import_call += f" --dbname {self.db_name}" + import_call += f" --port {self.db_port}" + import_call += f" --user {self.db_user}" import_call += '\necho "Done!"\n' - import_call += '\n' + import_call += "\n" # copy data to tables for command in self._copy_from_csv_commands: - table_part = command.split(' ')[3] + table_part = command.split(" ")[3] import_call += f'echo "Importing {table_part}..."\n' if {self.db_password}: # set password variable inline - import_call += f'PGPASSWORD={self.db_password} ' + import_call += f"PGPASSWORD={self.db_password} " import_call += f'{self.import_call_bin_prefix}psql -c "{command}"' - import_call += f' --dbname {self.db_name}' - import_call += f' --port {self.db_port}' - import_call += f' --user {self.db_user}' + import_call += f" --dbname {self.db_name}" + import_call += f" --port {self.db_port}" + import_call += f" --user {self.db_user}" import_call += '\necho "Done!"\n' - import_call += '\n' + import_call += "\n" return import_call DBMS_TO_CLASS = { - 'neo': _Neo4jBatchWriter, - 'neo4j': _Neo4jBatchWriter, - 'Neo4j': _Neo4jBatchWriter, - 'postgres': _PostgreSQLBatchWriter, - 'postgresql': _PostgreSQLBatchWriter, - 'PostgreSQL': _PostgreSQLBatchWriter, - 'arango': _ArangoDBBatchWriter, - 'arangodb': _ArangoDBBatchWriter, - 'ArangoDB': _ArangoDBBatchWriter, + "neo": _Neo4jBatchWriter, + "neo4j": _Neo4jBatchWriter, + "Neo4j": _Neo4jBatchWriter, + "postgres": _PostgreSQLBatchWriter, + "postgresql": _PostgreSQLBatchWriter, + "PostgreSQL": _PostgreSQLBatchWriter, + "arango": _ArangoDBBatchWriter, + "arangodb": _ArangoDBBatchWriter, + "ArangoDB": _ArangoDBBatchWriter, } def get_writer( dbms: str, - translator: 'Translator', - ontology: 'Ontology', - deduplicator: 'Deduplicator', + translator: "Translator", + ontology: "Ontology", + deduplicator: "Deduplicator", output_directory: str, strict_mode: bool, ): @@ -1835,34 +1849,36 @@ def get_writer( dbms_config = _config(dbms) - timestamp = lambda: datetime.now().strftime('%Y%m%d%H%M%S') - outdir = output_directory or os.path.join('biocypher-out', timestamp()) + timestamp = lambda: datetime.now().strftime("%Y%m%d%H%M%S") + outdir = output_directory or os.path.join("biocypher-out", timestamp()) outdir = os.path.abspath(outdir) writer = DBMS_TO_CLASS[dbms] if not writer: - raise ValueError(f'Unknown dbms: {dbms}') + raise ValueError(f"Unknown dbms: {dbms}") if writer is not None: return writer( ontology=ontology, translator=translator, deduplicator=deduplicator, - delimiter=dbms_config.get('delimiter'), - array_delimiter=dbms_config.get('array_delimiter'), - quote=dbms_config.get('quote_character'), + delimiter=dbms_config.get("delimiter"), + array_delimiter=dbms_config.get("array_delimiter"), + quote=dbms_config.get("quote_character"), output_directory=outdir, - db_name=dbms_config.get('database_name'), - import_call_bin_prefix=dbms_config.get('import_call_bin_prefix'), - import_call_file_prefix=dbms_config.get('import_call_file_prefix'), - wipe=dbms_config.get('wipe'), + db_name=dbms_config.get("database_name"), + import_call_bin_prefix=dbms_config.get("import_call_bin_prefix"), + import_call_file_prefix=dbms_config.get("import_call_file_prefix"), + wipe=dbms_config.get("wipe"), strict_mode=strict_mode, - skip_bad_relationships=dbms_config.get('skip_bad_relationships' - ), # neo4j - skip_duplicate_nodes=dbms_config.get('skip_duplicate_nodes' - ), # neo4j - db_user=dbms_config.get('user'), # psql - db_password=dbms_config.get('password'), # psql - db_port=dbms_config.get('port'), # psql + skip_bad_relationships=dbms_config.get( + "skip_bad_relationships" + ), # neo4j + skip_duplicate_nodes=dbms_config.get( + "skip_duplicate_nodes" + ), # neo4j + db_user=dbms_config.get("user"), # psql + db_password=dbms_config.get("password"), # psql + db_port=dbms_config.get("port"), # psql ) diff --git a/docs/adapters.md b/docs/adapters.md index 4cf3c6b9..20feaee7 100644 --- a/docs/adapters.md +++ b/docs/adapters.md @@ -30,7 +30,7 @@ tutorial. :::: The project view is built from issues in the [BioCypher GitHub repository]( -https://github.com/biocypher/biocypher/issues), which carry ``Fields`` (a +https://github.com/biocypher/biocypher/issues), which carry ``Fields`` (a GitHub Projects-specific attribute) to describe their category and features. In detail, these are as follows: @@ -118,4 +118,4 @@ RETURN n ``` For more information on how to use the graph, please refer to the [Neo4j -documentation](https://neo4j.com/docs/). \ No newline at end of file +documentation](https://neo4j.com/docs/). diff --git a/docs/conf.py b/docs/conf.py index 5c85a849..d51ea793 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -22,61 +22,60 @@ # -- Project information ----------------------------------------------------- -project = 'BioCypher' +project = "BioCypher" version = biocypher.__version__ -author = ', '.join(biocypher.__author__) -copyright = f'2021-{datetime.now():%Y}, BioCypher developers' +author = ", ".join(biocypher.__author__) +copyright = f"2021-{datetime.now():%Y}, BioCypher developers" # -- General configuration --------------------------------------------------- # TOC only in sidebar -master_doc = 'contents' +master_doc = "contents" html_sidebars = { - '**': - [ - 'globaltoc.html', - 'relations.html', - 'sourcelink.html', - 'searchbox.html', - ], + "**": [ + "globaltoc.html", + "relations.html", + "sourcelink.html", + "searchbox.html", + ], } # Add any Sphinx extension module names here, as strings. They can be # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # ones. extensions = [ - 'sphinx.ext.autodoc', - 'sphinx.ext.napoleon', - 'sphinx.ext.todo', # not for output but to remove warnings - 'sphinxext.opengraph', - 'myst_parser', # markdown support - 'sphinx_rtd_theme', - 'sphinx_design', + "sphinx.ext.autodoc", + "sphinx.ext.napoleon", + "sphinx.ext.todo", # not for output but to remove warnings + "sphinxext.opengraph", + "myst_parser", # markdown support + "sphinx_rtd_theme", + "sphinx_design", ] -myst_enable_extensions = ['colon_fence'] +myst_enable_extensions = ["colon_fence"] # Add any paths that contain templates here, relative to this directory. -templates_path = ['_templates'] +templates_path = ["_templates"] # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. # This pattern also affects html_static_path and html_extra_path. -exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store', 'biocypher-log/'] +exclude_patterns = ["_build", "Thumbs.db", ".DS_Store", "biocypher-log/"] # -- Autodoc configuration --------------------------------------------------- -autodoc_mock_imports = ['bmt', 'neo4j-utils'] +autodoc_mock_imports = ["bmt", "neo4j-utils"] # -- Options for HTML output ------------------------------------------------- # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. -html_title = 'BioCypher' -html_theme = 'sphinx_rtd_theme' +html_title = "BioCypher" +html_theme = "sphinx_rtd_theme" html_theme_options = { - 'navigation_depth': 2, - 'collapse_navigation': True, + "navigation_depth": 2, + "collapse_navigation": True, } # Add any paths that contain custom static files (such as style sheets) here, @@ -86,8 +85,8 @@ # -- OpenGraph configuration ------------------------------------------------- -ogp_site_url = 'https://biocypher.org' -ogp_image = 'https://biocypher.org/_images/biocypher-open-graph.png' +ogp_site_url = "https://biocypher.org" +ogp_image = "https://biocypher.org/_images/biocypher-open-graph.png" ogp_custom_meta_tags = [ '', '', @@ -95,4 +94,4 @@ '', '', ] -ogp_enable_meta_description = True \ No newline at end of file +ogp_enable_meta_description = True diff --git a/docs/index.rst b/docs/index.rst index 4ee91a38..2480dd53 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -114,4 +114,4 @@ information. :link: https://github.com/biocypher/biochatter :text-align: center - :octicon:`mark-github;3em` :octicon:`repo;3em` \ No newline at end of file + :octicon:`mark-github;3em` :octicon:`repo;3em` diff --git a/docs/r-bioc.md b/docs/r-bioc.md index 74f4ecd3..383b4559 100644 --- a/docs/r-bioc.md +++ b/docs/r-bioc.md @@ -2,4 +2,4 @@ We are working on a Bioconductor package to make BioCypher functionality available to the R community. The current work in progess is available in [this repository](https://vjcitn.github.io/biocBiocypher/index.html). If you are -interested in contributing or using the package, please get in touch! \ No newline at end of file +interested in contributing or using the package, please get in touch! diff --git a/docs/tutorial-adapter.md b/docs/tutorial-adapter.md index ff8ba903..567b9f04 100644 --- a/docs/tutorial-adapter.md +++ b/docs/tutorial-adapter.md @@ -43,7 +43,7 @@ There are currently two 'flavours' of adapters. The first is simpler and used in workflows that are similar to harmonisation scripts, where the BioCypher interface is instantiated in the same script as the adapter(s). In the second, the BioCypher interface is contained in the adapter class, which makes for a -more complex architecture, but allows for more involved workflows. In +more complex architecture, but allows for more involved workflows. In pseudo-code, the two approaches look like this: ```{code-block} python @@ -109,7 +109,7 @@ Graph](https://github.com/IGVF-DACC/igvf-catalog/tree/main/data) and the [Clinical Knowledge Graph migration](https://github.com/biocypher/clinical-knowledge-graph). -```{note} +```{note} While there are differences in implementation details, both approaches are largely functionally equivalent. At the current time, there is no clear diff --git a/docs/tutorial.md b/docs/tutorial.md index 7effe22f..345e1cd8 100644 --- a/docs/tutorial.md +++ b/docs/tutorial.md @@ -567,4 +567,4 @@ protein protein interaction: represented_as: edge use_id: false # ... -``` \ No newline at end of file +``` diff --git a/docs/user-experiences.md b/docs/user-experiences.md index 5a76d14f..44d5e961 100644 --- a/docs/user-experiences.md +++ b/docs/user-experiences.md @@ -9,7 +9,7 @@ repositories ("storage") and (2) project-specific knowledge graph creation ## A Knowledge Graph for Impact of Genomic Variation on Function (IGVF) -:::{card} Impact of Genomic Variation on Function (IGVF) +:::{card} Impact of Genomic Variation on Function (IGVF) :link: https://www.igvf.org/ The Impact of Genomic Variation on Function (IGVF) project aims to provide a @@ -28,7 +28,7 @@ creating a user-facing API (and eventually UI) that will access this graph. BioCypher, which acts as an intermediary between Biolink and graph databases (we are using ArangoDB) has been instrumental in helping us design the schema and move our project forward. Specifically, it provides a framework we can use to -parse the dozens of data files and formats into a Biolink-inspired schema. +parse the dozens of data files and formats into a Biolink-inspired schema. — Ben Hitz, Director of Genomics Data Resources, Project Manager ENCODE, Stanford University @@ -37,10 +37,10 @@ Stanford University The BioCypher pipeline used to build the knowledge graph uses several adapters for genetics data sources; an overview is available in our -[meta-graph](metagraph) and on the [GitHub Components +[meta-graph](metagraph) and on the [GitHub Components Board](https://github.com/orgs/biocypher/projects/3) (pipelines column). The pipeline boasts a Docker Compose workflow that builds the graph and the API -(using [tRPC](https://trpc.io/)), and is available on +(using [tRPC](https://trpc.io/)), and is available on [GitHub](https://github.com/IGVF-DACC/igvf-catalog). ## Drug Repurposing with CROssBAR @@ -72,7 +72,7 @@ multiple genes/proteins, compounds/drugs, diseases, phenotypes, pathways, or any combination of those, this procedure gets extremely complicated, requiring an average of 64 NoSQL queries to construct one single user-specific KG. The total number of lines of code required for this procedure alone is around 8000. -This task could have been achieved significantly faster and more efficiently +This task could have been achieved significantly faster and more efficiently if we had had BioCypher five years ago. — Tunca Doğan, Department of Computer Engineering and Artificial Intelligence @@ -84,7 +84,7 @@ Institute (EMBL-EBI) Using BioCypher, CROssBAR v2 will be a flexible property graph database comprised of single input adapters for each data source. As above, you can see -its current state in the [meta-graph](metagraph) and on the [GitHub Components +its current state in the [meta-graph](metagraph) and on the [GitHub Components Board](https://github.com/orgs/biocypher/projects/3) (pipelines column). ## Builing a Knowledge Graph for Contextualised Metabolic-Enzymatic Interactions @@ -124,4 +124,4 @@ The BioCypher pipeline used to build the knowledge graph uses several adapters, some of which overlap with the CROssBAR project, which helps synergising maintenance efforts. An overview is available in our [meta-graph](metagraph) and on the [GitHub Components -Board](https://github.com/orgs/biocypher/projects/3) (pipelines column). \ No newline at end of file +Board](https://github.com/orgs/biocypher/projects/3) (pipelines column). diff --git a/test/conftest.py b/test/conftest.py index 0a5abf48..c23a77fb 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -14,8 +14,8 @@ _ArangoDBBatchWriter, _PostgreSQLBatchWriter, ) -from biocypher._pandas import Pandas from biocypher._create import BioCypherEdge, BioCypherNode +from biocypher._pandas import Pandas from biocypher._connect import _Neo4jDriver from biocypher._mapping import OntologyMapping from biocypher._ontology import Ontology, OntologyAdapter @@ -25,29 +25,26 @@ # CLI option parser def pytest_addoption(parser): - options = ( # neo4j - ('database_name', 'The Neo4j database to be used for tests.'), - ('user', 'Tests access Neo4j as this user.'), - ('password', 'Password to access Neo4j.'), - ('uri', 'URI of the Neo4j server.'), - + ("database_name", "The Neo4j database to be used for tests."), + ("user", "Tests access Neo4j as this user."), + ("password", "Password to access Neo4j."), + ("uri", "URI of the Neo4j server."), # postgresl ( - 'database_name_postgresql', - 'The PostgreSQL database to be used for tests. Defaults to "postgresql-biocypher-test-TG2C7GsdNw".' + "database_name_postgresql", + 'The PostgreSQL database to be used for tests. Defaults to "postgresql-biocypher-test-TG2C7GsdNw".', ), - ('user_postgresql', 'Tests access PostgreSQL as this user.'), - ('password_postgresql', 'Password to access PostgreSQL.'), - ('port_postgresql', 'Port of the PostgreSQL server.'), + ("user_postgresql", "Tests access PostgreSQL as this user."), + ("password_postgresql", "Password to access PostgreSQL."), + ("port_postgresql", "Port of the PostgreSQL server."), ) for name, help_ in options: - parser.addoption( - f'--{name}', - action='store', + f"--{name}", + action="store", default=None, help=help_, ) @@ -56,33 +53,33 @@ def pytest_addoption(parser): # temporary output paths def get_random_string(length): letters = string.ascii_lowercase - return ''.join(random.choice(letters) for _ in range(length)) + return "".join(random.choice(letters) for _ in range(length)) # biocypher node generator -@pytest.fixture(scope='function') +@pytest.fixture(scope="function") def _get_nodes(l: int) -> list: nodes = [] for i in range(l): bnp = BioCypherNode( - node_id=f'p{i+1}', - node_label='protein', - preferred_id='uniprot', + node_id=f"p{i+1}", + node_label="protein", + preferred_id="uniprot", properties={ - 'score': 4 / (i + 1), - 'name': 'StringProperty1', - 'taxon': 9606, - 'genes': ['gene1', 'gene2'], + "score": 4 / (i + 1), + "name": "StringProperty1", + "taxon": 9606, + "genes": ["gene1", "gene2"], }, ) nodes.append(bnp) bnm = BioCypherNode( - node_id=f'm{i+1}', - node_label='microRNA', - preferred_id='mirbase', + node_id=f"m{i+1}", + node_label="microRNA", + preferred_id="mirbase", properties={ - 'name': 'StringProperty1', - 'taxon': 9606, + "name": "StringProperty1", + "taxon": 9606, }, ) nodes.append(bnm) @@ -91,31 +88,31 @@ def _get_nodes(l: int) -> list: # biocypher edge generator -@pytest.fixture(scope='function') +@pytest.fixture(scope="function") def _get_edges(l): edges = [] for i in range(l): e1 = BioCypherEdge( - relationship_id=f'prel{i}', - source_id=f'p{i}', - target_id=f'p{i + 1}', - relationship_label='PERTURBED_IN_DISEASE', + relationship_id=f"prel{i}", + source_id=f"p{i}", + target_id=f"p{i + 1}", + relationship_label="PERTURBED_IN_DISEASE", properties={ - 'residue': 'T253', - 'level': 4, + "residue": "T253", + "level": 4, }, # we suppose the verb-form relationship label is created by # translation functionality in translate.py ) edges.append(e1) e2 = BioCypherEdge( - relationship_id=f'mrel{i}', - source_id=f'm{i}', - target_id=f'p{i + 1}', - relationship_label='Is_Mutated_In', + relationship_id=f"mrel{i}", + source_id=f"m{i}", + target_id=f"p{i + 1}", + relationship_label="Is_Mutated_In", properties={ - 'site': '3-UTR', - 'confidence': 1, + "site": "3-UTR", + "confidence": 1, }, # we suppose the verb-form relationship label is created by # translation functionality in translate.py @@ -123,95 +120,95 @@ def _get_edges(l): edges.append(e2) return edges -@pytest.fixture(scope='function') + +@pytest.fixture(scope="function") def deduplicator(): return Deduplicator() -@pytest.fixture(scope='module') + +@pytest.fixture(scope="module") def ontology_mapping(): return OntologyMapping( - config_file='biocypher/_config/test_schema_config.yaml' + config_file="biocypher/_config/test_schema_config.yaml" ) -@pytest.fixture(scope='module') + +@pytest.fixture(scope="module") def extended_ontology_mapping(): return OntologyMapping( - config_file='biocypher/_config/test_schema_config_extended.yaml' + config_file="biocypher/_config/test_schema_config_extended.yaml" ) -@pytest.fixture(scope='module') + +@pytest.fixture(scope="module") def disconnected_mapping(): return OntologyMapping( - config_file='biocypher/_config/test_schema_config_disconnected.yaml' + config_file="biocypher/_config/test_schema_config_disconnected.yaml" ) -@pytest.fixture(scope='module') + +@pytest.fixture(scope="module") def translator(extended_ontology_mapping): return Translator(extended_ontology_mapping) -@pytest.fixture(scope='module') +@pytest.fixture(scope="module") def biolink_adapter(): return OntologyAdapter( - 'https://github.com/biolink/biolink-model/raw/v3.2.1/biolink-model.owl.ttl', - 'entity' + "https://github.com/biolink/biolink-model/raw/v3.2.1/biolink-model.owl.ttl", + "entity", ) -@pytest.fixture(scope='module') +@pytest.fixture(scope="module") def so_adapter(): - return OntologyAdapter('test/so.owl', 'sequence_variant') + return OntologyAdapter("test/so.owl", "sequence_variant") -@pytest.fixture(scope='module') +@pytest.fixture(scope="module") def go_adapter(): - return OntologyAdapter('test/go.owl', 'molecular_function') + return OntologyAdapter("test/go.owl", "molecular_function") -@pytest.fixture(scope='module') +@pytest.fixture(scope="module") def mondo_adapter(): - return OntologyAdapter('test/mondo.owl', 'disease') + return OntologyAdapter("test/mondo.owl", "disease") -@pytest.fixture(scope='module') +@pytest.fixture(scope="module") def hybrid_ontology(extended_ontology_mapping): return Ontology( head_ontology={ - 'url': - 'https://github.com/biolink/biolink-model/raw/v3.2.1/biolink-model.owl.ttl', - 'root_node': - 'entity', + "url": "https://github.com/biolink/biolink-model/raw/v3.2.1/biolink-model.owl.ttl", + "root_node": "entity", }, ontology_mapping=extended_ontology_mapping, tail_ontologies={ - 'so': - { - 'url': 'test/so.owl', - 'head_join_node': 'sequence variant', - 'tail_join_node': 'sequence_variant', - }, - 'mondo': - { - 'url': 'test/mondo.owl', - 'head_join_node': 'disease', - 'tail_join_node': 'human disease', - 'merge_nodes': False, - } + "so": { + "url": "test/so.owl", + "head_join_node": "sequence variant", + "tail_join_node": "sequence_variant", + }, + "mondo": { + "url": "test/mondo.owl", + "head_join_node": "disease", + "tail_join_node": "human disease", + "merge_nodes": False, + }, }, ) # neo4j batch writer fixtures -@pytest.fixture(scope='function') +@pytest.fixture(scope="function") def bw(hybrid_ontology, translator, deduplicator, tmp_path): - bw = _Neo4jBatchWriter( ontology=hybrid_ontology, translator=translator, deduplicator=deduplicator, output_directory=tmp_path, - delimiter=';', - array_delimiter='|', + delimiter=";", + array_delimiter="|", quote="'", ) @@ -224,16 +221,15 @@ def bw(hybrid_ontology, translator, deduplicator, tmp_path): # neo4j batch writer fixtures -@pytest.fixture(scope='function') +@pytest.fixture(scope="function") def bw_tab(hybrid_ontology, translator, deduplicator, tmp_path): - bw_tab = _Neo4jBatchWriter( ontology=hybrid_ontology, translator=translator, deduplicator=deduplicator, output_directory=tmp_path, - delimiter='\\t', - array_delimiter='|', + delimiter="\\t", + array_delimiter="|", quote="'", ) @@ -245,16 +241,15 @@ def bw_tab(hybrid_ontology, translator, deduplicator, tmp_path): os.rmdir(tmp_path) -@pytest.fixture(scope='function') +@pytest.fixture(scope="function") def bw_strict(hybrid_ontology, translator, deduplicator, tmp_path): - bw = _Neo4jBatchWriter( ontology=hybrid_ontology, translator=translator, deduplicator=deduplicator, output_directory=tmp_path, - delimiter=';', - array_delimiter='|', + delimiter=";", + array_delimiter="|", quote="'", strict_mode=True, ) @@ -268,36 +263,31 @@ def bw_strict(hybrid_ontology, translator, deduplicator, tmp_path): # core instance fixture -@pytest.fixture(name='core', scope='function') +@pytest.fixture(name="core", scope="function") def create_core(request, tmp_path): - # TODO why does the integration test use a different path than this fixture? - marker = request.node.get_closest_marker('inject_core_args') + marker = request.node.get_closest_marker("inject_core_args") marker_args = {} # check if marker has attribute param - if marker and hasattr(marker, 'param'): - + if marker and hasattr(marker, "param"): marker_args = marker.param - if not marker_args and 'CORE' in globals(): - - c = globals()['CORE'] + if not marker_args and "CORE" in globals(): + c = globals()["CORE"] else: - core_args = { - 'schema_config_path': 'biocypher/_config/test_schema_config.yaml', - 'output_directory': tmp_path, + "schema_config_path": "biocypher/_config/test_schema_config.yaml", + "output_directory": tmp_path, } core_args.update(marker_args) c = BioCypher(**core_args) if not marker_args: - - globals()['CORE'] = c + globals()["CORE"] = c c._deduplicator = Deduplicator() # seems to reuse deduplicator from previous test, unsure why @@ -309,7 +299,8 @@ def create_core(request, tmp_path): os.remove(os.path.join(tmp_path, f)) os.rmdir(tmp_path) -@pytest.fixture(scope='function') + +@pytest.fixture(scope="function") def _pd(deduplicator): return Pandas( ontology=None, @@ -317,22 +308,21 @@ def _pd(deduplicator): deduplicator=deduplicator, ) + # neo4j parameters -@pytest.fixture(scope='session') +@pytest.fixture(scope="session") def neo4j_param(request): - keys = ( - 'database_name', - 'user', - 'password', - 'uri', + "database_name", + "user", + "password", + "uri", ) - param = bcy_config('neo4j') + param = bcy_config("neo4j") cli = { - key: request.config.getoption(f'--{key}') or param[key] - for key in keys + key: request.config.getoption(f"--{key}") or param[key] for key in keys } return cli @@ -341,118 +331,104 @@ def neo4j_param(request): # skip test if neo4j is offline @pytest.fixture(autouse=True) def skip_if_offline_neo4j(request, neo4j_param, translator, hybrid_ontology): - - marker = request.node.get_closest_marker('requires_neo4j') + marker = request.node.get_closest_marker("requires_neo4j") if marker: - try: - marker_args = {} # check if marker has attribute param - if marker and hasattr(marker, 'param'): - + if marker and hasattr(marker, "param"): marker_args = marker.param driver_args = { - 'wipe': True, - 'multi_db': True, - 'translator': translator, - 'ontology': hybrid_ontology, + "wipe": True, + "multi_db": True, + "translator": translator, + "ontology": hybrid_ontology, } driver_args.update(marker_args) driver_args.update(neo4j_param) - driver_args['database_name'] = 'test' + driver_args["database_name"] = "test" _Neo4jDriver(**driver_args) except ServiceUnavailable as e: - - pytest.skip(f'Neo4j is offline: {e}') + pytest.skip(f"Neo4j is offline: {e}") # neo4j driver fixture -@pytest.fixture(name='driver', scope='function') +@pytest.fixture(name="driver", scope="function") def create_driver(request, neo4j_param, translator, hybrid_ontology): - marker = None # request.node.get_closest_marker('inject_driver_args') marker_args = {} # check if marker has attribute param - if marker and hasattr(marker, 'param'): - + if marker and hasattr(marker, "param"): marker_args = marker.param - if not marker_args and 'DRIVER' in globals(): - - d = globals()['DRIVER'] + if not marker_args and "DRIVER" in globals(): + d = globals()["DRIVER"] else: - driver_args = { - 'wipe': True, - 'multi_db': True, - 'translator': translator, - 'ontology': hybrid_ontology, + "wipe": True, + "multi_db": True, + "translator": translator, + "ontology": hybrid_ontology, } driver_args.update(marker_args) driver_args.update(neo4j_param) - driver_args['database_name'] = 'test' + driver_args["database_name"] = "test" d = _Neo4jDriver(**driver_args) if not marker_args: - - globals()['DRIVER'] = d + globals()["DRIVER"] = d yield d # teardown - d._driver.query('MATCH (n:Test)' - 'DETACH DELETE n') - d._driver.query('MATCH (n:Int1)' - 'DETACH DELETE n') - d._driver.query('MATCH (n:Int2)' - 'DETACH DELETE n') + d._driver.query("MATCH (n:Test)" "DETACH DELETE n") + d._driver.query("MATCH (n:Int1)" "DETACH DELETE n") + d._driver.query("MATCH (n:Int2)" "DETACH DELETE n") # to deal with merging on non-existing nodes # see test_add_single_biocypher_edge_missing_nodes() - d._driver.query("MATCH (n2) WHERE n2.id = 'src'" - 'DETACH DELETE n2') - d._driver.query("MATCH (n3) WHERE n3.id = 'tar'" - 'DETACH DELETE n3') + d._driver.query("MATCH (n2) WHERE n2.id = 'src'" "DETACH DELETE n2") + d._driver.query("MATCH (n3) WHERE n3.id = 'tar'" "DETACH DELETE n3") d._driver.close() ### postgresql ### -@pytest.fixture(scope='session') +@pytest.fixture(scope="session") def postgresql_param(request): - keys = ( - 'user_postgresql', - 'password_postgresql', - 'port_postgresql', + "user_postgresql", + "password_postgresql", + "port_postgresql", ) # get fallback parameters from biocypher config - param = bcy_config('postgresql') + param = bcy_config("postgresql") cli = {} for key in keys: # remove '_postgresql' suffix key_short = key[:-11] # change into format of input parameters - cli[f'db_{key_short}'] = request.config.getoption(f'--{key}' - ) or param[key_short] + cli[f"db_{key_short}"] = ( + request.config.getoption(f"--{key}") or param[key_short] + ) # hardcoded string for test-db name. test-db will be created for testing and droped after testing. # Do not take db_name from config to avoid accidental testing on the production database - cli['db_name'] = request.config.getoption( - '--database_name_postgresql' - ) or 'postgresql-biocypher-test-TG2C7GsdNw' + cli["db_name"] = ( + request.config.getoption("--database_name_postgresql") + or "postgresql-biocypher-test-TG2C7GsdNw" + ) return cli @@ -460,36 +436,38 @@ def postgresql_param(request): # skip test if postgresql is offline @pytest.fixture(autouse=True) def skip_if_offline_postgresql(request, postgresql_param): - - marker = request.node.get_closest_marker('requires_postgresql') + marker = request.node.get_closest_marker("requires_postgresql") if marker: - params = postgresql_param - user, port, password = params['db_user'], params['db_port'], params[ - 'db_password'] + user, port, password = ( + params["db_user"], + params["db_port"], + params["db_password"], + ) # an empty command, just to test if connection is possible - command = f'PGPASSWORD={password} psql -c \'\' --port {port} --user {user}' + command = ( + f"PGPASSWORD={password} psql -c '' --port {port} --user {user}" + ) process = subprocess.run(command, shell=True) # returncode is 0 when success if process.returncode != 0: - pytest.skip('Requires psql and connection to Postgresql server.') + pytest.skip("Requires psql and connection to Postgresql server.") -@pytest.fixture(scope='function') +@pytest.fixture(scope="function") def bw_comma_postgresql( postgresql_param, hybrid_ontology, translator, deduplicator, tmp_path ): - bw_comma = _PostgreSQLBatchWriter( ontology=hybrid_ontology, translator=translator, deduplicator=deduplicator, output_directory=tmp_path, - delimiter=',', - **postgresql_param + delimiter=",", + **postgresql_param, ) yield bw_comma @@ -500,16 +478,17 @@ def bw_comma_postgresql( os.rmdir(tmp_path) -@pytest.fixture(scope='function') -def bw_tab_postgresql(postgresql_param, hybrid_ontology, translator, deduplicator, tmp_path): - +@pytest.fixture(scope="function") +def bw_tab_postgresql( + postgresql_param, hybrid_ontology, translator, deduplicator, tmp_path +): bw_tab = _PostgreSQLBatchWriter( ontology=hybrid_ontology, translator=translator, deduplicator=deduplicator, output_directory=tmp_path, - delimiter='\\t', - **postgresql_param + delimiter="\\t", + **postgresql_param, ) yield bw_tab @@ -520,32 +499,35 @@ def bw_tab_postgresql(postgresql_param, hybrid_ontology, translator, deduplicato os.rmdir(tmp_path) -@pytest.fixture(scope='session') +@pytest.fixture(scope="session") def create_database_postgres(postgresql_param): params = postgresql_param - dbname, user, port, password = params['db_name'], params['db_user'], params[ - 'db_port'], params['db_password'] + dbname, user, port, password = ( + params["db_name"], + params["db_user"], + params["db_port"], + params["db_password"], + ) # create the database - command = f'PGPASSWORD={password} psql -c \'CREATE DATABASE "{dbname}";\' --port {port} --user {user}' + command = f"PGPASSWORD={password} psql -c 'CREATE DATABASE \"{dbname}\";' --port {port} --user {user}" process = subprocess.run(command, shell=True) yield dbname, user, port, password, process.returncode == 0 # 0 if success # teardown - command = f'PGPASSWORD={password} psql -c \'DROP DATABASE "{dbname}";\' --port {port} --user {user}' + command = f"PGPASSWORD={password} psql -c 'DROP DATABASE \"{dbname}\";' --port {port} --user {user}" process = subprocess.run(command, shell=True) -@pytest.fixture(scope='function') +@pytest.fixture(scope="function") def bw_arango(hybrid_ontology, translator, deduplicator, tmp_path): - bw_arango = _ArangoDBBatchWriter( ontology=hybrid_ontology, translator=translator, deduplicator=deduplicator, output_directory=tmp_path, - delimiter=',', + delimiter=",", ) yield bw_arango diff --git a/test/profile_performance.py b/test/profile_performance.py index bee843cd..a4921484 100644 --- a/test/profile_performance.py +++ b/test/profile_performance.py @@ -11,15 +11,15 @@ from biocypher._connect import _Neo4jDriver __all__ = [ - 'create_network_by_gen', - 'create_network_by_list', - 'create_networks', - 'delete_test_network', - 'explain_neo4j', - 'profile_neo4j', - 'remove_constraint', - 'setup_constraint', - 'visualise_benchmark', + "create_network_by_gen", + "create_network_by_list", + "create_networks", + "delete_test_network", + "explain_neo4j", + "profile_neo4j", + "remove_constraint", + "setup_constraint", + "visualise_benchmark", ] @@ -28,14 +28,14 @@ def create_network_by_gen(num_nodes, num_edges, profile=False, explain=False): def node_gen(num_nodes): for i in range(num_nodes): - yield BioCypherNode(i, 'test') + yield BioCypherNode(i, "test") def edge_gen(num_edges): for _ in range(num_edges): src = random.randint(1, num_nodes) tar = random.randint(1, num_nodes) - yield BioCypherEdge(src, tar, 'test') + yield BioCypherEdge(src, tar, "test") node_profile, np_printout = d.add_biocypher_nodes( node_gen(num_nodes), @@ -82,7 +82,7 @@ def create_network_by_list(num_nodes, num_edges): def node_list(num_nodes): ls = [] for i in range(num_nodes): - ls.append(BioCypherNode(i, 'test')) + ls.append(BioCypherNode(i, "test")) return ls @@ -91,7 +91,7 @@ def edge_list(num_edges): for _ in range(num_edges): src = random.randint(1, num_nodes) tar = random.randint(1, num_nodes) - ls.append(BioCypherEdge(src, tar, 'test')) + ls.append(BioCypherEdge(src, tar, "test")) return ls @@ -104,23 +104,23 @@ def edge_list(num_edges): def setup_constraint(): d = _Neo4jDriver(increment_version=False) d.query( - 'CREATE CONSTRAINT test_id ' - 'IF NOT EXISTS ON (n:test) ' - 'ASSERT n.id IS UNIQUE ', + "CREATE CONSTRAINT test_id " + "IF NOT EXISTS ON (n:test) " + "ASSERT n.id IS UNIQUE ", ) d.close() def remove_constraint(): d = _Neo4jDriver(increment_version=False) - d.query('DROP CONSTRAINT test_id') + d.query("DROP CONSTRAINT test_id") d.close() def delete_test_network(): d = _Neo4jDriver(increment_version=False) - d.query('MATCH (n)-[:test]-() DETACH DELETE n') - d.query('MATCH (n:test) DETACH DELETE n') + d.query("MATCH (n)-[:test]-() DETACH DELETE n") + d.query("MATCH (n:test) DETACH DELETE n") d.close() @@ -140,9 +140,9 @@ def create_networks(): ) delete_test_network() - res.update({'lis%s' % n: lis, 'lism%s' % n: lism}) + res.update({"lis%s" % n: lis, "lism%s" % n: lism}) - with open('benchmark.pickle', 'wb') as f: + with open("benchmark.pickle", "wb") as f: pickle.dump(res, f) print(res) @@ -153,57 +153,55 @@ def visualise_benchmark(): import matplotlib.pyplot as plt - with open('benchmark.pickle', 'rb') as f: + with open("benchmark.pickle", "rb") as f: res = pickle.load(f) - x = [key for key in res.keys() if 'lism' in key] - x = [int(e.replace('lism', '')) for e in x] - lis = [value for key, value in res.items() if 'lism' not in key] - lism = [value for key, value in res.items() if 'lism' in key] + x = [key for key in res.keys() if "lism" in key] + x = [int(e.replace("lism", "")) for e in x] + lis = [value for key, value in res.items() if "lism" not in key] + lism = [value for key, value in res.items() if "lism" in key] - plt.plot(x, lis, marker='o', label='List') - plt.plot(x, lism, marker='o', label='List (modified)') - plt.xlabel('Network size (nodes)') - plt.ylabel('Time (s)') + plt.plot(x, lis, marker="o", label="List") + plt.plot(x, lism, marker="o", label="List (modified)") + plt.xlabel("Network size (nodes)") + plt.ylabel("Time (s)") plt.legend() plt.show() def profile_neo4j(num_nodes, num_edges): - np, ep, epm = create_network_by_gen(num_nodes, num_edges, profile=True) - print('') - print(f'{bcolors.HEADER}### NODE PROFILE ###{bcolors.ENDC}') + print("") + print(f"{bcolors.HEADER}### NODE PROFILE ###{bcolors.ENDC}") for p in np[1]: print(p) - print('') - print(f'{bcolors.HEADER}### EDGE PROFILE ###{bcolors.ENDC}') + print("") + print(f"{bcolors.HEADER}### EDGE PROFILE ###{bcolors.ENDC}") for p in ep[1]: print(p) - print('') - print(f'{bcolors.HEADER}### MODIFIED EDGE PROFILE ###{bcolors.ENDC}') + print("") + print(f"{bcolors.HEADER}### MODIFIED EDGE PROFILE ###{bcolors.ENDC}") for p in epm[1]: print(p) def explain_neo4j(num_nodes, num_edges): - np, ep, epm = create_network_by_gen(num_nodes, num_edges, explain=True) - print('') - print(f'{bcolors.HEADER}### NODE PROFILE ###{bcolors.ENDC}') + print("") + print(f"{bcolors.HEADER}### NODE PROFILE ###{bcolors.ENDC}") for p in np[1]: print(p) - print('') - print(f'{bcolors.HEADER}### EDGE PROFILE ###{bcolors.ENDC}') + print("") + print(f"{bcolors.HEADER}### EDGE PROFILE ###{bcolors.ENDC}") for p in ep[1]: print(p) - print('') - print(f'{bcolors.HEADER}### MODIFIED EDGE PROFILE ###{bcolors.ENDC}') + print("") + print(f"{bcolors.HEADER}### MODIFIED EDGE PROFILE ###{bcolors.ENDC}") for p in epm[1]: print(p) -if __name__ == '__main__': +if __name__ == "__main__": # profile python performance with cProfile python_prof = False # run network creation (needed for python profiling) @@ -233,7 +231,7 @@ def explain_neo4j(num_nodes, num_edges): ps = pstats.Stats(profile, stream=s).sort_stats(sortby) ps.print_stats() # print(s.getvalue()) - filename = 'create_network.prof' + filename = "create_network.prof" ps.dump_stats(filename) if viz: diff --git a/test/rdflib_playground.py b/test/rdflib_playground.py index 6dca50c0..44ae877b 100644 --- a/test/rdflib_playground.py +++ b/test/rdflib_playground.py @@ -3,10 +3,9 @@ def ontology_to_tree(ontology_path, root_label, switch_id_and_label=True): - # Load the ontology into an rdflib Graph g = rdflib.Graph() - g.parse(ontology_path, format='ttl') + g.parse(ontology_path, format="ttl") # Loop through all labels in the ontology for s, _, o in g.triples((None, rdflib.RDFS.label, None)): @@ -15,14 +14,13 @@ def ontology_to_tree(ontology_path, root_label, switch_id_and_label=True): root = s break else: - raise ValueError(f'Could not find root node with label {root_label}') + raise ValueError(f"Could not find root node with label {root_label}") # Create a directed graph to represent the ontology as a tree G = nx.DiGraph() # Define a recursive function to add subclasses to the graph def add_subclasses(node): - # Only add nodes that have a label if (node, rdflib.RDFS.label, None) not in g: return @@ -31,25 +29,23 @@ def add_subclasses(node): if nx_id not in G: G.add_node(nx_id) - G.nodes[nx_id]['label'] = nx_label + G.nodes[nx_id]["label"] = nx_label # Recursively add all subclasses of the node to the graph for s, _, o in g.triples((None, rdflib.RDFS.subClassOf, node)): - # Only add nodes that have a label if (s, rdflib.RDFS.label, None) not in g: continue s_id, s_label = _get_nx_id_and_label(s) G.add_node(s_id) - G.nodes[s_id]['label'] = s_label + G.nodes[s_id]["label"] = s_label G.add_edge(s_id, nx_id) add_subclasses(s) add_parents(s) def add_parents(node): - # Only add nodes that have a label if (node, rdflib.RDFS.label, None) not in g: return @@ -58,7 +54,6 @@ def add_parents(node): # Recursively add all parents of the node to the graph for s, _, o in g.triples((node, rdflib.RDFS.subClassOf, None)): - # Only add nodes that have a label if (o, rdflib.RDFS.label, None) not in g: continue @@ -70,7 +65,7 @@ def add_parents(node): continue G.add_node(o_id) - G.nodes[o_id]['label'] = o_label + G.nodes[o_id]["label"] = o_label G.add_edge(nx_id, o_id) add_parents(o) @@ -95,15 +90,15 @@ def remove_prefix(uri: str) -> str: separator between the prefix and the local name. The prefix is everything before the last separator. """ - return uri.rsplit('#', 1)[-1].rsplit('/', 1)[-1] + return uri.rsplit("#", 1)[-1].rsplit("/", 1)[-1] -if __name__ == '__main__': - path = 'test/so.owl' - url = 'https://raw.githubusercontent.com/biolink/biolink-model/v3.2.1/biolink-model.owl.ttl' - root_label = 'entity' +if __name__ == "__main__": + path = "test/so.owl" + url = "https://raw.githubusercontent.com/biolink/biolink-model/v3.2.1/biolink-model.owl.ttl" + root_label = "entity" G = ontology_to_tree(url, root_label, switch_id_and_label=True) # depth first search: ancestors of the "protein" node - ancestors = nx.dfs_preorder_nodes(G, 'macromolecular complex') + ancestors = nx.dfs_preorder_nodes(G, "macromolecular complex") print(list(ancestors)) diff --git a/test/test_config.py b/test/test_config.py index e26ae474..e2611f43 100644 --- a/test/test_config.py +++ b/test/test_config.py @@ -4,12 +4,11 @@ def test_read_yaml(): - schema_config = _read_yaml('biocypher/_config/test_schema_config.yaml') + schema_config = _read_yaml("biocypher/_config/test_schema_config.yaml") - assert 'protein' in schema_config + assert "protein" in schema_config def test_for_special_characters(): - with pytest.warns(UserWarning): - _read_yaml('biocypher/_config/test_config.yaml') + _read_yaml("biocypher/_config/test_config.yaml") diff --git a/test/test_core.py b/test/test_core.py index ac227a96..0ba455a0 100644 --- a/test/test_core.py +++ b/test/test_core.py @@ -1,7 +1,8 @@ import pytest + def test_biocypher(core): - assert core._dbms == 'neo4j' + assert core._dbms == "neo4j" assert core._offline == True assert core._strict_mode == False @@ -11,12 +12,13 @@ def test_log_missing_types(core, translator): core._translator.notype = {} assert core.log_missing_input_labels() == None - core._translator.notype = {'a': 1, 'b': 2} + core._translator.notype = {"a": 1, "b": 2} mt = core.log_missing_input_labels() - assert mt.get('a') == 1 and mt.get('b') == 2 + assert mt.get("a") == 1 and mt.get("b") == 2 + -@pytest.mark.parametrize('l', [4], scope='module') +@pytest.mark.parametrize("l", [4], scope="module") def test_log_duplicates(core, deduplicator, _get_nodes): core._deduplicator = deduplicator nodes = _get_nodes + _get_nodes @@ -26,6 +28,7 @@ def test_log_duplicates(core, deduplicator, _get_nodes): assert True + # def test_access_translate(driver): # driver.start_ontology() diff --git a/test/test_create.py b/test/test_create.py index ce425c88..abedc0f8 100644 --- a/test/test_create.py +++ b/test/test_create.py @@ -12,7 +12,7 @@ def test_node(node): assert isinstance(node.get_properties(), dict) assert isinstance(node.get_dict(), dict) - assert 'id' in node.get_properties().keys() + assert "id" in node.get_properties().keys() @given(st.builds(BioCypherEdge)) @@ -34,4 +34,4 @@ def test_rel_as_node(rel_as_node): def test_rel_as_node_invalid_node(): with pytest.raises(TypeError): - BioCypherRelAsNode('str', 1, 2.5122) + BioCypherRelAsNode("str", 1, 2.5122) diff --git a/test/test_deduplicate.py b/test/test_deduplicate.py index e82c0e99..1efa122e 100644 --- a/test/test_deduplicate.py +++ b/test/test_deduplicate.py @@ -1,45 +1,47 @@ import pytest -from biocypher._create import BioCypherNode, BioCypherEdge + +from biocypher._create import BioCypherEdge, BioCypherNode from biocypher._deduplicate import Deduplicator -@pytest.mark.parametrize('l', [4], scope='module') + +@pytest.mark.parametrize("l", [4], scope="module") def test_duplicate_nodes(_get_nodes): dedup = Deduplicator() nodes = _get_nodes nodes.append( BioCypherNode( - node_id='p1', - node_label='protein', + node_id="p1", + node_label="protein", properties={ - 'name': 'StringProperty1', - 'score': 4.32, - 'taxon': 9606, - 'genes': ['gene1', 'gene2'] - } + "name": "StringProperty1", + "score": 4.32, + "taxon": 9606, + "genes": ["gene1", "gene2"], + }, ) ) for node in nodes: dedup.node_seen(node) - assert 'protein' in dedup.duplicate_node_types - assert 'p1' in dedup.duplicate_node_ids + assert "protein" in dedup.duplicate_node_types + assert "p1" in dedup.duplicate_node_ids -@pytest.mark.parametrize('l', [4], scope='module') +@pytest.mark.parametrize("l", [4], scope="module") def test_get_duplicate_nodes(_get_nodes): dedup = Deduplicator() nodes = _get_nodes nodes.append( BioCypherNode( - node_id='p1', - node_label='protein', + node_id="p1", + node_label="protein", properties={ - 'name': 'StringProperty1', - 'score': 4.32, - 'taxon': 9606, - 'genes': ['gene1', 'gene2'] - } + "name": "StringProperty1", + "score": 4.32, + "taxon": 9606, + "genes": ["gene1", "gene2"], + }, ) ) @@ -50,24 +52,25 @@ def test_get_duplicate_nodes(_get_nodes): types = d[0] ids = d[1] - assert 'protein' in types - assert 'p1' in ids + assert "protein" in types + assert "p1" in ids -@pytest.mark.parametrize('l', [4], scope='module') + +@pytest.mark.parametrize("l", [4], scope="module") def test_duplicate_edges(_get_edges): dedup = Deduplicator() edges = _get_edges edges.append( BioCypherEdge( - relationship_id='mrel2', - source_id='m2', - target_id='p3', - relationship_label='Is_Mutated_In', + relationship_id="mrel2", + source_id="m2", + target_id="p3", + relationship_label="Is_Mutated_In", properties={ - 'score': 4.32, - 'taxon': 9606, - 'genes': ['gene1', 'gene2'] - } + "score": 4.32, + "taxon": 9606, + "genes": ["gene1", "gene2"], + }, ) ) # this will fail if we go beyond concatenation of ids @@ -75,24 +78,25 @@ def test_duplicate_edges(_get_edges): for edge in edges: dedup.edge_seen(edge) - assert 'Is_Mutated_In' in dedup.duplicate_edge_types - assert ('mrel2') in dedup.duplicate_edge_ids + assert "Is_Mutated_In" in dedup.duplicate_edge_types + assert ("mrel2") in dedup.duplicate_edge_ids + -@pytest.mark.parametrize('l', [4], scope='module') +@pytest.mark.parametrize("l", [4], scope="module") def test_get_duplicate_edges(_get_edges): dedup = Deduplicator() edges = _get_edges edges.append( BioCypherEdge( - relationship_id='mrel2', - source_id='m2', - target_id='p3', - relationship_label='Is_Mutated_In', + relationship_id="mrel2", + source_id="m2", + target_id="p3", + relationship_label="Is_Mutated_In", properties={ - 'score': 4.32, - 'taxon': 9606, - 'genes': ['gene1', 'gene2'] - } + "score": 4.32, + "taxon": 9606, + "genes": ["gene1", "gene2"], + }, ) ) # this will fail if we go beyond concatenation of ids @@ -104,5 +108,5 @@ def test_get_duplicate_edges(_get_edges): types = d[0] ids = d[1] - assert 'Is_Mutated_In' in types - assert ('mrel2') in ids \ No newline at end of file + assert "Is_Mutated_In" in types + assert ("mrel2") in ids diff --git a/test/test_driver.py b/test/test_driver.py index 82a0ee1f..2273ed3d 100644 --- a/test/test_driver.py +++ b/test/test_driver.py @@ -7,13 +7,11 @@ @pytest.mark.requires_neo4j def test_create_driver(driver): - assert isinstance(driver, _Neo4jDriver) @pytest.mark.requires_neo4j def test_connect_to_db(driver): - assert isinstance(driver._driver.driver, neo4j.Neo4jDriver) @@ -24,28 +22,29 @@ def test_increment_version(driver): driver._driver.query(query) driver._update_meta_graph() - r, summary = driver._driver.query('MATCH (n:BioCypher) ' - 'RETURN n', ) + r, summary = driver._driver.query( + "MATCH (n:BioCypher) " "RETURN n", + ) assert len(r) == 2 @pytest.mark.requires_neo4j def test_explain(driver): - query = 'MATCH (n) WITH n LIMIT 25 MATCH (n)--(m)--(f) RETURN n, m, f' + query = "MATCH (n) WITH n LIMIT 25 MATCH (n)--(m)--(f) RETURN n, m, f" e = driver._driver.explain(query) t = e[0] - assert 'args' in t and 'identifiers' in t + assert "args" in t and "identifiers" in t @pytest.mark.requires_neo4j def test_profile(driver): - query = 'MATCH (n) RETURN n LIMIT 100' + query = "MATCH (n) RETURN n LIMIT 100" p = driver._driver.profile(query) t = p[0] - assert 'args' in t and 'identifiers' in t + assert "args" in t and "identifiers" in t @pytest.mark.requires_neo4j @@ -56,34 +55,30 @@ def test_add_invalid_biocypher_node(driver): driver.add_biocypher_nodes(1) with pytest.raises(ValueError): - driver.add_biocypher_nodes('String') + driver.add_biocypher_nodes("String") @pytest.mark.requires_neo4j def test_add_single_biocypher_node(driver): # neo4j database needs to be running! - n = BioCypherNode(node_id='test_id1', node_label='Test') + n = BioCypherNode(node_id="test_id1", node_label="Test") driver.add_biocypher_nodes(n) r, summary = driver._driver.query( - 'MATCH (n:Test) ' - 'WITH n, n.id AS id ' - 'RETURN id ', + "MATCH (n:Test) " "WITH n, n.id AS id " "RETURN id ", ) - assert r[0]['id'] == 'test_id1' + assert r[0]["id"] == "test_id1" @pytest.mark.requires_neo4j def test_add_biocypher_node_list(driver): # neo4j database needs to be running! - n1 = BioCypherNode(node_id='test_id1', node_label='Test') - n2 = BioCypherNode(node_id='test_id2', node_label='Test') + n1 = BioCypherNode(node_id="test_id1", node_label="Test") + n2 = BioCypherNode(node_id="test_id2", node_label="Test") driver.add_biocypher_nodes([n1, n2]) r, summary = driver._driver.query( - 'MATCH (n:Test) ' - 'WITH n, n.id AS id ' - 'RETURN id ', + "MATCH (n:Test) " "WITH n, n.id AS id " "RETURN id ", ) - assert set([r[0]['id'], r[1]['id']]) == set(['test_id1', 'test_id2']) + assert set([r[0]["id"], r[1]["id"]]) == set(["test_id1", "test_id2"]) @pytest.mark.requires_neo4j @@ -94,42 +89,42 @@ def gen(nodes): for g in nodes: yield BioCypherNode(g[0], g[1]) - g = gen([('test_id1', 'Test'), ('test_id2', 'Test')]) + g = gen([("test_id1", "Test"), ("test_id2", "Test")]) driver.add_biocypher_nodes(g) r, summary = driver._driver.query( - 'MATCH (n:Test) ' - 'WITH n, n.id AS id ' - 'RETURN id ', + "MATCH (n:Test) " "WITH n, n.id AS id " "RETURN id ", ) - ids = [n['id'] for n in r] + ids = [n["id"] for n in r] - assert 'test_id1' in ids - assert 'test_id2' in ids + assert "test_id1" in ids + assert "test_id2" in ids @pytest.mark.requires_neo4j def test_add_specific_id_node(driver): - n = BioCypherNode(node_id='CHAT', node_label='Gene', preferred_id='hgnc') + n = BioCypherNode(node_id="CHAT", node_label="Gene", preferred_id="hgnc") driver.add_biocypher_nodes(n) - r, summary = driver._driver.query('MATCH (n:Gene) ' - 'RETURN n', ) + r, summary = driver._driver.query( + "MATCH (n:Gene) " "RETURN n", + ) - assert r[0]['n'].get('id') == 'CHAT' - assert r[0]['n'].get('preferred_id') == 'hgnc' + assert r[0]["n"].get("id") == "CHAT" + assert r[0]["n"].get("preferred_id") == "hgnc" @pytest.mark.requires_neo4j def test_add_generic_id_node(driver): - n = BioCypherNode(node_id='CHAT', node_label='Gene', preferred_id='HGNC') + n = BioCypherNode(node_id="CHAT", node_label="Gene", preferred_id="HGNC") driver.add_biocypher_nodes(n) - r, summary = driver._driver.query('MATCH (n:Gene) ' - 'RETURN n', ) + r, summary = driver._driver.query( + "MATCH (n:Gene) " "RETURN n", + ) - assert r[0]['n'].get('id') is not None + assert r[0]["n"].get("id") is not None @pytest.mark.requires_neo4j @@ -142,20 +137,21 @@ def test_add_invalid_biocypher_edge(driver): @pytest.mark.requires_neo4j def test_add_single_biocypher_edge_explicit_node_creation(driver): # neo4j database needs to be running! - n1 = BioCypherNode('src', 'Test') - n2 = BioCypherNode('tar', 'Test') + n1 = BioCypherNode("src", "Test") + n2 = BioCypherNode("tar", "Test") driver.add_biocypher_nodes([n1, n2]) - e = BioCypherEdge('src', 'tar', 'Test') + e = BioCypherEdge("src", "tar", "Test") driver.add_biocypher_edges(e) r, summary = driver._driver.query( - 'MATCH (n1)-[r:Test]->(n2) ' - 'WITH n1, n2, n1.id AS id1, n2.id AS id2, type(r) AS label ' - 'RETURN id1, id2, label', + "MATCH (n1)-[r:Test]->(n2) " + "WITH n1, n2, n1.id AS id1, n2.id AS id2, type(r) AS label " + "RETURN id1, id2, label", ) assert ( - r[0]['id1'] == 'src' and r[0]['id2'] == 'tar' and - r[0]['label'] == 'Test' + r[0]["id1"] == "src" + and r[0]["id2"] == "tar" + and r[0]["label"] == "Test" ) @@ -165,50 +161,53 @@ def test_add_single_biocypher_edge_missing_nodes(driver): # merging on non-existing nodes creates them without labels; what is # the desired behaviour here? do we only want to MATCH? - e = BioCypherEdge('src', 'tar', 'Test') + e = BioCypherEdge("src", "tar", "Test") driver.add_biocypher_edges(e) r, summary = driver._driver.query( - 'MATCH (n1)-[r:Test]->(n2) ' - 'WITH n1, n2, n1.id AS id1, n2.id AS id2, type(r) AS label ' - 'RETURN id1, id2, label', + "MATCH (n1)-[r:Test]->(n2) " + "WITH n1, n2, n1.id AS id1, n2.id AS id2, type(r) AS label " + "RETURN id1, id2, label", ) assert ( - r[0]['id1'] == 'src' and r[0]['id2'] == 'tar' and - r[0]['label'] == 'Test' + r[0]["id1"] == "src" + and r[0]["id2"] == "tar" + and r[0]["label"] == "Test" ) @pytest.mark.requires_neo4j def test_add_biocypher_edge_list(driver): # neo4j database needs to be running! - n1 = BioCypherNode('src', 'Test') - n2 = BioCypherNode('tar1', 'Test') - n3 = BioCypherNode('tar2', 'Test') + n1 = BioCypherNode("src", "Test") + n2 = BioCypherNode("tar1", "Test") + n3 = BioCypherNode("tar2", "Test") driver.add_biocypher_nodes([n1, n2, n3]) # edge list - e1 = BioCypherEdge('src', 'tar1', 'Test1') - e2 = BioCypherEdge('src', 'tar2', 'Test2') + e1 = BioCypherEdge("src", "tar1", "Test1") + e2 = BioCypherEdge("src", "tar2", "Test2") driver.add_biocypher_edges([e1, e2]) r, summary = driver._driver.query( - 'MATCH (n3)<-[r2:Test2]-(n1)-[r1:Test1]->(n2) ' - 'WITH n1, n2, n3, n1.id AS id1, n2.id AS id2, n3.id AS id3, ' - 'type(r1) AS label1, type(r2) AS label2 ' - 'RETURN id1, id2, id3, label1, label2', + "MATCH (n3)<-[r2:Test2]-(n1)-[r1:Test1]->(n2) " + "WITH n1, n2, n3, n1.id AS id1, n2.id AS id2, n3.id AS id3, " + "type(r1) AS label1, type(r2) AS label2 " + "RETURN id1, id2, id3, label1, label2", ) assert ( - r[0]['id1'] == 'src' and r[0]['id2'] == 'tar1' and - r[0]['id3'] == 'tar2' and r[0]['label1'] == 'Test1' and - r[0]['label2'] == 'Test2' + r[0]["id1"] == "src" + and r[0]["id2"] == "tar1" + and r[0]["id3"] == "tar2" + and r[0]["label1"] == "Test1" + and r[0]["label2"] == "Test2" ) @pytest.mark.requires_neo4j def test_add_biocypher_edge_generator(driver): # neo4j database needs to be running! - n1 = BioCypherNode('src', 'Test') - n2 = BioCypherNode('tar1', 'Test') - n3 = BioCypherNode('tar2', 'Test') + n1 = BioCypherNode("src", "Test") + n2 = BioCypherNode("tar1", "Test") + n3 = BioCypherNode("tar2", "Test") driver.add_biocypher_nodes([n1, n2, n3]) # generator @@ -221,64 +220,69 @@ def gen(edges): ) # edge list - e1 = BioCypherEdge('src', 'tar1', 'Test1') - e2 = BioCypherEdge('src', 'tar2', 'Test2') + e1 = BioCypherEdge("src", "tar1", "Test1") + e2 = BioCypherEdge("src", "tar2", "Test2") g = gen([e1, e2]) driver.add_biocypher_edges(g) r, summary = driver._driver.query( - 'MATCH (n3)<-[r2:Test2]-(n1)-[r1:Test1]->(n2) ' - 'WITH n1, n2, n3, n1.id AS id1, n2.id AS id2, n3.id AS id3, ' - 'type(r1) AS label1, type(r2) AS label2 ' - 'RETURN id1, id2, id3, label1, label2', + "MATCH (n3)<-[r2:Test2]-(n1)-[r1:Test1]->(n2) " + "WITH n1, n2, n3, n1.id AS id1, n2.id AS id2, n3.id AS id3, " + "type(r1) AS label1, type(r2) AS label2 " + "RETURN id1, id2, id3, label1, label2", ) assert ( - r[0]['id1'] == 'src' and r[0]['id2'] == 'tar1' and - r[0]['id3'] == 'tar2' and r[0]['label1'] == 'Test1' and - r[0]['label2'] == 'Test2' + r[0]["id1"] == "src" + and r[0]["id2"] == "tar1" + and r[0]["id3"] == "tar2" + and r[0]["label1"] == "Test1" + and r[0]["label2"] == "Test2" ) @pytest.mark.requires_neo4j def test_add_biocypher_interaction_as_BioCypherRelAsNode_list(driver): # neo4j database needs to be running! - i1 = BioCypherNode('int1', 'Int1') - i2 = BioCypherNode('int2', 'Int2') + i1 = BioCypherNode("int1", "Int1") + i2 = BioCypherNode("int2", "Int2") driver.add_biocypher_nodes([i1, i2]) - e1 = BioCypherEdge('src', 'int1', 'is_source_of') - e2 = BioCypherEdge('tar', 'int1', 'is_target_of') - e3 = BioCypherEdge('src', 'int2', 'is_source_of') - e4 = BioCypherEdge('tar', 'int2', 'is_target_of') + e1 = BioCypherEdge("src", "int1", "is_source_of") + e2 = BioCypherEdge("tar", "int1", "is_target_of") + e3 = BioCypherEdge("src", "int2", "is_source_of") + e4 = BioCypherEdge("tar", "int2", "is_target_of") r1, r2 = BioCypherRelAsNode(i1, e1, e2), BioCypherRelAsNode(i2, e3, e4) driver.add_biocypher_edges([r1, r2]) r, summary = driver._driver.query( - 'MATCH (n2)-[e4:is_target_of]->(i2:Int2)<-[e3:is_source_of]-' - '(n1)-[e1:is_source_of]->(i1:Int1)<-[e2:is_target_of]-(n2)' - 'WITH n1, n2, i1, i2, n1.id AS id1, n2.id AS id2, ' - 'i1.id AS id3, i2.id AS id4, ' - 'type(e1) AS label1, type(e2) AS label2, ' - 'type(e3) AS label3, type(e4) AS label4 ' - 'RETURN id1, id2, id3, id4, label1, label2, label3, label4', + "MATCH (n2)-[e4:is_target_of]->(i2:Int2)<-[e3:is_source_of]-" + "(n1)-[e1:is_source_of]->(i1:Int1)<-[e2:is_target_of]-(n2)" + "WITH n1, n2, i1, i2, n1.id AS id1, n2.id AS id2, " + "i1.id AS id3, i2.id AS id4, " + "type(e1) AS label1, type(e2) AS label2, " + "type(e3) AS label3, type(e4) AS label4 " + "RETURN id1, id2, id3, id4, label1, label2, label3, label4", ) assert ( - r[0]['id1'] == 'src' and r[0]['id2'] == 'tar' and - r[0]['id3'] == 'int1' and r[0]['id4'] == 'int2' and - r[0]['label1'] == 'is_source_of' and - r[0]['label2'] == 'is_target_of' and - r[0]['label3'] == 'is_source_of' and r[0]['label4'] == 'is_target_of' + r[0]["id1"] == "src" + and r[0]["id2"] == "tar" + and r[0]["id3"] == "int1" + and r[0]["id4"] == "int2" + and r[0]["label1"] == "is_source_of" + and r[0]["label2"] == "is_target_of" + and r[0]["label3"] == "is_source_of" + and r[0]["label4"] == "is_target_of" ) @pytest.mark.requires_neo4j def test_add_biocypher_interaction_as_BioCypherRelAsNode_generator(driver): # neo4j database needs to be running! - i1 = BioCypherNode('int1', 'Int1') - i2 = BioCypherNode('int2', 'Int2') + i1 = BioCypherNode("int1", "Int1") + i2 = BioCypherNode("int2", "Int2") driver.add_biocypher_nodes([i1, i2]) - e1 = BioCypherEdge('src', 'int1', 'is_source_of') - e2 = BioCypherEdge('tar', 'int1', 'is_target_of') - e3 = BioCypherEdge('src', 'int2', 'is_source_of') - e4 = BioCypherEdge('tar', 'int2', 'is_target_of') + e1 = BioCypherEdge("src", "int1", "is_source_of") + e2 = BioCypherEdge("tar", "int1", "is_target_of") + e3 = BioCypherEdge("src", "int2", "is_source_of") + e4 = BioCypherEdge("tar", "int2", "is_target_of") r1, r2 = BioCypherRelAsNode(i1, e1, e2), BioCypherRelAsNode(i2, e3, e4) relasnode_list = [r1, r2] @@ -288,40 +292,43 @@ def gen(lis): driver.add_biocypher_edges(gen(relasnode_list)) r, summary = driver._driver.query( - 'MATCH (n2)-[e4:is_target_of]->(i2:Int2)<-[e3:is_source_of]-' - '(n1)-[e1:is_source_of]->(i1:Int1)<-[e2:is_target_of]-(n2)' - 'WITH n1, n2, i1, i2, n1.id AS id1, n2.id AS id2, ' - 'i1.id AS id3, i2.id AS id4, ' - 'type(e1) AS label1, type(e2) AS label2, ' - 'type(e3) AS label3, type(e4) AS label4 ' - 'RETURN id1, id2, id3, id4, label1, label2, label3, label4', + "MATCH (n2)-[e4:is_target_of]->(i2:Int2)<-[e3:is_source_of]-" + "(n1)-[e1:is_source_of]->(i1:Int1)<-[e2:is_target_of]-(n2)" + "WITH n1, n2, i1, i2, n1.id AS id1, n2.id AS id2, " + "i1.id AS id3, i2.id AS id4, " + "type(e1) AS label1, type(e2) AS label2, " + "type(e3) AS label3, type(e4) AS label4 " + "RETURN id1, id2, id3, id4, label1, label2, label3, label4", ) assert ( - r[0]['id1'] == 'src' and r[0]['id2'] == 'tar' and - r[0]['id3'] == 'int1' and r[0]['id4'] == 'int2' and - r[0]['label1'] == 'is_source_of' and - r[0]['label2'] == 'is_target_of' and - r[0]['label3'] == 'is_source_of' and r[0]['label4'] == 'is_target_of' + r[0]["id1"] == "src" + and r[0]["id2"] == "tar" + and r[0]["id3"] == "int1" + and r[0]["id4"] == "int2" + and r[0]["label1"] == "is_source_of" + and r[0]["label2"] == "is_target_of" + and r[0]["label3"] == "is_source_of" + and r[0]["label4"] == "is_target_of" ) @pytest.mark.requires_neo4j def test_pretty_profile(driver): prof, printout = driver._driver.profile( - 'UNWIND [1,2,3,4,5] as id ' - 'MERGE (n:Test {id: id}) ' - 'MERGE (x:Test {id: id + 1})', + "UNWIND [1,2,3,4,5] as id " + "MERGE (n:Test {id: id}) " + "MERGE (x:Test {id: id + 1})", ) - assert 'args' in prof and 'ProduceResults' in printout[1] + assert "args" in prof and "ProduceResults" in printout[1] @pytest.mark.requires_neo4j def test_pretty_explain(driver): plan, printout = driver._driver.explain( - 'UNWIND [1,2,3,4,5] as id ' - 'MERGE (n:Test {id: id}) ' - 'MERGE (x:Test {id: id + 1})', + "UNWIND [1,2,3,4,5] as id " + "MERGE (n:Test {id: id}) " + "MERGE (x:Test {id: id + 1})", ) - assert 'args' in plan and 'ProduceResults' in printout[0] + assert "args" in plan and "ProduceResults" in printout[0] diff --git a/test/test_integration.py b/test/test_integration.py index 23d6e701..ea038118 100644 --- a/test/test_integration.py +++ b/test/test_integration.py @@ -3,7 +3,7 @@ import pytest -@pytest.mark.parametrize('l', [4], scope='function') +@pytest.mark.parametrize("l", [4], scope="function") def test_write_node_data_from_gen(core, _get_nodes): nodes = _get_nodes @@ -15,8 +15,8 @@ def node_gen(nodes): path = core._output_directory - p_csv = os.path.join(path, 'Protein-part000.csv') - m_csv = os.path.join(path, 'MicroRNA-part000.csv') + p_csv = os.path.join(path, "Protein-part000.csv") + m_csv = os.path.join(path, "MicroRNA-part000.csv") with open(p_csv) as f: pr = f.read() @@ -26,9 +26,9 @@ def node_gen(nodes): assert passed assert "p1;'StringProperty1';4.0;9606;'gene1|gene2';'p1';'uniprot'" in pr - assert 'BiologicalEntity' in pr + assert "BiologicalEntity" in pr assert "m1;'StringProperty1';9606;'m1';'mirbase'" in mi - assert 'ChemicalEntity' in mi + assert "ChemicalEntity" in mi def test_show_ontology_structure_kwargs(core): diff --git a/test/test_mapping.py b/test/test_mapping.py index 1169f74f..801ca017 100644 --- a/test/test_mapping.py +++ b/test/test_mapping.py @@ -2,27 +2,26 @@ def test_inheritance_loop(ontology_mapping): + assert "gene to variant association" in ontology_mapping.schema.keys() - assert 'gene to variant association' in ontology_mapping.schema.keys() - - assert 'gene to variant association' not in ontology_mapping.extended_schema.keys( + assert ( + "gene to variant association" + not in ontology_mapping.extended_schema.keys() ) def test_virtual_leaves_node(ontology_mapping): - - assert 'wikipathways.pathway' in ontology_mapping.extended_schema + assert "wikipathways.pathway" in ontology_mapping.extended_schema def test_getting_properties_via_config(ontology_mapping): - - assert 'name' in ontology_mapping.extended_schema['protein'].get( - 'properties' - ).keys() + assert ( + "name" + in ontology_mapping.extended_schema["protein"].get("properties").keys() + ) def test_preferred_id_optional(ontology_mapping): + pti = ontology_mapping.extended_schema.get("post translational interaction") - pti = ontology_mapping.extended_schema.get('post translational interaction') - - assert pti.get('preferred_id') == 'id' + assert pti.get("preferred_id") == "id" diff --git a/test/test_misc.py b/test/test_misc.py index ff6d7bc8..85e63e9d 100644 --- a/test/test_misc.py +++ b/test/test_misc.py @@ -4,52 +4,49 @@ from biocypher._misc import create_tree_visualisation inheritance_tree = { - 'B': 'A', - 'C': 'A', - 'D': 'B', - 'E': 'B', - 'F': 'C', - 'G': 'C', - 'H': 'E', - 'I': 'G', + "B": "A", + "C": "A", + "D": "B", + "E": "B", + "F": "C", + "G": "C", + "H": "E", + "I": "G", } disjoint_tree = { - 'B': 'A', - 'C': 'A', - 'D': 'B', - 'F': 'E', - 'G': 'E', - 'H': 'F', + "B": "A", + "C": "A", + "D": "B", + "F": "E", + "G": "E", + "H": "F", } def test_tree_vis(): - tree_vis = create_tree_visualisation(inheritance_tree) assert tree_vis.DEPTH == 1 assert tree_vis.WIDTH == 2 - assert tree_vis.root == 'A' + assert tree_vis.root == "A" def test_tree_vis_from_networkx(): - G = nx.DiGraph(inheritance_tree) tree_vis = create_tree_visualisation(G) assert tree_vis.DEPTH == 1 assert tree_vis.WIDTH == 2 - assert tree_vis.root == 'A' + assert tree_vis.root == "A" def test_disjoint_tree(): - with pytest.raises(ValueError): create_tree_visualisation(disjoint_tree) -if __name__ == '__main__': +if __name__ == "__main__": # to look at it print(create_tree_visualisation(nx.DiGraph(inheritance_tree)).show()) diff --git a/test/test_ontology.py b/test/test_ontology.py index f5f3027d..a40d1d02 100644 --- a/test/test_ontology.py +++ b/test/test_ontology.py @@ -1,47 +1,48 @@ import os -import networkx as nx import pytest +import networkx as nx from biocypher._ontology import Ontology def test_biolink_adapter(biolink_adapter): - assert biolink_adapter.get_root_label() == 'entity' + assert biolink_adapter.get_root_label() == "entity" assert biolink_adapter.get_nx_graph().number_of_nodes() > 100 - assert 'biological entity' in biolink_adapter.get_ancestors('gene') - assert 'macromolecular machine mixin' in biolink_adapter.get_ancestors( - 'macromolecular complex' + assert "biological entity" in biolink_adapter.get_ancestors("gene") + assert "macromolecular machine mixin" in biolink_adapter.get_ancestors( + "macromolecular complex" ) def test_so_adapter(so_adapter): - assert so_adapter.get_root_label() == 'sequence_variant' + assert so_adapter.get_root_label() == "sequence_variant" # here without underscores - assert 'sequence variant' in so_adapter.get_ancestors('lethal variant') + assert "sequence variant" in so_adapter.get_ancestors("lethal variant") def test_go_adapter(go_adapter): - assert go_adapter.get_root_label() == 'molecular_function' + assert go_adapter.get_root_label() == "molecular_function" - assert 'molecular function' in go_adapter.get_ancestors( - 'rna helicase activity' + assert "molecular function" in go_adapter.get_ancestors( + "rna helicase activity" ) def test_mondo_adapter(mondo_adapter): - assert mondo_adapter.get_root_label() == 'disease' + assert mondo_adapter.get_root_label() == "disease" - assert 'human disease' in mondo_adapter.get_ancestors('cystic fibrosis') + assert "human disease" in mondo_adapter.get_ancestors("cystic fibrosis") def test_ontology_functions(hybrid_ontology): assert isinstance(hybrid_ontology, Ontology) - first_tail_ontology = hybrid_ontology._tail_ontologies.get('so' - ).get_nx_graph() + first_tail_ontology = hybrid_ontology._tail_ontologies.get( + "so" + ).get_nx_graph() assert len(first_tail_ontology) == 6 assert nx.is_directed_acyclic_graph(first_tail_ontology) @@ -61,51 +62,51 @@ def test_ontology_functions(hybrid_ontology): assert hybrid_length - num_ext == combined_length - num_tail dgpl_ancestors = list( - hybrid_ontology.get_ancestors('decreased gene product level') + hybrid_ontology.get_ancestors("decreased gene product level") ) - assert 'decreased gene product level' in dgpl_ancestors - assert 'altered gene product level' in dgpl_ancestors - assert 'functional effect variant' in dgpl_ancestors - assert 'sequence variant' in dgpl_ancestors - assert 'biological entity' in dgpl_ancestors - assert 'named thing' in dgpl_ancestors - assert 'entity' in dgpl_ancestors - assert 'thing with taxon' in dgpl_ancestors - - lethal_var = hybrid_ontology._nx_graph.nodes['lethal variant'] - assert lethal_var['label'] == 'SO_0001773' + assert "decreased gene product level" in dgpl_ancestors + assert "altered gene product level" in dgpl_ancestors + assert "functional effect variant" in dgpl_ancestors + assert "sequence variant" in dgpl_ancestors + assert "biological entity" in dgpl_ancestors + assert "named thing" in dgpl_ancestors + assert "entity" in dgpl_ancestors + assert "thing with taxon" in dgpl_ancestors + + lethal_var = hybrid_ontology._nx_graph.nodes["lethal variant"] + assert lethal_var["label"] == "SO_0001773" # second tail ontology: here we don't merge the nodes, but attach 'human # disease' as a child of 'disease' - cf_ancestors = list(hybrid_ontology.get_ancestors('cystic fibrosis')) - assert 'cystic fibrosis' in cf_ancestors - assert 'autosomal recessive disease' in cf_ancestors - assert 'autosomal genetic disease' in cf_ancestors - assert 'hereditary disease' in cf_ancestors - assert 'human disease' in cf_ancestors - assert 'disease' in cf_ancestors - assert 'disease or phenotypic feature' in cf_ancestors - assert 'biological entity' in cf_ancestors - assert 'entity' in cf_ancestors + cf_ancestors = list(hybrid_ontology.get_ancestors("cystic fibrosis")) + assert "cystic fibrosis" in cf_ancestors + assert "autosomal recessive disease" in cf_ancestors + assert "autosomal genetic disease" in cf_ancestors + assert "hereditary disease" in cf_ancestors + assert "human disease" in cf_ancestors + assert "disease" in cf_ancestors + assert "disease or phenotypic feature" in cf_ancestors + assert "biological entity" in cf_ancestors + assert "entity" in cf_ancestors # mixins? # user extensions - dsdna_ancestors = list(hybrid_ontology.get_ancestors('dsDNA sequence')) - assert 'chemical entity' in dsdna_ancestors - assert 'association' in hybrid_ontology.get_ancestors( - 'mutation to tissue association' + dsdna_ancestors = list(hybrid_ontology.get_ancestors("dsDNA sequence")) + assert "chemical entity" in dsdna_ancestors + assert "association" in hybrid_ontology.get_ancestors( + "mutation to tissue association" ) # properties - protein = hybrid_ontology._nx_graph.nodes['protein'] - assert protein['label'] == 'Protein' - assert 'taxon' in protein['properties'].keys() + protein = hybrid_ontology._nx_graph.nodes["protein"] + assert protein["label"] == "Protein" + assert "taxon" in protein["properties"].keys() # synonyms - assert 'complex' in hybrid_ontology._nx_graph.nodes - assert 'macromolecular complex' not in hybrid_ontology._nx_graph.nodes + assert "complex" in hybrid_ontology._nx_graph.nodes + assert "macromolecular complex" not in hybrid_ontology._nx_graph.nodes def test_show_ontology(hybrid_ontology): @@ -123,20 +124,18 @@ def test_show_full_ontology(hybrid_ontology): def test_write_ontology(hybrid_ontology, tmp_path): passed = hybrid_ontology.show_ontology_structure(to_disk=tmp_path) - f = os.path.join(tmp_path, 'ontology_structure.graphml') + f = os.path.join(tmp_path, "ontology_structure.graphml") assert passed assert os.path.isfile(f) def test_disconnected_exception(disconnected_mapping): - with pytest.raises(ValueError): Ontology( head_ontology={ - 'url': 'test/so.owl', - 'root_node': 'sequence_variant', + "url": "test/so.owl", + "root_node": "sequence_variant", }, ontology_mapping=disconnected_mapping, ) - diff --git a/test/test_pandas.py b/test/test_pandas.py index 8d7329d0..9cd405d4 100644 --- a/test/test_pandas.py +++ b/test/test_pandas.py @@ -1,9 +1,11 @@ import pytest + def test_pandas(_pd): assert _pd.dfs == {} -@pytest.mark.parametrize('l', [4], scope='module') + +@pytest.mark.parametrize("l", [4], scope="module") def test_nodes(_pd, _get_nodes): _pd.add_tables(_get_nodes) assert "protein" in _pd.dfs.keys() @@ -14,7 +16,7 @@ def test_nodes(_pd, _get_nodes): assert "m2" in _pd.dfs["microRNA"]["node_id"].values -@pytest.mark.parametrize('l', [4], scope='module') +@pytest.mark.parametrize("l", [4], scope="module") def test_nodes_gen(_pd, _get_nodes): def node_gen(): for node in _get_nodes: @@ -23,19 +25,22 @@ def node_gen(): _pd.add_tables(node_gen()) assert "protein" in _pd.dfs.keys() -@pytest.mark.parametrize('l', [4], scope='module') + +@pytest.mark.parametrize("l", [4], scope="module") def test_duplicates(_pd, _get_nodes): nodes = _get_nodes + _get_nodes _pd.add_tables(nodes) assert len(_pd.dfs["protein"].node_id) == 4 -@pytest.mark.parametrize('l', [8], scope='module') + +@pytest.mark.parametrize("l", [8], scope="module") def test_two_step_add(_pd, _get_nodes): _pd.add_tables(_get_nodes[:4]) _pd.add_tables(_get_nodes[4:]) assert len(_pd.dfs["protein"].node_id) == 8 -@pytest.mark.parametrize('l', [4], scope='module') + +@pytest.mark.parametrize("l", [4], scope="module") def test_edges(_pd, _get_edges): _pd.add_tables(_get_edges) assert "PERTURBED_IN_DISEASE" in _pd.dfs.keys() @@ -46,11 +51,11 @@ def test_edges(_pd, _get_edges): assert "p1" in _pd.dfs["Is_Mutated_In"]["target_id"].values -@pytest.mark.parametrize('l', [4], scope='module') +@pytest.mark.parametrize("l", [4], scope="module") def test_edges_gen(_pd, _get_edges): def edge_gen(): for edge in _get_edges: yield edge _pd.add_tables(edge_gen()) - assert "PERTURBED_IN_DISEASE" in _pd.dfs.keys() \ No newline at end of file + assert "PERTURBED_IN_DISEASE" in _pd.dfs.keys() diff --git a/test/test_translate.py b/test/test_translate.py index 558700a9..bf113158 100644 --- a/test/test_translate.py +++ b/test/test_translate.py @@ -6,68 +6,68 @@ def test_translate_nodes(translator): id_type = [ ( - 'G9205', - 'protein', + "G9205", + "protein", { - 'taxon': 9606, + "taxon": 9606, }, ), ( - 'hsa-miR-132-3p', - 'mirna', + "hsa-miR-132-3p", + "mirna", { - 'taxon': 9606, + "taxon": 9606, }, ), ( - 'ASDB_OSBS', - 'complex', + "ASDB_OSBS", + "complex", { - 'taxon': 9606, + "taxon": 9606, }, ), - ('REACT:25520', 'reactome', {}), - ('agpl:001524', 'agpl', {}), + ("REACT:25520", "reactome", {}), + ("agpl:001524", "agpl", {}), ] t = translator.translate_nodes(id_type) assert all(type(n) == BioCypherNode for n in t) t = translator.translate_nodes(id_type) - assert next(t).get_label() == 'protein' - assert next(t).get_label() == 'microRNA' - assert next(t).get_label() == 'complex' - assert next(t).get_label() == 'reactome.pathway' - assert next(t).get_label() == 'altered gene product level' + assert next(t).get_label() == "protein" + assert next(t).get_label() == "microRNA" + assert next(t).get_label() == "complex" + assert next(t).get_label() == "reactome.pathway" + assert next(t).get_label() == "altered gene product level" def test_specific_and_generic_ids(translator): id_type = [ ( - 'CHAT', - 'hgnc', + "CHAT", + "hgnc", { - 'taxon': 9606, + "taxon": 9606, }, ), - ('REACT:25520', 'reactome', {}), + ("REACT:25520", "reactome", {}), ] t = list(translator.translate_nodes(id_type)) - assert t[0].get_id() == 'CHAT' - assert t[0].get_properties().get('preferred_id') == 'hgnc' - assert t[0].get_properties().get('id') == 'CHAT' - assert t[1].get_id() == 'REACT:25520' - assert t[1].get_properties().get('preferred_id') == 'reactome' - assert t[1].get_properties().get('id') == 'REACT:25520' + assert t[0].get_id() == "CHAT" + assert t[0].get_properties().get("preferred_id") == "hgnc" + assert t[0].get_properties().get("id") == "CHAT" + assert t[1].get_id() == "REACT:25520" + assert t[1].get_properties().get("preferred_id") == "reactome" + assert t[1].get_properties().get("id") == "REACT:25520" def test_translate_edges(translator): # edge type association (defined in `schema_config.yaml`) src_tar_type_edge = [ - ('G15258', 'MONDO1', 'gene_disease', {}), - ('G15258', 'MONDO2', 'protein_disease', {}), - ('G15258', 'G15242', 'phosphorylation', {}), + ("G15258", "MONDO1", "gene_disease", {}), + ("G15258", "MONDO2", "protein_disease", {}), + ("G15258", "G15242", "phosphorylation", {}), ] def gen_edges(): @@ -76,34 +76,34 @@ def gen_edges(): t = translator.translate_edges(gen_edges()) assert type(next(t)) == BioCypherEdge - assert next(t).get_label() == 'PERTURBED_IN_DISEASE' - assert next(t).get_label() == 'phosphorylation' + assert next(t).get_label() == "PERTURBED_IN_DISEASE" + assert next(t).get_label() == "phosphorylation" # node type association (defined in `schema_config.yaml`) src_tar_type_node = [ ( - 'G21058', - 'G50127', - 'post_translational', + "G21058", + "G50127", + "post_translational", { - 'prop1': 'test', + "prop1": "test", }, ), ( - 'G22418', - 'G50123', - 'post_translational', + "G22418", + "G50123", + "post_translational", { - 'directed': 'arbitrary_string', + "directed": "arbitrary_string", }, ), ( - 'G15258', - 'G16347', - 'post_translational', + "G15258", + "G16347", + "post_translational", { - 'directed': True, - 'effect': -1, + "directed": True, + "effect": -1, }, ), ] @@ -114,16 +114,16 @@ def gen_edges(): n2 = t[1] n3 = t[2] - assert n1.get_source_edge().get_label() == 'IS_PART_OF' - assert n2.get_source_edge().get_label() == 'IS_PART_OF' - assert n3.get_target_edge().get_label() == 'IS_TARGET_OF' + assert n1.get_source_edge().get_label() == "IS_PART_OF" + assert n2.get_source_edge().get_label() == "IS_PART_OF" + assert n3.get_target_edge().get_label() == "IS_TARGET_OF" assert ( - type(n1.get_node()) == BioCypherNode and - type(n1.get_source_edge()) == BioCypherEdge and - type(n1.get_target_edge()) == BioCypherEdge + type(n1.get_node()) == BioCypherNode + and type(n1.get_source_edge()) == BioCypherEdge + and type(n1.get_target_edge()) == BioCypherEdge ) - assert n3.get_node().get_id() == 'G15258_G16347_True_-1' - assert n3.get_source_edge().get_source_id() == 'G15258' + assert n3.get_node().get_id() == "G15258_G16347_True_-1" + assert n3.get_source_edge().get_source_id() == "G15258" # def test_biolink_adapter(version_node, translator): @@ -177,17 +177,17 @@ def test_merge_multiple_inputs_node(ontology_mapping, translator): # define nodes id_type = [ ( - 'CHAT', - 'hgnc', + "CHAT", + "hgnc", { - 'taxon': 9606, + "taxon": 9606, }, ), ( - 'CHRNA4', - 'ensg', + "CHRNA4", + "ensg", { - 'taxon': 9606, + "taxon": 9606, }, ), ] @@ -197,26 +197,27 @@ def test_merge_multiple_inputs_node(ontology_mapping, translator): # check unique node type assert not any( - [s for s in ontology_mapping.extended_schema.keys() if '.gene' in s] + [s for s in ontology_mapping.extended_schema.keys() if ".gene" in s] ) assert any( - [s for s in ontology_mapping.extended_schema.keys() if '.pathway' in s] + [s for s in ontology_mapping.extended_schema.keys() if ".pathway" in s] ) # check translator.translate_nodes for unique return type assert all([type(n) == BioCypherNode for n in t]) - assert all([n.get_label() == 'gene' for n in t]) + assert all([n.get_label() == "gene" for n in t]) + def test_implicit_inheritance_node(translator): id_type = [ ( - 'snrna1', - 'intact_snrna', + "snrna1", + "intact_snrna", {}, ), ( - 'snrna2', - 'rnacentral_snrna', + "snrna2", + "rnacentral_snrna", {}, ), ] @@ -224,8 +225,8 @@ def test_implicit_inheritance_node(translator): t = list(translator.translate_nodes(id_type)) assert all([type(n) == BioCypherNode for n in t]) - assert t[0].get_label() == 'intact.snRNA sequence' - assert t[1].get_label() == 'rnacentral.snRNA sequence' + assert t[0].get_label() == "intact.snRNA sequence" + assert t[1].get_label() == "rnacentral.snRNA sequence" def test_merge_multiple_inputs_edge(ontology_mapping, translator): @@ -237,19 +238,19 @@ def test_merge_multiple_inputs_edge(ontology_mapping, translator): # define nodes src_tar_type = [ ( - 'CHAT', - 'AD', - 'gene_disease', + "CHAT", + "AD", + "gene_disease", { - 'taxon': 9606, + "taxon": 9606, }, ), ( - 'CHRNA4', - 'AD', - 'protein_disease', + "CHRNA4", + "AD", + "protein_disease", { - 'taxon': 9606, + "taxon": 9606, }, ), ] @@ -258,100 +259,106 @@ def test_merge_multiple_inputs_edge(ontology_mapping, translator): # check unique edge type assert not any( [ - s for s in ontology_mapping.extended_schema.keys() - if '.gene to disease association' in s + s + for s in ontology_mapping.extended_schema.keys() + if ".gene to disease association" in s ], ) assert any( [ - s for s in ontology_mapping.extended_schema.keys() - if '.sequence variant' in s + s + for s in ontology_mapping.extended_schema.keys() + if ".sequence variant" in s ], ) # check translator.translate_nodes for unique return type assert all([type(e) == BioCypherEdge for e in t]) - assert all([e.get_label() == 'PERTURBED_IN_DISEASE' for e in t]) + assert all([e.get_label() == "PERTURBED_IN_DISEASE" for e in t]) + def test_implicit_inheritance_edge(translator): src_tar_type = [ ( - 'mut1', - 'var1', - 'gene1', - 'VARIANT_FOUND_IN_GENE_Known_variant_Gene', + "mut1", + "var1", + "gene1", + "VARIANT_FOUND_IN_GENE_Known_variant_Gene", {}, ), ( - 'mut2', - 'var2', - 'gene2', - 'VARIANT_FOUND_IN_GENE_Somatic_mutation_Gene', + "mut2", + "var2", + "gene2", + "VARIANT_FOUND_IN_GENE_Somatic_mutation_Gene", {}, ), ] t = list(translator.translate_edges(src_tar_type)) assert all([type(e) == BioCypherEdge for e in t]) - assert t[0].get_label() == 'known.sequence variant.variant to gene association' - assert t[1].get_label() == 'somatic.sequence variant.variant to gene association' + assert ( + t[0].get_label() == "known.sequence variant.variant to gene association" + ) + assert ( + t[1].get_label() + == "somatic.sequence variant.variant to gene association" + ) -def test_virtual_leaves_inherit_is_a(ontology_mapping): - snrna = ontology_mapping.extended_schema.get('intact.snRNA sequence') +def test_virtual_leaves_inherit_is_a(ontology_mapping): + snrna = ontology_mapping.extended_schema.get("intact.snRNA sequence") - assert 'is_a' in snrna.keys() - assert snrna['is_a'] == ['snRNA sequence', 'nucleic acid entity'] + assert "is_a" in snrna.keys() + assert snrna["is_a"] == ["snRNA sequence", "nucleic acid entity"] - dsdna = ontology_mapping.extended_schema.get('intact.dsDNA sequence') + dsdna = ontology_mapping.extended_schema.get("intact.dsDNA sequence") - assert dsdna['is_a'] == [ - 'dsDNA sequence', - 'DNA sequence', - 'nucleic acid entity', + assert dsdna["is_a"] == [ + "dsDNA sequence", + "DNA sequence", + "nucleic acid entity", ] def test_virtual_leaves_inherit_properties(ontology_mapping): + snrna = ontology_mapping.extended_schema.get("intact.snRNA sequence") - snrna = ontology_mapping.extended_schema.get('intact.snRNA sequence') - - assert 'properties' in snrna.keys() - assert 'exclude_properties' in snrna.keys() + assert "properties" in snrna.keys() + assert "exclude_properties" in snrna.keys() def test_inherit_properties(ontology_mapping): + dsdna = ontology_mapping.extended_schema.get("intact.dsDNA sequence") - dsdna = ontology_mapping.extended_schema.get('intact.dsDNA sequence') - - assert 'properties' in dsdna.keys() - assert 'sequence' in dsdna['properties'] + assert "properties" in dsdna.keys() + assert "sequence" in dsdna["properties"] def test_properties_from_config(translator): id_type = [ ( - 'G49205', - 'protein', + "G49205", + "protein", { - 'taxon': 9606, - 'name': 'test', + "taxon": 9606, + "name": "test", }, ), ( - 'G92035', - 'protein', + "G92035", + "protein", { - 'taxon': 9606, + "taxon": 9606, }, ), ( - 'G92205', - 'protein', + "G92205", + "protein", { - 'taxon': 9606, - 'name': 'test2', - 'test': 'should_not_be_returned', + "taxon": 9606, + "name": "test2", + "test": "should_not_be_returned", }, ), ] @@ -359,32 +366,32 @@ def test_properties_from_config(translator): r = list(t) assert ( - 'name' in r[0].get_properties().keys() and - 'name' in r[1].get_properties().keys() and - 'test' not in r[2].get_properties().keys() + "name" in r[0].get_properties().keys() + and "name" in r[1].get_properties().keys() + and "test" not in r[2].get_properties().keys() ) src_tar_type = [ ( - 'G49205', - 'AD', - 'gene_gene', + "G49205", + "AD", + "gene_gene", { - 'directional': True, - 'score': 0.5, - 'id': 'should_not_be_returned', + "directional": True, + "score": 0.5, + "id": "should_not_be_returned", }, ), ( - 'G92035', - 'AD', - 'gene_gene', + "G92035", + "AD", + "gene_gene", { - 'directional': False, - 'curated': True, - 'score': 0.5, - 'test': 'should_not_be_returned', - 'id': 'should_not_be_returned', + "directional": False, + "curated": True, + "score": 0.5, + "test": "should_not_be_returned", + "id": "should_not_be_returned", }, ), ] @@ -393,32 +400,32 @@ def test_properties_from_config(translator): r = list(t) assert ( - 'directional' in r[0].get_properties().keys() and - 'directional' in r[1].get_properties().keys() and - 'curated' in r[1].get_properties().keys() and - 'score' in r[0].get_properties().keys() and - 'score' in r[1].get_properties().keys() and - 'test' not in r[1].get_properties().keys() and - 'id' not in r[0].get_properties().keys() and - 'id' not in r[1].get_properties().keys() + "directional" in r[0].get_properties().keys() + and "directional" in r[1].get_properties().keys() + and "curated" in r[1].get_properties().keys() + and "score" in r[0].get_properties().keys() + and "score" in r[1].get_properties().keys() + and "test" not in r[1].get_properties().keys() + and "id" not in r[0].get_properties().keys() + and "id" not in r[1].get_properties().keys() ) def test_exclude_properties(translator): id_type = [ ( - 'CHAT', - 'ensg', + "CHAT", + "ensg", { - 'taxon': 9606, - 'accession': 'should_not_be_returned', + "taxon": 9606, + "accession": "should_not_be_returned", }, ), ( - 'ACHE', - 'ensg', + "ACHE", + "ensg", { - 'taxon': 9606, + "taxon": 9606, }, ), ] @@ -426,29 +433,29 @@ def test_exclude_properties(translator): r = list(t) assert ( - 'taxon' in r[0].get_properties().keys() and - 'taxon' in r[1].get_properties().keys() and - 'accession' not in r[0].get_properties().keys() + "taxon" in r[0].get_properties().keys() + and "taxon" in r[1].get_properties().keys() + and "accession" not in r[0].get_properties().keys() ) src_tar_type = [ ( - 'G49205', - 'AD', - 'gene_disease', + "G49205", + "AD", + "gene_disease", { - 'directional': True, - 'score': 0.5, + "directional": True, + "score": 0.5, }, ), ( - 'G92035', - 'AD', - 'gene_disease', + "G92035", + "AD", + "gene_disease", { - 'directional': False, - 'score': 0.5, - 'accession': 'should_not_be_returned', + "directional": False, + "score": 0.5, + "accession": "should_not_be_returned", }, ), ] @@ -457,51 +464,51 @@ def test_exclude_properties(translator): r = list(t) assert ( - 'directional' in r[0].get_properties().keys() and - 'directional' in r[1].get_properties().keys() and - 'score' in r[0].get_properties().keys() and - 'score' in r[1].get_properties().keys() and - 'accession' not in r[1].get_properties().keys() + "directional" in r[0].get_properties().keys() + and "directional" in r[1].get_properties().keys() + and "score" in r[0].get_properties().keys() + and "score" in r[1].get_properties().keys() + and "accession" not in r[1].get_properties().keys() ) # we need to load the adapter because the mappings are passed from the adapter # to the translator def test_translate_term(translator): - assert translator.translate_term('hgnc') == 'Gene' + assert translator.translate_term("hgnc") == "Gene" assert ( - translator.translate_term('protein_disease') == 'PERTURBED_IN_DISEASE' + translator.translate_term("protein_disease") == "PERTURBED_IN_DISEASE" ) def test_reverse_translate_term(translator): - assert 'hgnc' in translator.reverse_translate_term('Gene') - assert 'protein_disease' in translator.reverse_translate_term( - 'PERTURBED_IN_DISEASE', + assert "hgnc" in translator.reverse_translate_term("Gene") + assert "protein_disease" in translator.reverse_translate_term( + "PERTURBED_IN_DISEASE", ) def test_translate_query(translator): # we translate to PascalCase for cypher queries, not to internal # sentence case - query = 'MATCH (n:hgnc)-[r:gene_disease]->(d:Disease) RETURN n' + query = "MATCH (n:hgnc)-[r:gene_disease]->(d:Disease) RETURN n" assert ( - translator.translate(query) == - 'MATCH (n:Gene)-[r:PERTURBED_IN_DISEASE]->(d:Disease) RETURN n' + translator.translate(query) + == "MATCH (n:Gene)-[r:PERTURBED_IN_DISEASE]->(d:Disease) RETURN n" ) def test_reverse_translate_query(translator): # TODO cannot use sentence case in this context. include sentence to # pascal case and back in translation? - query = 'MATCH (n:Known.SequenceVariant)-[r:Known.SequenceVariant.VariantToGeneAssociation]->(g:Gene) RETURN n' + query = "MATCH (n:Known.SequenceVariant)-[r:Known.SequenceVariant.VariantToGeneAssociation]->(g:Gene) RETURN n" with pytest.raises(NotImplementedError): translator.reverse_translate(query) - query = 'MATCH (n:Known.SequenceVariant)-[r:Known.SequenceVariant.VariantToGeneAssociation]->(g:Protein) RETURN n' + query = "MATCH (n:Known.SequenceVariant)-[r:Known.SequenceVariant.VariantToGeneAssociation]->(g:Protein) RETURN n" assert ( - translator.reverse_translate(query) == - 'MATCH (n:Known_variant)-[r:VARIANT_FOUND_IN_GENE_Known_variant_Gene]->(g:protein) RETURN n' + translator.reverse_translate(query) + == "MATCH (n:Known_variant)-[r:VARIANT_FOUND_IN_GENE_Known_variant_Gene]->(g:protein) RETURN n" ) @@ -509,67 +516,64 @@ def test_log_missing_nodes(translator): tn = translator.translate_nodes( [ ( - 'G49205', - 'missing_protein', + "G49205", + "missing_protein", { - 'taxon': 9606, + "taxon": 9606, }, ), - ('G92035', 'missing_protein', {}), - ('REACT:25520', 'missing_pathway', {}), + ("G92035", "missing_protein", {}), + ("REACT:25520", "missing_pathway", {}), ], ) tn = list(tn) m = translator.get_missing_biolink_types() - assert m.get('missing_protein') == 2 - assert m.get('missing_pathway') == 1 + assert m.get("missing_protein") == 2 + assert m.get("missing_pathway") == 1 def test_strict_mode_error(translator): translator.strict_mode = True n1 = ( - 'n2', 'Test', { - 'prop': 'val', - 'source': 'test', - 'licence': 'test', - 'version': 'test' - } + "n2", + "Test", + {"prop": "val", "source": "test", "licence": "test", "version": "test"}, ) assert list(translator.translate_nodes([n1])) is not None # test 'license' instead of 'licence' n2 = ( - 'n2', 'Test', { - 'prop': 'val', - 'source': 'test', - 'license': 'test', - 'version': 'test' - } + "n2", + "Test", + {"prop": "val", "source": "test", "license": "test", "version": "test"}, ) assert list(translator.translate_nodes([n2])) is not None - n3 = ('n1', 'Test', {'prop': 'val'}) + n3 = ("n1", "Test", {"prop": "val"}) with pytest.raises(ValueError): list(translator.translate_nodes([n1, n2, n3])) e1 = ( - 'n1', 'n2', 'Test', { - 'prop': 'val', - 'source': 'test', - 'licence': 'test', - 'version': 'test', - } + "n1", + "n2", + "Test", + { + "prop": "val", + "source": "test", + "licence": "test", + "version": "test", + }, ) assert list(translator.translate_edges([e1])) is not None - e2 = ('n1', 'n2', 'Test', {'prop': 'val'}) + e2 = ("n1", "n2", "Test", {"prop": "val"}) with pytest.raises(ValueError): list(translator.translate_edges([e1, e2])) @@ -579,16 +583,18 @@ def test_strict_mode_property_filter(translator): translator.strict_mode = True p1 = ( - 'p1', 'protein', { - 'taxon': 9606, - 'source': 'test', - 'licence': 'test', - 'version': 'test', - } + "p1", + "protein", + { + "taxon": 9606, + "source": "test", + "licence": "test", + "version": "test", + }, ) l = list(translator.translate_nodes([p1])) - assert 'source' in l[0].get_properties().keys() - assert 'licence' in l[0].get_properties().keys() - assert 'version' in l[0].get_properties().keys() + assert "source" in l[0].get_properties().keys() + assert "licence" in l[0].get_properties().keys() + assert "version" in l[0].get_properties().keys() diff --git a/test/test_write_arango.py b/test/test_write_arango.py index e7e0a38b..d3639b2b 100644 --- a/test/test_write_arango.py +++ b/test/test_write_arango.py @@ -3,7 +3,7 @@ import pytest -@pytest.mark.parametrize('l', [4], scope='function') +@pytest.mark.parametrize("l", [4], scope="function") def test_arango_write_data_headers_import_call( bw_arango, _get_nodes, @@ -25,19 +25,19 @@ def test_arango_write_data_headers_import_call( tmp_path = bw_arango.outdir - ph_csv = os.path.join(tmp_path, 'Protein-header.csv') - pp_1_csv = os.path.join(tmp_path, 'Protein-part000.csv') - pp_2_csv = os.path.join(tmp_path, 'Protein-part001.csv') - mh_csv = os.path.join(tmp_path, 'MicroRNA-header.csv') - mp_1_csv = os.path.join(tmp_path, 'MicroRNA-part000.csv') - mp_2_csv = os.path.join(tmp_path, 'MicroRNA-part001.csv') - dh_csv = os.path.join(tmp_path, 'PERTURBED_IN_DISEASE-header.csv') - dp_1_csv = os.path.join(tmp_path, 'PERTURBED_IN_DISEASE-part000.csv') - dp_2_csv = os.path.join(tmp_path, 'PERTURBED_IN_DISEASE-part001.csv') - muh_csv = os.path.join(tmp_path, 'Is_Mutated_In-header.csv') - mup_1_csv = os.path.join(tmp_path, 'Is_Mutated_In-part000.csv') - mup_2_csv = os.path.join(tmp_path, 'Is_Mutated_In-part001.csv') - call_csv = os.path.join(tmp_path, 'arangodb-import-call.sh') + ph_csv = os.path.join(tmp_path, "Protein-header.csv") + pp_1_csv = os.path.join(tmp_path, "Protein-part000.csv") + pp_2_csv = os.path.join(tmp_path, "Protein-part001.csv") + mh_csv = os.path.join(tmp_path, "MicroRNA-header.csv") + mp_1_csv = os.path.join(tmp_path, "MicroRNA-part000.csv") + mp_2_csv = os.path.join(tmp_path, "MicroRNA-part001.csv") + dh_csv = os.path.join(tmp_path, "PERTURBED_IN_DISEASE-header.csv") + dp_1_csv = os.path.join(tmp_path, "PERTURBED_IN_DISEASE-part000.csv") + dp_2_csv = os.path.join(tmp_path, "PERTURBED_IN_DISEASE-part001.csv") + muh_csv = os.path.join(tmp_path, "Is_Mutated_In-header.csv") + mup_1_csv = os.path.join(tmp_path, "Is_Mutated_In-part000.csv") + mup_2_csv = os.path.join(tmp_path, "Is_Mutated_In-part001.csv") + call_csv = os.path.join(tmp_path, "arangodb-import-call.sh") with open(ph_csv) as f: ph = f.read() @@ -66,23 +66,31 @@ def test_arango_write_data_headers_import_call( with open(call_csv) as f: call = f.read() - assert ph == '_key,name,score,taxon,genes,id,preferred_id' - assert mh == '_key,name,taxon,id,preferred_id' - assert '_from' in dh - assert '_key' in dh - assert '_to' in dh - assert '_from' in muh - assert '_key' in muh - assert '_to' in muh - assert len(pp_1) == len(pp_2) == len(mp_1) == len(mp_2) == len(dp_1) == len( - dp_2 - ) == len(mup_1) == len(mup_2) == 2 - assert 'arangoimp --type csv' in call - assert '--collection proteins' in call - assert 'MicroRNA-part' in call + assert ph == "_key,name,score,taxon,genes,id,preferred_id" + assert mh == "_key,name,taxon,id,preferred_id" + assert "_from" in dh + assert "_key" in dh + assert "_to" in dh + assert "_from" in muh + assert "_key" in muh + assert "_to" in muh + assert ( + len(pp_1) + == len(pp_2) + == len(mp_1) + == len(mp_2) + == len(dp_1) + == len(dp_2) + == len(mup_1) + == len(mup_2) + == 2 + ) + assert "arangoimp --type csv" in call + assert "--collection proteins" in call + assert "MicroRNA-part" in call # custom import call executable path - bw_arango.import_call_bin_prefix = 'custom/path/to/' + bw_arango.import_call_bin_prefix = "custom/path/to/" os.remove(call_csv) bw_arango.write_import_call() @@ -90,4 +98,4 @@ def test_arango_write_data_headers_import_call( with open(call_csv) as f: call = f.read() - assert 'custom/path/to/arangoimp --type csv' in call + assert "custom/path/to/arangoimp --type csv" in call diff --git a/test/test_write_neo4j.py b/test/test_write_neo4j.py index c065e504..3092488d 100644 --- a/test/test_write_neo4j.py +++ b/test/test_write_neo4j.py @@ -8,12 +8,12 @@ def test_neo4j_writer_and_output_dir(bw): - tmp_path = bw.outdir assert ( - os.path.isdir(tmp_path) and isinstance(bw, _Neo4jBatchWriter) and - bw.delim == ';' + os.path.isdir(tmp_path) + and isinstance(bw, _Neo4jBatchWriter) + and bw.delim == ";" ) @@ -22,25 +22,25 @@ def test_create_import_call(bw): le = 4 for i in range(le): n = BioCypherNode( - f'i{i+1}', - 'post translational interaction', + f"i{i+1}", + "post translational interaction", ) e1 = BioCypherEdge( - source_id=f'i{i+1}', - target_id=f'p{i+1}', - relationship_label='IS_SOURCE_OF', + source_id=f"i{i+1}", + target_id=f"p{i+1}", + relationship_label="IS_SOURCE_OF", ) e2 = BioCypherEdge( - source_id=f'i{i}', - target_id=f'p{i+2}', - relationship_label='IS_TARGET_OF', + source_id=f"i{i}", + target_id=f"p{i+2}", + relationship_label="IS_TARGET_OF", ) mixed.append(BioCypherRelAsNode(n, e1, e2)) e3 = BioCypherEdge( - source_id=f'p{i+1}', - target_id=f'p{i+1}', - relationship_label='PERTURBED_IN_DISEASE', + source_id=f"p{i+1}", + target_id=f"p{i+1}", + relationship_label="PERTURBED_IN_DISEASE", ) mixed.append(e3) @@ -56,13 +56,25 @@ def gen(lis): assert passed assert 'bin/neo4j-admin import --database=neo4j --delimiter=";" ' in call assert '--array-delimiter="|" --quote="\'" --force=true ' in call - assert f'--nodes="{tmp_path}/PostTranslationalInteraction-header.csv,{tmp_path}/PostTranslationalInteraction-part.*" ' in call - assert f'--relationships="{tmp_path}/IS_SOURCE_OF-header.csv,{tmp_path}/IS_SOURCE_OF-part.*" ' in call - assert f'--relationships="{tmp_path}/IS_TARGET_OF-header.csv,{tmp_path}/IS_TARGET_OF-part.*" ' in call - assert f'--relationships="{tmp_path}/PERTURBED_IN_DISEASE-header.csv,{tmp_path}/PERTURBED_IN_DISEASE-part.*" ' in call + assert ( + f'--nodes="{tmp_path}/PostTranslationalInteraction-header.csv,{tmp_path}/PostTranslationalInteraction-part.*" ' + in call + ) + assert ( + f'--relationships="{tmp_path}/IS_SOURCE_OF-header.csv,{tmp_path}/IS_SOURCE_OF-part.*" ' + in call + ) + assert ( + f'--relationships="{tmp_path}/IS_TARGET_OF-header.csv,{tmp_path}/IS_TARGET_OF-part.*" ' + in call + ) + assert ( + f'--relationships="{tmp_path}/PERTURBED_IN_DISEASE-header.csv,{tmp_path}/PERTURBED_IN_DISEASE-part.*" ' + in call + ) -@pytest.mark.parametrize('l', [4], scope='module') +@pytest.mark.parametrize("l", [4], scope="module") def test_neo4j_write_node_data_headers_import_call(bw, _get_nodes): # four proteins, four miRNAs nodes = _get_nodes @@ -75,9 +87,9 @@ def test_neo4j_write_node_data_headers_import_call(bw, _get_nodes): tmp_path = bw.outdir - p_csv = os.path.join(tmp_path, 'Protein-header.csv') - m_csv = os.path.join(tmp_path, 'MicroRNA-header.csv') - call = os.path.join(tmp_path, 'neo4j-admin-import-call.sh') + p_csv = os.path.join(tmp_path, "Protein-header.csv") + m_csv = os.path.join(tmp_path, "MicroRNA-header.csv") + call = os.path.join(tmp_path, "neo4j-admin-import-call.sh") with open(p_csv) as f: p = f.read() @@ -86,20 +98,23 @@ def test_neo4j_write_node_data_headers_import_call(bw, _get_nodes): with open(call) as f: c = f.read() - assert p == ':ID;name;score:double;taxon:long;genes:string[];id;preferred_id;:LABEL' - assert m == ':ID;name;taxon:long;id;preferred_id;:LABEL' - assert 'bin/neo4j-admin import' in c - assert '--database=neo4j' in c + assert ( + p + == ":ID;name;score:double;taxon:long;genes:string[];id;preferred_id;:LABEL" + ) + assert m == ":ID;name;taxon:long;id;preferred_id;:LABEL" + assert "bin/neo4j-admin import" in c + assert "--database=neo4j" in c assert '--delimiter=";"' in c - assert '--force=true' in c + assert "--force=true" in c assert '--nodes="' in c - assert 'Protein-header.csv' in c + assert "Protein-header.csv" in c assert 'Protein-part.*"' in c - assert 'MicroRNA-header.csv' in c + assert "MicroRNA-header.csv" in c assert 'MicroRNA-part.*"' in c # custom import call executable path - bw.import_call_bin_prefix = 'custom/path/' + bw.import_call_bin_prefix = "custom/path/" os.remove(call) bw.write_import_call() @@ -107,7 +122,7 @@ def test_neo4j_write_node_data_headers_import_call(bw, _get_nodes): with open(call) as f: c = f.read() - assert 'custom/path/neo4j-admin import' in c + assert "custom/path/neo4j-admin import" in c # custom file prefix # TODO @@ -118,9 +133,9 @@ def test_write_hybrid_ontology_nodes(bw): for i in range(4): nodes.append( BioCypherNode( - node_id=f'agpl:000{i}', - node_label='altered gene product level', - properties={} + node_id=f"agpl:000{i}", + node_label="altered gene product level", + properties={}, ) ) @@ -130,8 +145,8 @@ def test_write_hybrid_ontology_nodes(bw): tmp_path = bw.outdir - h_csv = os.path.join(tmp_path, 'AlteredGeneProductLevel-header.csv') - p_csv = os.path.join(tmp_path, 'AlteredGeneProductLevel-part000.csv') + h_csv = os.path.join(tmp_path, "AlteredGeneProductLevel-header.csv") + p_csv = os.path.join(tmp_path, "AlteredGeneProductLevel-part000.csv") with open(h_csv) as f: header = f.read() @@ -139,23 +154,23 @@ def test_write_hybrid_ontology_nodes(bw): with open(p_csv) as f: part = f.read() - assert header == ':ID;id;preferred_id;:LABEL' + assert header == ":ID;id;preferred_id;:LABEL" assert "agpl:0000;'agpl:0000';'id'" in part - assert 'AlteredGeneProductLevel' in part - assert 'BiologicalEntity' in part + assert "AlteredGeneProductLevel" in part + assert "BiologicalEntity" in part def test_property_types(bw): nodes = [] for i in range(4): bnp = BioCypherNode( - node_id=f'p{i+1}', - node_label='protein', + node_id=f"p{i+1}", + node_label="protein", properties={ - 'score': 4 / (i + 1), - 'name': 'StringProperty1', - 'taxon': 9606, - 'genes': ['gene1', 'gene2'], + "score": 4 / (i + 1), + "name": "StringProperty1", + "taxon": 9606, + "genes": ["gene1", "gene2"], }, ) nodes.append(bnp) @@ -164,8 +179,8 @@ def test_property_types(bw): tmp_path = bw.outdir - d_csv = os.path.join(tmp_path, 'Protein-part000.csv') - h_csv = os.path.join(tmp_path, 'Protein-header.csv') + d_csv = os.path.join(tmp_path, "Protein-part000.csv") + h_csv = os.path.join(tmp_path, "Protein-header.csv") with open(d_csv) as f: data = f.read() @@ -174,12 +189,15 @@ def test_property_types(bw): header = f.read() assert passed - assert header == ':ID;name;score:double;taxon:long;genes:string[];id;preferred_id;:LABEL' + assert ( + header + == ":ID;name;score:double;taxon:long;genes:string[];id;preferred_id;:LABEL" + ) assert "p1;'StringProperty1';4.0;9606;'gene1|gene2';'p1';'id'" in data - assert 'BiologicalEntity' in data + assert "BiologicalEntity" in data -@pytest.mark.parametrize('l', [4], scope='module') +@pytest.mark.parametrize("l", [4], scope="module") def test_write_node_data_from_list(bw, _get_nodes): nodes = _get_nodes @@ -187,8 +205,8 @@ def test_write_node_data_from_list(bw, _get_nodes): tmp_path = bw.outdir - p_csv = os.path.join(tmp_path, 'Protein-part000.csv') - m_csv = os.path.join(tmp_path, 'MicroRNA-part000.csv') + p_csv = os.path.join(tmp_path, "Protein-part000.csv") + m_csv = os.path.join(tmp_path, "MicroRNA-part000.csv") with open(p_csv) as f: pr = f.read() @@ -198,12 +216,12 @@ def test_write_node_data_from_list(bw, _get_nodes): assert passed assert "p1;'StringProperty1';4.0;9606;'gene1|gene2';'p1';'uniprot'" in pr - assert 'BiologicalEntity' in pr + assert "BiologicalEntity" in pr assert "m1;'StringProperty1';9606;'m1';'mirbase'" in mi - assert 'ChemicalEntity' in mi + assert "ChemicalEntity" in mi -@pytest.mark.parametrize('l', [4], scope='module') +@pytest.mark.parametrize("l", [4], scope="module") def test_write_node_data_from_gen(bw, _get_nodes): nodes = _get_nodes @@ -214,8 +232,8 @@ def node_gen(nodes): tmp_path = bw.outdir - p_csv = os.path.join(tmp_path, 'Protein-part000.csv') - m_csv = os.path.join(tmp_path, 'MicroRNA-part000.csv') + p_csv = os.path.join(tmp_path, "Protein-part000.csv") + m_csv = os.path.join(tmp_path, "MicroRNA-part000.csv") with open(p_csv) as f: pr = f.read() @@ -225,9 +243,9 @@ def node_gen(nodes): assert passed assert "p1;'StringProperty1';4.0;9606;'gene1|gene2';'p1';'uniprot'" in pr - assert 'BiologicalEntity' in pr + assert "BiologicalEntity" in pr assert "m1;'StringProperty1';9606;'m1';'mirbase'" in mi - assert 'ChemicalEntity' in mi + assert "ChemicalEntity" in mi def test_write_node_data_from_gen_no_props(bw): @@ -235,19 +253,19 @@ def test_write_node_data_from_gen_no_props(bw): le = 4 for i in range(le): bnp = BioCypherNode( - node_id=f'p{i+1}', - node_label='protein', + node_id=f"p{i+1}", + node_label="protein", properties={ - 'score': 4 / (i + 1), - 'name': 'StringProperty1', - 'taxon': 9606, - 'genes': ['gene1', 'gene2'], + "score": 4 / (i + 1), + "name": "StringProperty1", + "taxon": 9606, + "genes": ["gene1", "gene2"], }, ) nodes.append(bnp) bnm = BioCypherNode( - node_id=f'm{i+1}', - node_label='microRNA', + node_id=f"m{i+1}", + node_label="microRNA", ) nodes.append(bnm) @@ -258,8 +276,8 @@ def node_gen(nodes): tmp_path = bw.outdir - p_csv = os.path.join(tmp_path, 'Protein-part000.csv') - m_csv = os.path.join(tmp_path, 'microRNA-part000.csv') + p_csv = os.path.join(tmp_path, "Protein-part000.csv") + m_csv = os.path.join(tmp_path, "microRNA-part000.csv") with open(p_csv) as f: pr = f.read() @@ -269,12 +287,12 @@ def node_gen(nodes): assert passed assert "p1;'StringProperty1';4.0;9606;'gene1|gene2';'p1';'id'" in pr - assert 'BiologicalEntity' in pr + assert "BiologicalEntity" in pr assert "m1;'m1';'id'" in mi - assert 'ChemicalEntity' in mi + assert "ChemicalEntity" in mi -@pytest.mark.parametrize('l', [int(1e4 + 4)], scope='module') +@pytest.mark.parametrize("l", [int(1e4 + 4)], scope="module") def test_write_node_data_from_large_gen(bw, _get_nodes): nodes = _get_nodes @@ -288,10 +306,10 @@ def node_gen(nodes): tmp_path = bw.outdir - p0_csv = os.path.join(tmp_path, 'Protein-part000.csv') - m0_csv = os.path.join(tmp_path, 'MicroRNA-part000.csv') - p1_csv = os.path.join(tmp_path, 'Protein-part001.csv') - m1_csv = os.path.join(tmp_path, 'MicroRNA-part001.csv') + p0_csv = os.path.join(tmp_path, "Protein-part000.csv") + m0_csv = os.path.join(tmp_path, "MicroRNA-part000.csv") + p1_csv = os.path.join(tmp_path, "Protein-part001.csv") + m1_csv = os.path.join(tmp_path, "MicroRNA-part001.csv") pr_lines = sum(1 for _ in open(p0_csv)) mi_lines = sum(1 for _ in open(m0_csv)) @@ -299,23 +317,26 @@ def node_gen(nodes): mi_lines1 = sum(1 for _ in open(m1_csv)) assert ( - passed and pr_lines == 1e4 and mi_lines == 1e4 and pr_lines1 == 4 and - mi_lines1 == 4 + passed + and pr_lines == 1e4 + and mi_lines == 1e4 + and pr_lines1 == 4 + and mi_lines1 == 4 ) -@pytest.mark.parametrize('l', [1], scope='module') +@pytest.mark.parametrize("l", [1], scope="module") def test_too_many_properties(bw, _get_nodes): nodes = _get_nodes bn1 = BioCypherNode( - node_id='p0', - node_label='protein', + node_id="p0", + node_label="protein", properties={ - 'p1': 'StringProperty1', - 'p2': 'StringProperty2', - 'p3': 'StringProperty3', - 'p4': 'StringProperty4', + "p1": "StringProperty1", + "p2": "StringProperty2", + "p3": "StringProperty3", + "p4": "StringProperty4", }, ) nodes.append(bn1) @@ -331,14 +352,14 @@ def node_gen(nodes): assert not passed -@pytest.mark.parametrize('l', [1], scope='module') +@pytest.mark.parametrize("l", [1], scope="module") def test_not_enough_properties(bw, _get_nodes): nodes = _get_nodes bn1 = BioCypherNode( - node_id='p0', - node_label='protein', - properties={'p1': 'StringProperty1'}, + node_id="p0", + node_label="protein", + properties={"p1": "StringProperty1"}, ) nodes.append(bn1) @@ -352,7 +373,7 @@ def node_gen(nodes): tmp_path = bw.outdir - p0_csv = os.path.join(tmp_path, 'Protein-part000.csv') + p0_csv = os.path.join(tmp_path, "Protein-part000.csv") assert not passed and not isfile(p0_csv) @@ -363,31 +384,31 @@ def test_write_none_type_property_and_order_invariance(bw): nodes = [] bnp1 = BioCypherNode( - node_id=f'p1', - node_label='protein', + node_id=f"p1", + node_label="protein", properties={ - 'taxon': 9606, - 'score': 1, - 'name': None, - 'genes': None, + "taxon": 9606, + "score": 1, + "name": None, + "genes": None, }, ) bnp2 = BioCypherNode( - node_id=f'p2', - node_label='protein', + node_id=f"p2", + node_label="protein", properties={ - 'name': None, - 'genes': ['gene1', 'gene2'], - 'score': 2, - 'taxon': 9606, + "name": None, + "genes": ["gene1", "gene2"], + "score": 2, + "taxon": 9606, }, ) bnm = BioCypherNode( - node_id=f'm1', - node_label='microRNA', + node_id=f"m1", + node_label="microRNA", properties={ - 'name': None, - 'taxon': 9606, + "name": None, + "taxon": 9606, }, ) nodes.append(bnp1) @@ -404,16 +425,16 @@ def node_gen(nodes): tmp_path = bw.outdir - p0_csv = os.path.join(tmp_path, 'Protein-part000.csv') + p0_csv = os.path.join(tmp_path, "Protein-part000.csv") with open(p0_csv) as f: p = f.read() assert passed assert "p1;;1;9606;;'p1';'id'" in p - assert 'BiologicalEntity' in p + assert "BiologicalEntity" in p -@pytest.mark.parametrize('l', [int(1e4)], scope='module') +@pytest.mark.parametrize("l", [int(1e4)], scope="module") def test_accidental_exact_batch_size(bw, _get_nodes): nodes = _get_nodes @@ -427,16 +448,16 @@ def node_gen(nodes): tmp_path = bw.outdir - p0_csv = os.path.join(tmp_path, 'Protein-part000.csv') - m0_csv = os.path.join(tmp_path, 'MicroRNA-part000.csv') - p1_csv = os.path.join(tmp_path, 'Protein-part001.csv') - m1_csv = os.path.join(tmp_path, 'MicroRNA-part001.csv') + p0_csv = os.path.join(tmp_path, "Protein-part000.csv") + m0_csv = os.path.join(tmp_path, "MicroRNA-part000.csv") + p1_csv = os.path.join(tmp_path, "Protein-part001.csv") + m1_csv = os.path.join(tmp_path, "MicroRNA-part001.csv") pr_lines = sum(1 for _ in open(p0_csv)) mi_lines = sum(1 for _ in open(m0_csv)) - ph_csv = os.path.join(tmp_path, 'Protein-header.csv') - mh_csv = os.path.join(tmp_path, 'MicroRNA-header.csv') + ph_csv = os.path.join(tmp_path, "Protein-header.csv") + mh_csv = os.path.join(tmp_path, "MicroRNA-header.csv") with open(ph_csv) as f: p = f.read() @@ -444,14 +465,18 @@ def node_gen(nodes): m = f.read() assert ( - passed and pr_lines == 1e4 and mi_lines == 1e4 and - not isfile(p1_csv) and not isfile(m1_csv) and p == - ':ID;name;score:double;taxon:long;genes:string[];id;preferred_id;:LABEL' - and m == ':ID;name;taxon:long;id;preferred_id;:LABEL' + passed + and pr_lines == 1e4 + and mi_lines == 1e4 + and not isfile(p1_csv) + and not isfile(m1_csv) + and p + == ":ID;name;score:double;taxon:long;genes:string[];id;preferred_id;:LABEL" + and m == ":ID;name;taxon:long;id;preferred_id;:LABEL" ) -@pytest.mark.parametrize('l', [4], scope='module') +@pytest.mark.parametrize("l", [4], scope="module") def test_write_edge_data_from_gen(bw, _get_edges): edges = _get_edges @@ -462,8 +487,8 @@ def edge_gen(edges): tmp_path = bw.outdir - pid_csv = os.path.join(tmp_path, 'PERTURBED_IN_DISEASE-part000.csv') - imi_csv = os.path.join(tmp_path, 'Is_Mutated_In-part000.csv') + pid_csv = os.path.join(tmp_path, "PERTURBED_IN_DISEASE-part000.csv") + imi_csv = os.path.join(tmp_path, "Is_Mutated_In-part000.csv") with open(pid_csv) as f: l = f.read() @@ -483,7 +508,7 @@ def edge_gen(edges): assert "4;" in l assert "p2;" in l assert "PERTURBED_IN_DISEASE" in l - assert '\n' in l + assert "\n" in l assert "m0;" in c assert "mrel0;" in c assert "'3-UTR';" in c @@ -496,12 +521,11 @@ def edge_gen(edges): assert "1;" in c assert "p2;" in c assert "Is_Mutated_In" in c - assert '\n' in c + assert "\n" in c -@pytest.mark.parametrize('l', [int(1e4 + 4)], scope='module') +@pytest.mark.parametrize("l", [int(1e4 + 4)], scope="module") def test_write_edge_data_from_large_gen(bw, _get_edges): - edges = _get_edges def edge_gen(edges): @@ -511,10 +535,10 @@ def edge_gen(edges): tmp_path = bw.outdir - apl0_csv = os.path.join(tmp_path, 'PERTURBED_IN_DISEASE-part000.csv') - ips0_csv = os.path.join(tmp_path, 'Is_Mutated_In-part000.csv') - apl1_csv = os.path.join(tmp_path, 'PERTURBED_IN_DISEASE-part001.csv') - ips1_csv = os.path.join(tmp_path, 'Is_Mutated_In-part001.csv') + apl0_csv = os.path.join(tmp_path, "PERTURBED_IN_DISEASE-part000.csv") + ips0_csv = os.path.join(tmp_path, "Is_Mutated_In-part000.csv") + apl1_csv = os.path.join(tmp_path, "PERTURBED_IN_DISEASE-part001.csv") + ips1_csv = os.path.join(tmp_path, "Is_Mutated_In-part001.csv") l_lines0 = sum(1 for _ in open(apl0_csv)) c_lines0 = sum(1 for _ in open(ips0_csv)) @@ -522,12 +546,15 @@ def edge_gen(edges): c_lines1 = sum(1 for _ in open(ips1_csv)) assert ( - passed and l_lines0 == 1e4 and c_lines0 == 1e4 and l_lines1 == 4 and - c_lines1 == 4 + passed + and l_lines0 == 1e4 + and c_lines0 == 1e4 + and l_lines1 == 4 + and c_lines1 == 4 ) -@pytest.mark.parametrize('l', [4], scope='module') +@pytest.mark.parametrize("l", [4], scope="module") def test_write_edge_data_from_list(bw, _get_edges): edges = _get_edges @@ -535,8 +562,8 @@ def test_write_edge_data_from_list(bw, _get_edges): tmp_path = bw.outdir - apl_csv = os.path.join(tmp_path, 'PERTURBED_IN_DISEASE-part000.csv') - ips_csv = os.path.join(tmp_path, 'Is_Mutated_In-part000.csv') + apl_csv = os.path.join(tmp_path, "PERTURBED_IN_DISEASE-part000.csv") + ips_csv = os.path.join(tmp_path, "Is_Mutated_In-part000.csv") with open(apl_csv) as f: l = f.read() @@ -547,7 +574,7 @@ def test_write_edge_data_from_list(bw, _get_edges): assert "p0;" in l assert "prel0;" in l assert "'T253';" in l - assert "4;" in l + assert "4;" in l assert "p1;" in l assert "PERTURBED_IN_DISEASE" in l assert "\n" in l @@ -559,9 +586,10 @@ def test_write_edge_data_from_list(bw, _get_edges): assert "p1;" in c assert "Is_Mutated_In" in c assert "m1;" in c - assert '\n' in c - -@pytest.mark.parametrize('l', [4], scope='module') + assert "\n" in c + + +@pytest.mark.parametrize("l", [4], scope="module") def test_write_edge_id_optional(bw, _get_edges): edges = _get_edges @@ -580,8 +608,8 @@ def test_write_edge_id_optional(bw, _get_edges): tmp_path = bw.outdir - pert_csv = os.path.join(tmp_path, 'PERTURBED_IN_DISEASE-part000.csv') - phos_csv = os.path.join(tmp_path, 'Phosphorylation-part000.csv') + pert_csv = os.path.join(tmp_path, "PERTURBED_IN_DISEASE-part000.csv") + phos_csv = os.path.join(tmp_path, "Phosphorylation-part000.csv") with open(pert_csv) as f: pertf = f.read() @@ -591,8 +619,8 @@ def test_write_edge_id_optional(bw, _get_edges): assert "prel0;" in pertf assert "phos1;" not in phosf - pert_header = os.path.join(tmp_path, 'PERTURBED_IN_DISEASE-header.csv') - phos_header = os.path.join(tmp_path, 'Phosphorylation-header.csv') + pert_header = os.path.join(tmp_path, "PERTURBED_IN_DISEASE-header.csv") + phos_header = os.path.join(tmp_path, "Phosphorylation-header.csv") with open(pert_header) as f: perth = f.read() @@ -602,20 +630,21 @@ def test_write_edge_id_optional(bw, _get_edges): assert "id;" in perth assert "id;" not in phosh + def test_write_edge_data_from_list_no_props(bw): le = 4 edges = [] for i in range(le): e1 = BioCypherEdge( - source_id=f'p{i}', - target_id=f'p{i + 1}', - relationship_label='PERTURBED_IN_DISEASE', + source_id=f"p{i}", + target_id=f"p{i + 1}", + relationship_label="PERTURBED_IN_DISEASE", ) edges.append(e1) e2 = BioCypherEdge( - source_id=f'm{i}', - target_id=f'p{i + 1}', - relationship_label='Is_Mutated_In', + source_id=f"m{i}", + target_id=f"p{i + 1}", + relationship_label="Is_Mutated_In", ) edges.append(e2) @@ -623,8 +652,8 @@ def test_write_edge_data_from_list_no_props(bw): tmp_path = bw.outdir - ptl_csv = os.path.join(tmp_path, 'PERTURBED_IN_DISEASE-part000.csv') - pts_csv = os.path.join(tmp_path, 'Is_Mutated_In-part000.csv') + ptl_csv = os.path.join(tmp_path, "PERTURBED_IN_DISEASE-part000.csv") + pts_csv = os.path.join(tmp_path, "Is_Mutated_In-part000.csv") with open(ptl_csv) as f: l = f.read() @@ -632,23 +661,23 @@ def test_write_edge_data_from_list_no_props(bw): c = f.read() assert passed - assert 'p0;' in l - assert 'p1;' in l - assert 'PERTURBED_IN_DISEASE' in l - assert 'p1;' in l - assert 'p2;' in l - assert 'PERTURBED_IN_DISEASE' in l - assert '\n' in l - assert 'm0;' in c - assert 'p1;' in c - assert 'Is_Mutated_In' in c - assert 'm1;' in c - assert 'p2;' in c - assert 'Is_Mutated_In' in c - assert '\n' in c - - -@pytest.mark.parametrize('l', [8], scope='module') + assert "p0;" in l + assert "p1;" in l + assert "PERTURBED_IN_DISEASE" in l + assert "p1;" in l + assert "p2;" in l + assert "PERTURBED_IN_DISEASE" in l + assert "\n" in l + assert "m0;" in c + assert "p1;" in c + assert "Is_Mutated_In" in c + assert "m1;" in c + assert "p2;" in c + assert "Is_Mutated_In" in c + assert "\n" in c + + +@pytest.mark.parametrize("l", [8], scope="module") def test_write_edge_data_headers_import_call(bw, _get_nodes, _get_edges): edges = _get_edges @@ -673,9 +702,9 @@ def edge_gen2(edges): tmp_path = bw.outdir - ptl_csv = os.path.join(tmp_path, 'PERTURBED_IN_DISEASE-header.csv') - pts_csv = os.path.join(tmp_path, 'Is_Mutated_In-header.csv') - call_csv = os.path.join(tmp_path, 'neo4j-admin-import-call.sh') + ptl_csv = os.path.join(tmp_path, "PERTURBED_IN_DISEASE-header.csv") + pts_csv = os.path.join(tmp_path, "Is_Mutated_In-header.csv") + call_csv = os.path.join(tmp_path, "neo4j-admin-import-call.sh") with open(ptl_csv) as f: l = f.read() @@ -684,19 +713,19 @@ def edge_gen2(edges): with open(call_csv) as f: call = f.read() - assert l == ':START_ID;id;residue;level:long;:END_ID;:TYPE' - assert c == ':START_ID;id;site;confidence:long;:END_ID;:TYPE' + assert l == ":START_ID;id;residue;level:long;:END_ID;:TYPE" + assert c == ":START_ID;id;site;confidence:long;:END_ID;:TYPE" - assert 'bin/neo4j-admin import' in call - assert '--database=neo4j' in call + assert "bin/neo4j-admin import" in call + assert "--database=neo4j" in call assert '--delimiter=";"' in call - assert '--force=true' in call + assert "--force=true" in call assert '--nodes="' in call - assert 'PERTURBED_IN_DISEASE' in call - assert 'Is_Mutated_In' in call + assert "PERTURBED_IN_DISEASE" in call + assert "Is_Mutated_In" in call -@pytest.mark.parametrize('l', [4], scope='module') +@pytest.mark.parametrize("l", [4], scope="module") def test_write_duplicate_edges(bw, _get_edges): edges = _get_edges edges.append(edges[0]) @@ -705,8 +734,8 @@ def test_write_duplicate_edges(bw, _get_edges): tmp_path = bw.outdir - ptl_csv = os.path.join(tmp_path, 'PERTURBED_IN_DISEASE-part000.csv') - pts_csv = os.path.join(tmp_path, 'Is_Mutated_In-part000.csv') + ptl_csv = os.path.join(tmp_path, "PERTURBED_IN_DISEASE-part000.csv") + pts_csv = os.path.join(tmp_path, "Is_Mutated_In-part000.csv") l = sum(1 for _ in open(ptl_csv)) c = sum(1 for _ in open(pts_csv)) @@ -724,9 +753,9 @@ def gen(lis): tmp_path = bw.outdir - iso_csv = os.path.join(tmp_path, 'IS_SOURCE_OF-part000.csv') - ito_csv = os.path.join(tmp_path, 'IS_TARGET_OF-part000.csv') - pmi_csv = os.path.join(tmp_path, 'PostTranslationalInteraction-part000.csv') + iso_csv = os.path.join(tmp_path, "IS_SOURCE_OF-part000.csv") + ito_csv = os.path.join(tmp_path, "IS_TARGET_OF-part000.csv") + pmi_csv = os.path.join(tmp_path, "PostTranslationalInteraction-part000.csv") with open(iso_csv) as f: s = f.read() @@ -736,39 +765,39 @@ def gen(lis): p = f.read() assert passed - assert 'i1;' in s - assert 'p1;' in s - assert 'IS_SOURCE_OF' in s - assert '\n' in s - assert 'i0;' in t - assert 'p2;' in t - assert 'IS_TARGET_OF' in t - assert '\n' in t + assert "i1;" in s + assert "p1;" in s + assert "IS_SOURCE_OF" in s + assert "\n" in s + assert "i0;" in t + assert "p2;" in t + assert "IS_TARGET_OF" in t + assert "\n" in t assert "i1;True;-1;'i1';'id'" in p - assert 'Association' in p - assert '\n' in p + assert "Association" in p + assert "\n" in p def _get_rel_as_nodes(l): rels = [] for i in range(l): n = BioCypherNode( - node_id=f'i{i+1}', - node_label='post translational interaction', + node_id=f"i{i+1}", + node_label="post translational interaction", properties={ - 'directed': True, - 'effect': -1, + "directed": True, + "effect": -1, }, ) e1 = BioCypherEdge( - source_id=f'i{i+1}', - target_id=f'p{i+1}', - relationship_label='IS_SOURCE_OF', + source_id=f"i{i+1}", + target_id=f"p{i+1}", + relationship_label="IS_SOURCE_OF", ) e2 = BioCypherEdge( - source_id=f'i{i}', - target_id=f'p{i + 2}', - relationship_label='IS_TARGET_OF', + source_id=f"i{i}", + target_id=f"p{i + 2}", + relationship_label="IS_TARGET_OF", ) rels.append(BioCypherRelAsNode(n, e1, e2)) return rels @@ -790,7 +819,7 @@ def gen2(lis): tmp_path = bw.outdir - iso_csv = os.path.join(tmp_path, 'IS_SOURCE_OF-part001.csv') + iso_csv = os.path.join(tmp_path, "IS_SOURCE_OF-part001.csv") assert passed1 and passed2 and isfile(iso_csv) @@ -800,25 +829,25 @@ def test_write_mixed_edges(bw): le = 4 for i in range(le): e3 = BioCypherEdge( - source_id=f'p{i+1}', - target_id=f'p{i+1}', - relationship_label='PERTURBED_IN_DISEASE', + source_id=f"p{i+1}", + target_id=f"p{i+1}", + relationship_label="PERTURBED_IN_DISEASE", ) mixed.append(e3) n = BioCypherNode( - f'i{i+1}', - 'post translational interaction', + f"i{i+1}", + "post translational interaction", ) e1 = BioCypherEdge( - source_id=f'i{i+1}', - target_id=f'p{i+1}', - relationship_label='IS_SOURCE_OF', + source_id=f"i{i+1}", + target_id=f"p{i+1}", + relationship_label="IS_SOURCE_OF", ) e2 = BioCypherEdge( - source_id=f'i{i}', - target_id=f'p{i+2}', - relationship_label='IS_TARGET_OF', + source_id=f"i{i}", + target_id=f"p{i+2}", + relationship_label="IS_TARGET_OF", ) mixed.append(BioCypherRelAsNode(n, e1, e2)) @@ -829,24 +858,26 @@ def gen(lis): tmp_path = bw.outdir - pmi_csv = os.path.join(tmp_path, 'PostTranslationalInteraction-header.csv') - iso_csv = os.path.join(tmp_path, 'IS_SOURCE_OF-header.csv') - ito_csv = os.path.join(tmp_path, 'IS_TARGET_OF-header.csv') - ipt_csv = os.path.join(tmp_path, 'PERTURBED_IN_DISEASE-header.csv') + pmi_csv = os.path.join(tmp_path, "PostTranslationalInteraction-header.csv") + iso_csv = os.path.join(tmp_path, "IS_SOURCE_OF-header.csv") + ito_csv = os.path.join(tmp_path, "IS_TARGET_OF-header.csv") + ipt_csv = os.path.join(tmp_path, "PERTURBED_IN_DISEASE-header.csv") assert ( - passed and os.path.isfile(pmi_csv) and os.path.isfile(iso_csv) and - os.path.isfile(ito_csv) and os.path.isfile(ipt_csv) + passed + and os.path.isfile(pmi_csv) + and os.path.isfile(iso_csv) + and os.path.isfile(ito_csv) + and os.path.isfile(ipt_csv) ) def test_duplicate_id(bw): - nodes = [] tmp_path = bw.outdir - csv = os.path.join(tmp_path, 'Protein-part000.csv') + csv = os.path.join(tmp_path, "Protein-part000.csv") # remove csv file in path if os.path.exists(csv): @@ -855,13 +886,13 @@ def test_duplicate_id(bw): # four proteins, four miRNAs for _ in range(2): bnp = BioCypherNode( - node_id=f'p1', - node_label='protein', + node_id=f"p1", + node_label="protein", properties={ - 'name': 'StringProperty1', - 'score': 4.32, - 'taxon': 9606, - 'genes': ['gene1', 'gene2'], + "name": "StringProperty1", + "score": 4.32, + "taxon": 9606, + "genes": ["gene1", "gene2"], }, ) nodes.append(bnp) @@ -874,12 +905,11 @@ def test_duplicate_id(bw): def test_write_synonym(bw): - nodes = [] tmp_path = bw.outdir - csv = os.path.join(tmp_path, 'Complex-part000.csv') + csv = os.path.join(tmp_path, "Complex-part000.csv") # remove csv file in path if os.path.exists(csv): @@ -887,12 +917,12 @@ def test_write_synonym(bw): # four proteins, four miRNAs for _ in range(4): bnp = BioCypherNode( - node_id=f'p{_+1}', - node_label='complex', + node_id=f"p{_+1}", + node_label="complex", properties={ - 'name': 'StringProperty1', - 'score': 4.32, - 'taxon': 9606, + "name": "StringProperty1", + "score": 4.32, + "taxon": 9606, }, ) nodes.append(bnp) @@ -904,21 +934,21 @@ def test_write_synonym(bw): assert passed and os.path.exists(csv) assert "p1;'StringProperty1';4.32;9606;'p1';'id'" in comp - assert 'Complex' in comp + assert "Complex" in comp -def test_write_strict(bw_strict): +def test_write_strict(bw_strict): n1 = BioCypherNode( - node_id='p1', - node_label='protein', + node_id="p1", + node_label="protein", properties={ - 'name': 'StringProperty1', - 'score': 4.32, - 'taxon': 9606, - 'genes': ['gene1', 'gene2'], - 'source': 'source1', - 'version': 'version1', - 'licence': 'licence1', + "name": "StringProperty1", + "score": 4.32, + "taxon": 9606, + "genes": ["gene1", "gene2"], + "source": "source1", + "version": "version1", + "licence": "licence1", }, ) @@ -928,30 +958,32 @@ def test_write_strict(bw_strict): tmp_path = bw_strict.outdir - csv = os.path.join(tmp_path, 'Protein-part000.csv') + csv = os.path.join(tmp_path, "Protein-part000.csv") with open(csv) as f: prot = f.read() - assert "p1;'StringProperty1';4.32;9606;'gene1|gene2';'p1';'id';'source1';'version1';'licence1'" in prot - assert 'BiologicalEntity' in prot + assert ( + "p1;'StringProperty1';4.32;9606;'gene1|gene2';'p1';'id';'source1';'version1';'licence1'" + in prot + ) + assert "BiologicalEntity" in prot -@pytest.mark.parametrize('l', [4], scope='module') +@pytest.mark.parametrize("l", [4], scope="module") def test_tab_delimiter(bw_tab, _get_nodes): - passed = bw_tab.write_nodes(_get_nodes) assert passed tmp_path = bw_tab.outdir - header = os.path.join(tmp_path, 'Protein-header.csv') + header = os.path.join(tmp_path, "Protein-header.csv") with open(header) as f: prot = f.read() - assert '\t' in prot + assert "\t" in prot call = bw_tab._construct_import_call() diff --git a/test/test_write_postgres.py b/test/test_write_postgres.py index 6ffd1930..cbad24c7 100644 --- a/test/test_write_postgres.py +++ b/test/test_write_postgres.py @@ -4,7 +4,7 @@ import pytest -@pytest.mark.parametrize('l', [4], scope='module') +@pytest.mark.parametrize("l", [4], scope="module") def test_write_node_data_from_gen_comma_postgresql( bw_comma_postgresql, _get_nodes ): @@ -20,8 +20,8 @@ def node_gen(nodes): tmp_path = bw_comma_postgresql.outdir - p_csv = os.path.join(tmp_path, 'Protein-part000.csv') - m_csv = os.path.join(tmp_path, 'MicroRNA-part000.csv') + p_csv = os.path.join(tmp_path, "Protein-part000.csv") + m_csv = os.path.join(tmp_path, "MicroRNA-part000.csv") with open(p_csv) as f: pr = f.read() @@ -30,15 +30,15 @@ def node_gen(nodes): mi = f.read() assert 'p1,"StringProperty1",4.0,9606' in pr - assert 'uniprot' in pr - assert 'BiologicalEntity' in pr - assert 'Polypeptide' in pr - assert 'Protein' in pr + assert "uniprot" in pr + assert "BiologicalEntity" in pr + assert "Polypeptide" in pr + assert "Protein" in pr assert 'm1,"StringProperty1",9606,"m1","mirbase"' in mi - assert 'ChemicalEntity' in mi + assert "ChemicalEntity" in mi -@pytest.mark.parametrize('l', [4], scope='module') +@pytest.mark.parametrize("l", [4], scope="module") def test_write_node_data_from_gen_tab_postgresql(bw_tab_postgresql, _get_nodes): nodes = _get_nodes @@ -49,8 +49,8 @@ def node_gen(nodes): tmp_path = bw_tab_postgresql.outdir - p_csv = os.path.join(tmp_path, 'Protein-part000.csv') - m_csv = os.path.join(tmp_path, 'MicroRNA-part000.csv') + p_csv = os.path.join(tmp_path, "Protein-part000.csv") + m_csv = os.path.join(tmp_path, "MicroRNA-part000.csv") with open(p_csv) as f: pr = f.read() @@ -61,19 +61,25 @@ def node_gen(nodes): assert passed assert 'p1\t"StringProperty1"\t4.0\t9606\t' in pr assert '\t"uniprot"\t' in pr - assert 'BiologicalEntity' in pr - assert 'Polypeptide' in pr - assert 'Protein' in pr + assert "BiologicalEntity" in pr + assert "Polypeptide" in pr + assert "Protein" in pr assert 'm1\t"StringProperty1"\t9606\t"m1"\t"mirbase"' in mi - assert 'ChemicalEntity' in mi + assert "ChemicalEntity" in mi @pytest.mark.requires_postgresql -@pytest.mark.parametrize('l', [4], scope='module') +@pytest.mark.parametrize("l", [4], scope="module") def test_database_import_node_data_from_gen_comma_postgresql( bw_comma_postgresql, _get_nodes, create_database_postgres ): - dbname, user, port, password, create_database_success = create_database_postgres + ( + dbname, + user, + port, + password, + create_database_success, + ) = create_database_postgres assert create_database_success nodes = _get_nodes @@ -88,8 +94,10 @@ def node_gen(nodes): # verify that all files have been created assert set(os.listdir(tmp_path)) == set( [ - 'protein-create_table.sql', 'Protein-part000.csv', - 'microrna-create_table.sql', 'MicroRNA-part000.csv' + "protein-create_table.sql", + "Protein-part000.csv", + "microrna-create_table.sql", + "MicroRNA-part000.csv", ] ) @@ -97,7 +105,8 @@ def node_gen(nodes): # verify that import call has been created import_scripts = [ name - for name in os.listdir(tmp_path) if name.endswith('-import-call.sh') + for name in os.listdir(tmp_path) + if name.endswith("-import-call.sh") ] assert len(import_scripts) == 1 @@ -112,32 +121,38 @@ def node_gen(nodes): assert result.returncode == 0 # check data in the databases - command = f'PGPASSWORD={password} psql -c \'SELECT COUNT(*) FROM protein;\' --dbname {dbname} --port {port} --user {user}' + command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM protein;' --dbname {dbname} --port {port} --user {user}" result = subprocess.run( command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) # subprocess success assert result.returncode == 0 # 4 entires in table - assert '4' in result.stdout.decode() + assert "4" in result.stdout.decode() # check data in the databases - command = f'PGPASSWORD={password} psql -c \'SELECT COUNT(*) FROM microrna;\' --dbname {dbname} --port {port} --user {user}' + command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM microrna;' --dbname {dbname} --port {port} --user {user}" result = subprocess.run( command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) # subprocess success assert result.returncode == 0 # 4 entires in table - assert '4' in result.stdout.decode() + assert "4" in result.stdout.decode() @pytest.mark.requires_postgresql -@pytest.mark.parametrize('l', [5], scope='module') +@pytest.mark.parametrize("l", [5], scope="module") def test_database_import_node_data_from_gen_tab_postgresql( bw_tab_postgresql, _get_nodes, create_database_postgres ): - dbname, user, port, password, create_database_success = create_database_postgres + ( + dbname, + user, + port, + password, + create_database_success, + ) = create_database_postgres assert create_database_success nodes = _get_nodes @@ -152,8 +167,10 @@ def node_gen(nodes): # verify that all files have been created assert set(os.listdir(tmp_path)) == set( [ - 'protein-create_table.sql', 'Protein-part000.csv', - 'microrna-create_table.sql', 'MicroRNA-part000.csv' + "protein-create_table.sql", + "Protein-part000.csv", + "microrna-create_table.sql", + "MicroRNA-part000.csv", ] ) @@ -161,7 +178,8 @@ def node_gen(nodes): # verify that import call has been created import_scripts = [ name - for name in os.listdir(tmp_path) if name.endswith('-import-call.sh') + for name in os.listdir(tmp_path) + if name.endswith("-import-call.sh") ] assert len(import_scripts) == 1 @@ -176,32 +194,38 @@ def node_gen(nodes): assert result.returncode == 0 # check data in the databases - command = f'PGPASSWORD={password} psql -c \'SELECT COUNT(*) FROM protein;\' --dbname {dbname} --port {port} --user {user}' + command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM protein;' --dbname {dbname} --port {port} --user {user}" result = subprocess.run( command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) # subprocess success assert result.returncode == 0 # 5 entires in table - assert '5' in result.stdout.decode() + assert "5" in result.stdout.decode() # check data in the databases - command = f'PGPASSWORD={password} psql -c \'SELECT COUNT(*) FROM microrna;\' --dbname {dbname} --port {port} --user {user}' + command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM microrna;' --dbname {dbname} --port {port} --user {user}" result = subprocess.run( command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) # subprocess success assert result.returncode == 0 # 5 entires in table - assert '5' in result.stdout.decode() + assert "5" in result.stdout.decode() @pytest.mark.requires_postgresql -@pytest.mark.parametrize('l', [8], scope='module') +@pytest.mark.parametrize("l", [8], scope="module") def test_database_import_edge_data_from_gen_comma_postgresql( bw_comma_postgresql, _get_nodes, create_database_postgres, _get_edges ): - dbname, user, port, password, create_database_success = create_database_postgres + ( + dbname, + user, + port, + password, + create_database_success, + ) = create_database_postgres assert create_database_success edges = _get_edges @@ -227,7 +251,8 @@ def edge_gen2(edges): # verify that import call has been created import_scripts = [ name - for name in os.listdir(tmp_path) if name.endswith('-import-call.sh') + for name in os.listdir(tmp_path) + if name.endswith("-import-call.sh") ] assert len(import_scripts) == 1 @@ -237,9 +262,9 @@ def edge_gen2(edges): commands = f.readlines() assert len(commands) > 0 - assert str(tmp_path) in '\n'.join(commands) - assert 'protein-create_table.sql' in '\n'.join(commands) - assert '--user' in '\n'.join(commands) + assert str(tmp_path) in "\n".join(commands) + assert "protein-create_table.sql" in "\n".join(commands) + assert "--user" in "\n".join(commands) for command in commands: result = subprocess.run(command, shell=True) @@ -247,31 +272,37 @@ def edge_gen2(edges): assert result.returncode == 0 # check data in the databases - command = f'PGPASSWORD={password} psql -c \'SELECT COUNT(*) FROM is_mutated_in;\' --dbname {dbname} --port {port} --user {user}' + command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM is_mutated_in;' --dbname {dbname} --port {port} --user {user}" result = subprocess.run( command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) # subprocess success assert result.returncode == 0 # 2 entries in table - assert '8' in result.stdout.decode() + assert "8" in result.stdout.decode() - command = f'PGPASSWORD={password} psql -c \'SELECT COUNT(*) FROM perturbed_in_disease;\' --dbname {dbname} --port {port} --user {user}' + command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM perturbed_in_disease;' --dbname {dbname} --port {port} --user {user}" result = subprocess.run( command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) # subprocess success assert result.returncode == 0 # 2 entries in table - assert '8' in result.stdout.decode() + assert "8" in result.stdout.decode() @pytest.mark.requires_postgresql -@pytest.mark.parametrize('l', [8], scope='module') +@pytest.mark.parametrize("l", [8], scope="module") def test_database_import_edge_data_from_gen_tab_postgresql( bw_tab_postgresql, _get_nodes, create_database_postgres, _get_edges ): - dbname, user, port, password, create_database_success = create_database_postgres + ( + dbname, + user, + port, + password, + create_database_success, + ) = create_database_postgres assert create_database_success edges = _get_edges @@ -297,7 +328,8 @@ def edge_gen2(edges): # verify that import call has been created import_scripts = [ name - for name in os.listdir(tmp_path) if name.endswith('-import-call.sh') + for name in os.listdir(tmp_path) + if name.endswith("-import-call.sh") ] assert len(import_scripts) == 1 @@ -307,29 +339,29 @@ def edge_gen2(edges): commands = f.readlines() assert len(commands) > 1 - assert str(tmp_path) in '\n'.join(commands) - assert 'protein-create_table.sql' in '\n'.join(commands) - assert '--user' in '\n'.join(commands) + assert str(tmp_path) in "\n".join(commands) + assert "protein-create_table.sql" in "\n".join(commands) + assert "--user" in "\n".join(commands) for command in commands: result = subprocess.run(command, shell=True) assert result.returncode == 0 # check data in the databases - command = f'PGPASSWORD={password} psql -c \'SELECT COUNT(*) FROM is_mutated_in;\' --dbname {dbname} --port {port} --user {user}' + command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM is_mutated_in;' --dbname {dbname} --port {port} --user {user}" result = subprocess.run( command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) # subprocess success assert result.returncode == 0 # 2 entires in table - assert '8' in result.stdout.decode() + assert "8" in result.stdout.decode() - command = f'PGPASSWORD={password} psql -c \'SELECT COUNT(*) FROM perturbed_in_disease;\' --dbname {dbname} --port {port} --user {user}' + command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM perturbed_in_disease;' --dbname {dbname} --port {port} --user {user}" result = subprocess.run( command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) # subprocess success assert result.returncode == 0 # 2 entires in table - assert '8' in result.stdout.decode() + assert "8" in result.stdout.decode() diff --git a/tutorial/01__basic_import.py b/tutorial/01__basic_import.py index 7bfdb0ec..861f7abe 100644 --- a/tutorial/01__basic_import.py +++ b/tutorial/01__basic_import.py @@ -17,8 +17,8 @@ def node_generator(): # Create BioCypher driver bc = BioCypher( - biocypher_config_path='tutorial/01_biocypher_config.yaml', - schema_config_path='tutorial/01_schema_config.yaml', + biocypher_config_path="tutorial/01_biocypher_config.yaml", + schema_config_path="tutorial/01_schema_config.yaml", ) # Run the import bc.write_nodes(node_generator()) @@ -27,5 +27,5 @@ def node_generator(): bc.write_import_call() -if __name__ == '__main__': +if __name__ == "__main__": main() diff --git a/tutorial/01__basic_import_pandas.py b/tutorial/01__basic_import_pandas.py index b0b26a4a..e12c4cc9 100644 --- a/tutorial/01__basic_import_pandas.py +++ b/tutorial/01__basic_import_pandas.py @@ -17,12 +17,13 @@ def node_generator(): # Create BioCypher driver bc = BioCypher( - biocypher_config_path='tutorial/01_biocypher_config.yaml', - schema_config_path='tutorial/01_schema_config.yaml', + biocypher_config_path="tutorial/01_biocypher_config.yaml", + schema_config_path="tutorial/01_schema_config.yaml", ) # Run the import bc.add(node_generator()) bc.to_df() -if __name__ == '__main__': + +if __name__ == "__main__": main() diff --git a/tutorial/02__merge.py b/tutorial/02__merge.py index 245be65f..7141f133 100644 --- a/tutorial/02__merge.py +++ b/tutorial/02__merge.py @@ -5,10 +5,12 @@ def main(): # Setup: create a list of proteins to be imported proteins = [ - p for sublist in zip( + p + for sublist in zip( [Protein() for _ in range(10)], [EntrezProtein() for _ in range(10)], - ) for p in sublist + ) + for p in sublist ] # Extract id, label, and property dictionary @@ -22,8 +24,8 @@ def node_generator(): # Create BioCypher driver bc = BioCypher( - biocypher_config_path='tutorial/02_biocypher_config.yaml', - schema_config_path='tutorial/02_schema_config.yaml', + biocypher_config_path="tutorial/02_biocypher_config.yaml", + schema_config_path="tutorial/02_schema_config.yaml", ) # Run the import bc.write_nodes(node_generator()) @@ -32,5 +34,5 @@ def node_generator(): bc.write_import_call() -if __name__ == '__main__': +if __name__ == "__main__": main() diff --git a/tutorial/02__merge_pandas.py b/tutorial/02__merge_pandas.py index a3583bb6..6f9aa126 100644 --- a/tutorial/02__merge_pandas.py +++ b/tutorial/02__merge_pandas.py @@ -5,10 +5,12 @@ def main(): # Setup: create a list of proteins to be imported proteins = [ - p for sublist in zip( + p + for sublist in zip( [Protein() for _ in range(10)], [EntrezProtein() for _ in range(10)], - ) for p in sublist + ) + for p in sublist ] # Extract id, label, and property dictionary @@ -22,8 +24,8 @@ def node_generator(): # Create BioCypher driver bc = BioCypher( - biocypher_config_path='tutorial/02_biocypher_config.yaml', - schema_config_path='tutorial/02_schema_config.yaml', + biocypher_config_path="tutorial/02_biocypher_config.yaml", + schema_config_path="tutorial/02_schema_config.yaml", ) # Run the import bc.add(node_generator()) @@ -31,5 +33,5 @@ def node_generator(): print(bc.to_df()) -if __name__ == '__main__': +if __name__ == "__main__": main() diff --git a/tutorial/03__implicit_subclass.py b/tutorial/03__implicit_subclass.py index 7ba277be..1c43269f 100644 --- a/tutorial/03__implicit_subclass.py +++ b/tutorial/03__implicit_subclass.py @@ -5,10 +5,12 @@ def main(): # Setup: create a list of proteins to be imported proteins = [ - p for sublist in zip( + p + for sublist in zip( [Protein() for _ in range(10)], [EntrezProtein() for _ in range(10)], - ) for p in sublist + ) + for p in sublist ] # Extract id, label, and property dictionary @@ -22,8 +24,8 @@ def node_generator(): # Create BioCypher driver bc = BioCypher( - biocypher_config_path='tutorial/03_biocypher_config.yaml', - schema_config_path='tutorial/03_schema_config.yaml', + biocypher_config_path="tutorial/03_biocypher_config.yaml", + schema_config_path="tutorial/03_schema_config.yaml", ) # Run the import bc.write_nodes(node_generator()) @@ -32,5 +34,5 @@ def node_generator(): bc.write_import_call() -if __name__ == '__main__': +if __name__ == "__main__": main() diff --git a/tutorial/03__implicit_subclass_pandas.py b/tutorial/03__implicit_subclass_pandas.py index 0f7be14c..709984a1 100644 --- a/tutorial/03__implicit_subclass_pandas.py +++ b/tutorial/03__implicit_subclass_pandas.py @@ -5,10 +5,12 @@ def main(): # Setup: create a list of proteins to be imported proteins = [ - p for sublist in zip( + p + for sublist in zip( [Protein() for _ in range(10)], [EntrezProtein() for _ in range(10)], - ) for p in sublist + ) + for p in sublist ] # Extract id, label, and property dictionary @@ -22,8 +24,8 @@ def node_generator(): # Create BioCypher driver bc = BioCypher( - biocypher_config_path='tutorial/03_biocypher_config.yaml', - schema_config_path='tutorial/03_schema_config.yaml', + biocypher_config_path="tutorial/03_biocypher_config.yaml", + schema_config_path="tutorial/03_schema_config.yaml", ) # Run the import bc.add(node_generator()) @@ -33,5 +35,5 @@ def node_generator(): print(df) -if __name__ == '__main__': +if __name__ == "__main__": main() diff --git a/tutorial/04__properties.py b/tutorial/04__properties.py index 24a268be..9c3e683c 100644 --- a/tutorial/04__properties.py +++ b/tutorial/04__properties.py @@ -5,10 +5,12 @@ def main(): # Setup: create a list of proteins to be imported proteins = [ - p for sublist in zip( + p + for sublist in zip( [RandomPropertyProtein() for _ in range(10)], [EntrezProtein() for _ in range(10)], - ) for p in sublist + ) + for p in sublist ] # Extract id, label, and property dictionary @@ -22,8 +24,8 @@ def node_generator(): # Create BioCypher driver bc = BioCypher( - biocypher_config_path='tutorial/04_biocypher_config.yaml', - schema_config_path='tutorial/04_schema_config.yaml', + biocypher_config_path="tutorial/04_biocypher_config.yaml", + schema_config_path="tutorial/04_schema_config.yaml", ) # Run the import bc.write_nodes(node_generator()) @@ -32,5 +34,5 @@ def node_generator(): bc.write_import_call() -if __name__ == '__main__': +if __name__ == "__main__": main() diff --git a/tutorial/04__properties_pandas.py b/tutorial/04__properties_pandas.py index 052f1428..fc39e294 100644 --- a/tutorial/04__properties_pandas.py +++ b/tutorial/04__properties_pandas.py @@ -5,10 +5,12 @@ def main(): # Setup: create a list of proteins to be imported proteins = [ - p for sublist in zip( + p + for sublist in zip( [RandomPropertyProtein() for _ in range(10)], [EntrezProtein() for _ in range(10)], - ) for p in sublist + ) + for p in sublist ] # Extract id, label, and property dictionary @@ -22,8 +24,8 @@ def node_generator(): # Create BioCypher driver bc = BioCypher( - biocypher_config_path='tutorial/04_biocypher_config.yaml', - schema_config_path='tutorial/04_schema_config.yaml', + biocypher_config_path="tutorial/04_biocypher_config.yaml", + schema_config_path="tutorial/04_schema_config.yaml", ) # Run the import bc.add(node_generator()) @@ -33,5 +35,5 @@ def node_generator(): print(df) -if __name__ == '__main__': +if __name__ == "__main__": main() diff --git a/tutorial/05__property_inheritance.py b/tutorial/05__property_inheritance.py index 4baadbf0..2f7577a9 100644 --- a/tutorial/05__property_inheritance.py +++ b/tutorial/05__property_inheritance.py @@ -9,11 +9,13 @@ def main(): # Setup: create a list of proteins to be imported proteins = [ - p for sublist in zip( + p + for sublist in zip( [RandomPropertyProtein() for _ in range(10)], [RandomPropertyProteinIsoform() for _ in range(10)], [EntrezProtein() for _ in range(10)], - ) for p in sublist + ) + for p in sublist ] # Extract id, label, and property dictionary @@ -27,8 +29,8 @@ def node_generator(): # Create BioCypher driver bc = BioCypher( - biocypher_config_path='tutorial/05_biocypher_config.yaml', - schema_config_path='tutorial/05_schema_config.yaml', + biocypher_config_path="tutorial/05_biocypher_config.yaml", + schema_config_path="tutorial/05_schema_config.yaml", ) # Run the import bc.write_nodes(node_generator()) @@ -37,5 +39,5 @@ def node_generator(): bc.write_import_call() -if __name__ == '__main__': +if __name__ == "__main__": main() diff --git a/tutorial/05__property_inheritance_pandas.py b/tutorial/05__property_inheritance_pandas.py index 3e11f074..b0ccf2ec 100644 --- a/tutorial/05__property_inheritance_pandas.py +++ b/tutorial/05__property_inheritance_pandas.py @@ -9,11 +9,13 @@ def main(): # Setup: create a list of proteins to be imported proteins = [ - p for sublist in zip( + p + for sublist in zip( [RandomPropertyProtein() for _ in range(10)], [RandomPropertyProteinIsoform() for _ in range(10)], [EntrezProtein() for _ in range(10)], - ) for p in sublist + ) + for p in sublist ] # Extract id, label, and property dictionary @@ -27,8 +29,8 @@ def node_generator(): # Create BioCypher driver bc = BioCypher( - biocypher_config_path='tutorial/05_biocypher_config.yaml', - schema_config_path='tutorial/05_schema_config.yaml', + biocypher_config_path="tutorial/05_biocypher_config.yaml", + schema_config_path="tutorial/05_schema_config.yaml", ) # Run the import bc.add(node_generator()) @@ -38,5 +40,5 @@ def node_generator(): print(df) -if __name__ == '__main__': +if __name__ == "__main__": main() diff --git a/tutorial/06__relationships.py b/tutorial/06__relationships.py index 364377bc..768746ad 100644 --- a/tutorial/06__relationships.py +++ b/tutorial/06__relationships.py @@ -10,11 +10,13 @@ def main(): # Setup: create a list of proteins to be imported proteins = [ - p for sublist in zip( + p + for sublist in zip( [RandomPropertyProtein() for _ in range(10)], [RandomPropertyProteinIsoform() for _ in range(10)], [EntrezProtein() for _ in range(10)], - ) for p in sublist + ) + for p in sublist ] # Extract id, label, and property dictionary @@ -45,8 +47,8 @@ def edge_generator(): # Create BioCypher driver bc = BioCypher( - biocypher_config_path='tutorial/06_biocypher_config.yaml', - schema_config_path='tutorial/06_schema_config.yaml', + biocypher_config_path="tutorial/06_biocypher_config.yaml", + schema_config_path="tutorial/06_schema_config.yaml", ) # Run the import bc.write_nodes(node_generator()) @@ -59,5 +61,5 @@ def edge_generator(): bc.show_ontology_structure() -if __name__ == '__main__': +if __name__ == "__main__": main() diff --git a/tutorial/06__relationships_pandas.py b/tutorial/06__relationships_pandas.py index b839fef1..b67a5b4d 100644 --- a/tutorial/06__relationships_pandas.py +++ b/tutorial/06__relationships_pandas.py @@ -10,11 +10,13 @@ def main(): # Setup: create a list of proteins to be imported proteins = [ - p for sublist in zip( + p + for sublist in zip( [RandomPropertyProtein() for _ in range(10)], [RandomPropertyProteinIsoform() for _ in range(10)], [EntrezProtein() for _ in range(10)], - ) for p in sublist + ) + for p in sublist ] # Extract id, label, and property dictionary @@ -45,16 +47,17 @@ def edge_generator(): # Create BioCypher driver bc = BioCypher( - biocypher_config_path='tutorial/06_biocypher_config.yaml', - schema_config_path='tutorial/06_schema_config_pandas.yaml', + biocypher_config_path="tutorial/06_biocypher_config.yaml", + schema_config_path="tutorial/06_schema_config_pandas.yaml", ) # Run the import bc.add(node_generator()) bc.add(edge_generator()) - + for name, df in bc.to_df().items(): print(name) print(df) -if __name__ == '__main__': + +if __name__ == "__main__": main() diff --git a/tutorial/07__synonyms.py b/tutorial/07__synonyms.py index a6fa7cff..c7af403e 100644 --- a/tutorial/07__synonyms.py +++ b/tutorial/07__synonyms.py @@ -11,12 +11,14 @@ def main(): # Setup: create a list of proteins to be imported proteins_complexes = [ - p for sublist in zip( + p + for sublist in zip( [RandomPropertyProtein() for _ in range(10)], [RandomPropertyProteinIsoform() for _ in range(10)], [EntrezProtein() for _ in range(10)], [Complex() for _ in range(10)], - ) for p in sublist + ) + for p in sublist ] # Extract id, label, and property dictionary @@ -47,8 +49,8 @@ def edge_generator(): # Create BioCypher driver bc = BioCypher( - biocypher_config_path='tutorial/07_biocypher_config.yaml', - schema_config_path='tutorial/07_schema_config.yaml', + biocypher_config_path="tutorial/07_biocypher_config.yaml", + schema_config_path="tutorial/07_schema_config.yaml", ) # Run the import bc.write_nodes(node_generator()) @@ -61,5 +63,5 @@ def edge_generator(): bc.summary() -if __name__ == '__main__': +if __name__ == "__main__": main() diff --git a/tutorial/07__synonyms_pandas.py b/tutorial/07__synonyms_pandas.py index 9b694514..95ce0a13 100644 --- a/tutorial/07__synonyms_pandas.py +++ b/tutorial/07__synonyms_pandas.py @@ -11,12 +11,14 @@ def main(): # Setup: create a list of proteins to be imported proteins_complexes = [ - p for sublist in zip( + p + for sublist in zip( [RandomPropertyProtein() for _ in range(10)], [RandomPropertyProteinIsoform() for _ in range(10)], [EntrezProtein() for _ in range(10)], [Complex() for _ in range(10)], - ) for p in sublist + ) + for p in sublist ] # Extract id, label, and property dictionary @@ -47,8 +49,8 @@ def edge_generator(): # Create BioCypher driver bc = BioCypher( - biocypher_config_path='tutorial/07_biocypher_config.yaml', - schema_config_path='tutorial/07_schema_config_pandas.yaml', + biocypher_config_path="tutorial/07_biocypher_config.yaml", + schema_config_path="tutorial/07_schema_config_pandas.yaml", ) # Run the import bc.add(node_generator()) @@ -62,5 +64,5 @@ def edge_generator(): bc.summary() -if __name__ == '__main__': +if __name__ == "__main__": main() diff --git a/tutorial/data_generator.py b/tutorial/data_generator.py index 7f805252..27f18b48 100644 --- a/tutorial/data_generator.py +++ b/tutorial/data_generator.py @@ -6,14 +6,14 @@ import string __all__ = [ - 'EntrezProtein', - 'Interaction', - 'InteractionGenerator', - 'Node', - 'Protein', - 'ProteinProteinInteraction', - 'RandomPropertyProtein', - 'RandomPropertyProteinIsoform', + "EntrezProtein", + "Interaction", + "InteractionGenerator", + "Node", + "Protein", + "ProteinProteinInteraction", + "RandomPropertyProtein", + "RandomPropertyProteinIsoform", ] @@ -21,6 +21,7 @@ class Node: """ Base class for nodes. """ + def __init__(self): self.id = None self.label = None @@ -49,9 +50,10 @@ class Protein(Node): """ Generates instances of proteins. """ + def __init__(self): self.id = self._generate_id() - self.label = 'uniprot_protein' + self.label = "uniprot_protein" self.properties = self._generate_properties() def _generate_id(self): @@ -62,7 +64,7 @@ def _generate_id(self): nums = [random.choice(string.digits) for _ in range(3)] # join alternating between lets and nums - return ''.join([x for y in zip(lets, nums) for x in y]) + return "".join([x for y in zip(lets, nums) for x in y]) def _generate_properties(self): properties = {} @@ -72,17 +74,17 @@ def _generate_properties(self): # random int between 50 and 250 l = random.randint(50, 250) - properties['sequence'] = ''.join( - [random.choice('ACDEFGHIKLMNPQRSTVWY') for _ in range(l)], + properties["sequence"] = "".join( + [random.choice("ACDEFGHIKLMNPQRSTVWY") for _ in range(l)], ) ## random description - properties['description'] = ' '.join( + properties["description"] = " ".join( [random.choice(string.ascii_lowercase) for _ in range(10)], ) ## taxon - properties['taxon'] = '9606' + properties["taxon"] = "9606" return properties @@ -91,9 +93,10 @@ class Complex(Node): """ Generates instances of complexes. """ + def __init__(self): self.id = self._generate_id() - self.label = 'complex' + self.label = "complex" self.properties = self._generate_properties() def _generate_id(self): @@ -109,12 +112,12 @@ def _generate_properties(self): properties = {} ## random description - properties['description'] = ' '.join( + properties["description"] = " ".join( [random.choice(string.ascii_lowercase) for _ in range(10)], ) ## taxon - properties['taxon'] = '9606' + properties["taxon"] = "9606" return properties @@ -123,6 +126,7 @@ class RandomPropertyProtein(Protein): """ Generates instances of proteins with random properties. """ + def _generate_properties(self): properties = {} @@ -131,21 +135,21 @@ def _generate_properties(self): # random int between 50 and 250 l = random.randint(50, 250) - properties['sequence'] = ''.join( - [random.choice('ACDEFGHIKLMNPQRSTVWY') for _ in range(l)], + properties["sequence"] = "".join( + [random.choice("ACDEFGHIKLMNPQRSTVWY") for _ in range(l)], ) ## random description - properties['description'] = ' '.join( + properties["description"] = " ".join( [random.choice(string.ascii_lowercase) for _ in range(10)], ) ## random taxon - properties['taxon'] = str(random.randint(0, 10000)) + properties["taxon"] = str(random.randint(0, 10000)) ## randomly add 'mass' if random.random() > 0.5: - properties['mass'] = random.randint(0, 10000) + properties["mass"] = random.randint(0, 10000) return properties @@ -154,19 +158,21 @@ class RandomPropertyProteinIsoform(RandomPropertyProtein): """ Generates instances of protein isoforms with random properties. """ + def __init__(self): super().__init__() - self.label = 'uniprot_isoform' + self.label = "uniprot_isoform" class EntrezProtein(Protein): """ Generates instances of proteins with Entrez IDs. """ + def __init__(self): super().__init__() self.id = self._generate_id() - self.label = 'entrez_protein' + self.label = "entrez_protein" def _generate_id(self): """ @@ -179,6 +185,7 @@ class Interaction: """ Base class for interactions. """ + def __init__(self): self.id = None self.source_id = None @@ -222,12 +229,13 @@ class ProteinProteinInteraction(Interaction): Simulates interactions between proteins given a source and target protein IDs. Occasionally generates an ID for the interaction itself. """ + def __init__(self, source, target): super().__init__() self.id = self._generate_id() self.source_id = source self.target_id = target - self.label = 'interacts_with' + self.label = "interacts_with" self.properties = self._generate_properties() def _generate_id(self): @@ -237,18 +245,18 @@ def _generate_id(self): if random.random() > 0.5: return None else: - return 'intact' + str(random.randint(1, 1000000)) + return "intact" + str(random.randint(1, 1000000)) def _generate_properties(self): properties = {} ## randomly add 'source' if random.random() > 0.5: - properties['source'] = random.choice(['intact', 'signor']) + properties["source"] = random.choice(["intact", "signor"]) ## randomly add 'method' if random.random() > 0.5: - properties['method'] = ' '.join( + properties["method"] = " ".join( [random.choice(string.ascii_lowercase) for _ in range(10)], ) @@ -260,6 +268,7 @@ class InteractionGenerator: Simulates interactions given a list of potential interactors based on an interaction probability or probability distribution. """ + def __init__(self, interactors: list, interaction_probability: float): self.interactors = interactors self.interaction_probability = interaction_probability From af3a0c8749bac2c9d652611c72d224d865e9a9d5 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Mon, 31 Jul 2023 15:20:29 +0200 Subject: [PATCH 028/343] remove yapf config --- .style.yapf | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 .style.yapf diff --git a/.style.yapf b/.style.yapf deleted file mode 100644 index e320598f..00000000 --- a/.style.yapf +++ /dev/null @@ -1,2 +0,0 @@ -[style] -based_on_style = facebook From 7440f98f4f27a1803b0d1ef64e3c3875ab2e7544 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Mon, 31 Jul 2023 15:22:26 +0200 Subject: [PATCH 029/343] remove graphml file --- .gitignore | 1 + ontology.graphml | 1374 ---------------------------------------------- 2 files changed, 1 insertion(+), 1374 deletions(-) delete mode 100644 ontology.graphml diff --git a/.gitignore b/.gitignore index b77c7554..c47b3265 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ dist/* .venv/ .empty .pytest_cache +*.graphml diff --git a/ontology.graphml b/ontology.graphml deleted file mode 100644 index 1d4384b8..00000000 --- a/ontology.graphml +++ /dev/null @@ -1,1374 +0,0 @@ - - - - - - - - - - - - - - - - - - - entity - - - association - - - behavior to behavioral feature association - - - entity to phenotypic feature association mixin - - - entity to feature or disease qualifiers mixin - - - frequency qualifier mixin - - - frequency quantifier - - - relationship quantifier - - - case to phenotypic feature association - - - case to entity association mixin - - - chemical affects gene association - - - chemical entity assesses named thing association - - - chemical entity or gene or gene product regulates gene association - - - chemical gene interaction association - - - chemical to entity association mixin - - - chemical entity to entity association mixin - - - chemical to disease or phenotypic feature association - - - entity to disease or phenotypic feature association mixin - - - chemical to pathway association - - - contributor association - - - disease or phenotypic feature to genetic inheritance association - - - disease or phenotypic feature to entity association mixin - - - disease or phenotypic feature to location association - - - disease to exposure event association - - - disease to entity association mixin - - - entity to exposure event association mixin - - - disease to phenotypic feature association - - - drug to gene association - - - drug to entity association mixin - - - entity to disease association - - - entity to phenotypic feature association - - - exposure event to outcome association - - - entity to outcome association mixin - - - exposure event to phenotypic feature association - - - gene to expression site association - - - gene to gene family association - - - gene to pathway association - - - gene to entity association mixin - - - gene to phenotypic feature association - - - genotype to gene association - - - genotype to genotype part association - - - genotype to phenotypic feature association - - - genotype to entity association mixin - - - genotype to variant association - - - information content entity to named thing association - - - material sample derivation association - - - material sample to disease or phenotypic feature association - - - material sample to entity association mixin - - - molecular activity to chemical entity association - - - molecular activity to molecular activity association - - - molecular activity to pathway association - - - named thing associated with likelihood of named thing association - - - organism taxon to environment association - - - organism taxon to entity association - - - organism to organism association - - - organismal entity as a model of disease association - - - entity to disease association mixin - - - model to disease association mixin - - - population to population association - - - sequence variant modulates treatment association - - - taxon to taxon association - - - variant to phenotypic feature association - - - variant to entity association mixin - - - variant to population association - - - cell line to disease or phenotypic feature association - - - cell line as a model of disease association - - - cell line to entity association mixin - - - chemical or drug or treatment to disease or phenotypic feature association - - - chemical or drug or treatment side effect disease or phenotypic feature association - - - genotype to disease association - - - genotype as a model of disease association - - - sequence association - - - genomic sequence localization - - - variant to disease association - - - variant as a model of disease association - - - variant to gene association - edge - ['known.sequence variant', 'somatic.sequence variant'] - gene - ['VARIANT_FOUND_IN_GENE_Known_variant_Gene', 'VARIANT_FOUND_IN_GENE_Somatic_mutation_Gene'] - id - - - variant to gene expression association - - - gene expression mixin - - - anatomical entity to anatomical entity association - - - anatomical entity to anatomical entity ontogenic association - - - anatomical entity to anatomical entity part of association - - - chemical to chemical association - - - chemical to chemical derivation association - - - reaction to participant association - - - reaction to catalyst association - - - organism taxon to organism taxon association - - - organism taxon to organism taxon interaction - - - organism taxon to organism taxon specialization - - - gene to disease association - edge - PERTURBED_IN_DISEASE - ['protein_disease', 'gene_disease'] - accession - id - - - druggable gene to disease association - - - gene as a model of disease association - - - gene has variant that contributes to disease association - - - gene to gene association - edge - gene_gene - {'directional': 'bool', 'curated': 'bool', 'score': 'float'} - id - - - gene to gene coexpression association - - - gene to gene homology association - - - pairwise gene to gene interaction - - - pairwise molecular interaction - - - sequence feature relationship - - - exon to transcript relationship - - - gene to gene product relationship - - - transcript to gene relationship - - - functional association - - - gene to go term association - - - macromolecular machine to biological process association - - - macromolecular machine to entity association mixin - - - macromolecular machine to cellular component association - - - macromolecular machine to molecular activity association - - - named thing - - - activity - - - activity and behavior - - - occurrent - - - physical essence or occurrent - - - event - - - phenomenon - - - administrative entity - - - agent - - - treatment - - - chemical or drug or treatment - - - exposure event - - - ontology class - - - clinical entity - - - clinical trial - - - clinical intervention - - - hospitalization - - - device - - - procedure - - - planetary entity - - - environmental feature - - - environmental process - - - geographic location - - - geographic location at time - - - physical entity - - - material sample - - - subject of investigation - - - physical essence - - - organism taxon - - - information content entity - - - common data element - - - study - - - study variable - - - confidence level - - - evidence type - - - dataset distribution - - - dataset summary - - - dataset version - - - dataset - - - study result - - - chi squared analysis result - - - concept count analysis result - - - observed expected frequency analysis result - - - relative frequency analysis result - - - text mining result - - - information resource - - - publication - - - article - - - book - - - serial - - - book chapter - - - biological entity - - - genome - - - genomic entity - - - haplotype - - - complex - - - macromolecular machine mixin - - - nucleic acid sequence motif - - - nucleosome modification - - - epigenomic entity - - - gene product isoform mixin - - - gene product mixin - - - gene or gene product - - - posttranslational modification - - - protein domain - - - chemical entity or gene or gene product - - - gene grouping mixin - - - protein family - - - reagent targeted gene - - - gene family - - - polypeptide - - - protein - node - uniprot - protein - {'name': 'str', 'score': 'float', 'taxon': 'int', 'genes': 'str[]'} - - - protein isoform - - - chemical entity or protein or polypeptide - - - genetic inheritance - - - genotype - - - organismal entity - - - cellular organism - - - virus - - - cell line - - - individual organism - - - case - - - life stage - - - population of individual organisms - - - study population - - - cohort - - - anatomical entity - - - cell - - - gross anatomical structure - - - pathological anatomical structure - - - pathological entity mixin - - - cellular component - - - biological process or activity - - - molecular activity - - - biological process - - - pathological process - - - physiological process - - - behavior - - - pathway - node - ['reactome', 'wikipathways'] - ['reactome', 'wikipathways'] - - - sequence variant - node - ['clinically relevant', 'known', 'somatic'] - ['Clinically_relevant_variant', 'Known_variant', 'Somatic_mutation'] - {'source': 'str', 'original_source': 'str', 'effect': 'str', 'biotype': 'str'} - - - snv - - - gene - node - hgnc - ['hgnc', 'ensg'] - accession - - - disease or phenotypic feature - - - phenotypic feature - - - clinical finding - - - behavioral feature - - - disease - node - doid - Disease - - - thing with taxon - - - attribute - - - behavioral exposure - - - biotic exposure - - - complex chemical exposure - - - disease or phenotypic feature exposure - - - genomic background exposure - - - pathological anatomical exposure - - - pathological process exposure - - - socioeconomic exposure - - - chemical exposure - - - drug exposure - - - drug to gene interaction exposure - - - environmental exposure - - - geographic exposure - - - organism attribute - - - phenotypic quality - - - chemical role - - - socioeconomic attribute - - - zygosity - - - clinical attribute - - - clinical measurement - - - clinical course - - - onset - - - clinical modifier - - - biological sex - - - genotypic sex - - - phenotypic sex - - - severity value - - - chemical entity - - - environmental food contaminant - - - food additive - - - chemical mixture - - - complex molecular mixture - - - food - - - processed material - - - molecular mixture - - - drug - - - molecular entity - - - small molecule - - - nucleic acid entity - - - coding sequence - - - exon - - - transcript - - - RNA product - - - RNA product isoform - - - noncoding RNA product - - - microRNA - node - mirbase.mature - mirna - - - siRNA - - - functional effect variant - - - functionally abnormal - - - lethal variant - node - lethal - id - - - altered gene product level - node - agpl - id - - - decreased gene product level - node - agpl_decreased - id - - - human disease - - - psychiatric disorder - - - Alice in Wonderland syndrome - - - catatonia - - - hereditary disease - - - autosomal genetic disease - - - autosomal recessive disease - - - cystic fibrosis - - - side effect - True - phenotypic feature - node - sider.effect - sider - - - snRNA sequence - True - nucleic acid entity - node - ['intact', 'rnacentral'] - ['intact_snrna', 'rnacentral_snrna'] - {'ac': 'str', 'fullName': 'str', 'shortName': 'str', 'preferredName': 'str'} - sequence - - - DNA sequence - True - nucleic acid entity - node - ensembl - dna - {'ac': 'str', 'fullName': 'str', 'shortName': 'str', 'preferredName': 'str', 'sequence': 'str'} - - - dsDNA sequence - True - ['DNA sequence', 'nucleic acid entity'] - True - node - ['intact', 'uniparc'] - ['intact_dsdna', 'uniprot_archive_dsdna'] - {'ac': 'str', 'fullName': 'str', 'shortName': 'str', 'preferredName': 'str', 'sequence': 'str'} - {} - - - post translational interaction - True - pairwise molecular interaction - node - INTERACTS_POST_TRANSLATIONAL - post_translational - id - - - phosphorylation - True - post translational interaction - edge - phosphorylation - id - - - genotype to tissue association - True - - - mutation to tissue association - True - ['genotype to tissue association', 'entity to tissue association', 'association'] - edge - Is_Mutated_In - Gene_Is_Mutated_In_Cell_Tissue - id - - - entity to tissue association - True - - - reactome.pathway - True - reactome - reactome - node - True - pathway - - - wikipathways.pathway - True - wikipathways - wikipathways - node - True - pathway - - - clinically relevant.sequence variant - True - clinically relevant - Clinically_relevant_variant - node - True - sequence variant - {'source': 'str', 'original_source': 'str', 'effect': 'str', 'biotype': 'str'} - - - known.sequence variant - True - known - Known_variant - node - True - sequence variant - {'source': 'str', 'original_source': 'str', 'effect': 'str', 'biotype': 'str'} - - - somatic.sequence variant - True - somatic - Somatic_mutation - node - True - sequence variant - {'source': 'str', 'original_source': 'str', 'effect': 'str', 'biotype': 'str'} - - - intact.snRNA sequence - True - intact - intact_snrna - node - True - ['snRNA sequence', 'nucleic acid entity'] - {'ac': 'str', 'fullName': 'str', 'shortName': 'str', 'preferredName': 'str'} - sequence - - - rnacentral.snRNA sequence - True - rnacentral - rnacentral_snrna - node - True - ['snRNA sequence', 'nucleic acid entity'] - {'ac': 'str', 'fullName': 'str', 'shortName': 'str', 'preferredName': 'str'} - sequence - - - intact.dsDNA sequence - True - intact - intact_dsdna - node - True - ['dsDNA sequence', 'DNA sequence', 'nucleic acid entity'] - True - {'ac': 'str', 'fullName': 'str', 'shortName': 'str', 'preferredName': 'str', 'sequence': 'str'} - {} - - - uniparc.dsDNA sequence - True - uniparc - uniprot_archive_dsdna - node - True - ['dsDNA sequence', 'DNA sequence', 'nucleic acid entity'] - True - {'ac': 'str', 'fullName': 'str', 'shortName': 'str', 'preferredName': 'str', 'sequence': 'str'} - {} - - - known.sequence variant.variant to gene association - True - known.sequence variant - VARIANT_FOUND_IN_GENE_Known_variant_Gene - edge - True - variant to gene association - gene - id - - - somatic.sequence variant.variant to gene association - True - somatic.sequence variant - VARIANT_FOUND_IN_GENE_Somatic_mutation_Gene - edge - True - variant to gene association - gene - id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From f5c6ef5b81dea660ab3b402e9124d38c8036ce92 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Mon, 31 Jul 2023 15:28:02 +0200 Subject: [PATCH 030/343] remove tox for now --- tox.ini | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 tox.ini diff --git a/tox.ini b/tox.ini deleted file mode 100644 index dc1262db..00000000 --- a/tox.ini +++ /dev/null @@ -1,9 +0,0 @@ -[tox] -skipsdist = true -envlist = py310 - -[testenv] -whitelist_externals = poetry -commands = - poetry install -v - poetry run pytest From 120c399e002cec4d2eacab960f94bad83daa7785 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Mon, 31 Jul 2023 16:02:46 +0200 Subject: [PATCH 031/343] move graphical abstract to docs folder --- README.md | 2 +- .../graphical_abstract.png | Bin docs/index.rst | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename graphical_abstract.png => docs/graphical_abstract.png (100%) diff --git a/README.md b/README.md index de04a821..518a7271 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ the docs [here](https://biocypher.org). margin-left: auto; margin-right: auto; width: 70%;" - src="graphical_abstract.png" + src="docs/graphical_abstract.png" alt="Graphical Abstract"> diff --git a/graphical_abstract.png b/docs/graphical_abstract.png similarity index 100% rename from graphical_abstract.png rename to docs/graphical_abstract.png diff --git a/docs/index.rst b/docs/index.rst index 2480dd53..0e26b682 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -61,7 +61,7 @@ drive BioCypher, we recommend to check out the graphical abstract below and read on `GitHub `_ or via email at sebastian.lobentanzer (at) uni-heidelberg.de. -.. figure:: ../graphical_abstract.png +.. figure:: graphical_abstract.png :width: 95% :align: center :alt: BioCypher graphical abstract From 3afa2c9a3f74898b9cb497d920333d4ec1026bb1 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Mon, 31 Jul 2023 16:14:46 +0200 Subject: [PATCH 032/343] remove hardcoded version from `_metadata.py` --- biocypher/_metadata.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/biocypher/_metadata.py b/biocypher/_metadata.py index cbc1426c..45d51b6d 100644 --- a/biocypher/_metadata.py +++ b/biocypher/_metadata.py @@ -19,8 +19,6 @@ import toml -_VERSION = "0.5.17" - def get_metadata(): """ @@ -60,7 +58,7 @@ def get_metadata(): except importlib.metadata.PackageNotFoundError: pass - meta["version"] = meta.get("version", None) or _VERSION + meta["version"] = meta.get("version", None) return meta From 7b98ec5daa793f2a7cee03c55637791824a3258b Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Mon, 31 Jul 2023 16:16:47 +0200 Subject: [PATCH 033/343] don't commit bumpversion --- .bumpversion.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index b60e1dc8..a0de192a 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,6 +1,6 @@ [bumpversion] current_version = 0.5.17 -commit = True +commit = False tag = True files = pyproject.toml parse = (?P\d+)\.(?P\d+)\.(?P\d+) From 49397d05cad0019ec0b344e0957edd5c2ca313c0 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Mon, 31 Jul 2023 16:17:34 +0200 Subject: [PATCH 034/343] don't add tag --- .bumpversion.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index a0de192a..60d801d4 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,7 +1,7 @@ [bumpversion] current_version = 0.5.17 commit = False -tag = True +tag = False files = pyproject.toml parse = (?P\d+)\.(?P\d+)\.(?P\d+) serialize = {major}.{minor}.{patch} From 4bd0fbd658f99e03076498b6a30ada42c982ff0e Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Mon, 31 Jul 2023 16:20:02 +0200 Subject: [PATCH 035/343] return version to `_metadata.py`, test replacement .. of version in there by bumpversion --- .bumpversion.cfg | 2 +- biocypher/_metadata.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 60d801d4..867f1d58 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -2,6 +2,6 @@ current_version = 0.5.17 commit = False tag = False -files = pyproject.toml +files = [pyproject.toml, biocypher/_metadata.py] parse = (?P\d+)\.(?P\d+)\.(?P\d+) serialize = {major}.{minor}.{patch} diff --git a/biocypher/_metadata.py b/biocypher/_metadata.py index 45d51b6d..cbc1426c 100644 --- a/biocypher/_metadata.py +++ b/biocypher/_metadata.py @@ -19,6 +19,8 @@ import toml +_VERSION = "0.5.17" + def get_metadata(): """ @@ -58,7 +60,7 @@ def get_metadata(): except importlib.metadata.PackageNotFoundError: pass - meta["version"] = meta.get("version", None) + meta["version"] = meta.get("version", None) or _VERSION return meta From ca8f244ddba1a90a7dc6d254170503b195d139d9 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Mon, 31 Jul 2023 16:22:17 +0200 Subject: [PATCH 036/343] remove files param --- .bumpversion.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 867f1d58..242c3951 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -2,6 +2,5 @@ current_version = 0.5.17 commit = False tag = False -files = [pyproject.toml, biocypher/_metadata.py] parse = (?P\d+)\.(?P\d+)\.(?P\d+) serialize = {major}.{minor}.{patch} From 5168112ff09827b46bf6d3611a2127467c29de3a Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Mon, 31 Jul 2023 16:23:02 +0200 Subject: [PATCH 037/343] add file section --- .bumpversion.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 242c3951..b0b6a1f8 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -4,3 +4,5 @@ commit = False tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+) serialize = {major}.{minor}.{patch} + +[bumpversion:file:pyproject.toml] From ce5f55cdc12f57d6203983530cae5b0434547f70 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Mon, 31 Jul 2023 16:24:10 +0200 Subject: [PATCH 038/343] add another file --- .bumpversion.cfg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index b0b6a1f8..97102b15 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -6,3 +6,5 @@ parse = (?P\d+)\.(?P\d+)\.(?P\d+) serialize = {major}.{minor}.{patch} [bumpversion:file:pyproject.toml] + +[bumpversion:file:biocypher/_metadata.py] From 3c09d0a43a56990f785164b8de53e0f3dd596d25 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Mon, 31 Jul 2023 16:28:29 +0200 Subject: [PATCH 039/343] commit and tag reactivated --- .bumpversion.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 97102b15..99bcc792 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,7 +1,7 @@ [bumpversion] current_version = 0.5.17 -commit = False -tag = False +commit = True +tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+) serialize = {major}.{minor}.{patch} From 029e9776268bc7ca84aaf15b764f9c36403d9c7e Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Mon, 31 Jul 2023 16:29:10 +0200 Subject: [PATCH 040/343] don't autotag version bump --- .bumpversion.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 99bcc792..3ffab340 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,7 +1,7 @@ [bumpversion] current_version = 0.5.17 commit = True -tag = True +tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+) serialize = {major}.{minor}.{patch} From aa4ef3a5160ae073cd2e9614d6841157bdea1161 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Mon, 31 Jul 2023 16:29:24 +0200 Subject: [PATCH 041/343] =?UTF-8?q?Bump=20version:=200.5.17=20=E2=86=92=20?= =?UTF-8?q?0.5.18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- biocypher/_metadata.py | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 3ffab340..5426287a 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.5.17 +current_version = 0.5.18 commit = True tag = False parse = (?P\d+)\.(?P\d+)\.(?P\d+) diff --git a/biocypher/_metadata.py b/biocypher/_metadata.py index cbc1426c..5ff8347b 100644 --- a/biocypher/_metadata.py +++ b/biocypher/_metadata.py @@ -19,7 +19,7 @@ import toml -_VERSION = "0.5.17" +_VERSION = "0.5.18" def get_metadata(): diff --git a/pyproject.toml b/pyproject.toml index f7e72573..47a0eb6f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "biocypher" -version = "0.5.17" +version = "0.5.18" description = "A unifying framework for biomedical research knowledge graphs" authors = [ "Sebastian Lobentanzer ", From d45d9e714881deb94f17241ab42404676d29d28b Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Mon, 31 Jul 2023 16:32:22 +0200 Subject: [PATCH 042/343] reactivate autotag; seems more robust --- .bumpversion.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 5426287a..24922a3f 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,7 +1,7 @@ [bumpversion] current_version = 0.5.18 commit = True -tag = False +tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+) serialize = {major}.{minor}.{patch} From 9f2bd003f7cc97417d44b997d155b5faf4ce2ff3 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Mon, 31 Jul 2023 16:38:29 +0200 Subject: [PATCH 043/343] versioning in dev guide --- DEVELOPER.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/DEVELOPER.md b/DEVELOPER.md index 83a2b514..eb30fd0e 100644 --- a/DEVELOPER.md +++ b/DEVELOPER.md @@ -1,9 +1,11 @@ # 🔬 Developer Guide + Thank you for considering to contribute to the project! This guide will help you to get started with the development of the project. If you have any questions, please feel free to ask them in the issue tracker. ## Formal Requirements + The project uses documentation format [Napoleon]( https://sphinxcontrib-napoleon.readthedocs.io/en/latest/example_google.html ) with a [Sphinx](https://www.sphinx-doc.org/en/master/) autodoc GitHub @@ -18,6 +20,7 @@ development. If you want to fix dependency issues, please do so in the Poetry framework. If Poetry does not work for you for some reason, please let us know. ## Testing + The project uses [pytest](https://docs.pytest.org/en/stable/) for testing. To run the tests, please run `pytest` in the root directory of the project. We are developing BioCypher using test-driven development. Please make sure that you @@ -30,13 +33,34 @@ have any questions, please feel free to ask them in the issue tracker. that the documentation builds correctly.** ## Small Contributions + If you want to contribute a small change (e.g. a bugfix), you can probably immediately go ahead and create a pull request. For more substantial changes or additions, please read on. ## Larger Contributions + If you want to contribute a larger change, please create an issue first. This will allow us to discuss the change and make sure that it fits into the project. It can happen that development for a feature is already in progress, so it is important to check first to avoid duplicate work. If you have any questions, feel free to approach us in any way you like. + +## Versioning + +We use [semantic versioning](https://semver.org/) for the project. This means +that the version number is incremented according to the following scheme: + +- Increment the major version number if you make incompatible API changes. + +- Increment the minor version number if you add functionality in a backwards- + compatible manner. + +- Increment the patch version number if you make backwards-compatible bug fixes. + +You can use the `bumpversion` tool to update the version number in the +`pyproject.toml` file. This will create a new git tag automatically. + +``` +bumpversion [major|minor|patch] +``` From d4b6ea036f321290ed2ef9268942161107a11b90 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Mon, 31 Jul 2023 17:00:46 +0200 Subject: [PATCH 044/343] add `paper.md` --- paper.md | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 paper.md diff --git a/paper.md b/paper.md new file mode 100644 index 00000000..aee25fa0 --- /dev/null +++ b/paper.md @@ -0,0 +1,121 @@ +--- +title: "Democratizing knowledge representation with BioCypher" +tags: + - Bioinformatics + - Knowledge Representation + - Computational Biology + - Software +authors: + - name: Sebastian Lobentanzer + affiliation: [1] + corresponding: true + - name: Patrick Aloy + affiliation: [2, 3] + - name: Jan Baumbach + affiliation: [4] + - name: Balazs Bohar + affiliation: [5, 6] + - name: Vincent J. Carey + affiliation: [7] + - name: Pornpimol Charoentong + affiliation: [8, 9] + - name: Katharina Danhauser + affiliation: [10] + - name: Tunca Doğan + affiliation: [11, 12] + - name: Johann Dreo + affiliation: [13, 14] + - name: Ian Dunham + affiliation: [15, 16] + - name: Elias Farr + affiliation: [1] + - name: Adrià Fernandez-Torras + affiliation: [2] + - name: Benjamin M. Gyori + affiliation: [17] + - name: Michael Hartung + affiliation: [4] + - name: Charles Tapley Hoyt + affiliation: [17] + - name: Christoph Klein + affiliation: [10] + - name: Tamas Korcsmaros + affiliation: [5, 18, 19] + - name: Andreas Maier + affiliation: [4] + - name: Matthias Mann + affiliation: [20, 21] + - name: David Ochoa + affiliation: [15, 16] + - name: Elena Pareja-Lorente + affiliation: [2] + - name: Ferdinand Popp + affiliation: [22] + - name: Martin Preusse + affiliation: [23] + - name: Niklas Probul + affiliation: [4] + - name: Benno Schwikowski + affiliation: [13] + - name: Bünyamin Sen + affiliation: [11, 12] + - name: Maximilian T. Strauss + affiliation: [20] + - name: Denes Turei + affiliation: [1] + - name: Erva Ulusoy + affiliation: [11, 12] + - name: Dagmar Waltemath + affiliation: [24] + - name: Judith A. H. Wodke + affiliation: [24] + - name: Julio Saez-Rodriguez + affiliation: [1] + corresponding: true +affiliations: + - name: Heidelberg University, Faculty of Medicine, and Heidelberg University Hospital, Institute for Computational Biomedicine, Bioquant + index: 1 + - name: Institute for Research in Biomedicine (IRB Barcelona), the Barcelona Institute of Science and Technology + index: 2 + - name: Institució Catalana de Recerca i Estudis Avançats (ICREA) + index: 3 + - name: Institute for Computational Systems Biology, University of Hamburg, Germany + index: 4 + - name: Earlham Institute, Norwich, UK + index: 5 + - name: Biological Research Centre, Szeged, Hungary + index: 6 + - name: Channing Division of Network Medicine, Mass General Brigham, Harvard Medical School, Boston, USA + index: 7 + - name: Centre for Quantitative Analysis of Molecular and Cellular Biosystems (Bioquant), Heidelberg University + index: 8 + - name: Department of Medical Oncology, National Centre for Tumour Diseases (NCT), Heidelberg University Hospital (UKHD) + index: 9 + - name: Department of Pediatrics, Dr. von Hauner Children’s Hospital, University Hospital, LMU Munich, Germany + index: 10 + - name: Biological Data Science Lab, Department of Computer Engineering, Hacettepe University, Ankara, Turkey + index: 11 + - name: Department of Bioinformatics, Graduate School of Health Sciences, Hacettepe University, Ankara, Turkey + index: 12 + - name: Computational Systems Biomedicine Lab, Department of Computational Biology, Institut Pasteur, Université Paris Cité, Paris, France + index: 13 + - name: Bioinformatics and Biostatistics Hub, Institut Pasteur, Université Paris Cité, Paris, France + index: 14 + - name: European Molecular Biology Laboratory, European Bioinformatics Institute (EMBL-EBI), Wellcome Genome Campus, Hinxton, Cambridgeshire CB10 1SD, UK + index: 15 + - name: Open Targets, Wellcome Genome Campus, Hinxton, Cambridgeshire CB10 1SD, UK + index: 16 + - name: Laboratory of Systems Pharmacology, Harvard Medical School, Boston, USA + index: 17 + - name: Imperial College London, London, UK + index: 18 + - name: Quadram Institute Bioscience, Norwich, UK + index: 19 + - name: Proteomics Program, Novo Nordisk Foundation Centre for Protein Research, University of Copenhagen, Copenhagen, Denmark + index: 20 + - name: Department of Proteomics and Signal Transduction, Max Planck Institute of Biochemistry, Martinsried, Germany + index: 21 + - name: Applied Tumour Immunity Clinical Cooperation Unit, National Centre for Tumour Diseases (NCT), German Cancer Research Centre (DKFZ), Im Neuenheimer Feld 460, 69120, Heidelberg, Germany + index: 22 +date: 2023-06-19 +paper_url: https://doi.org/10.1038/s41587-023-01848-y From d30d5f557c2dc3dd741952057c930462e8b9b191 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Tue, 1 Aug 2023 11:28:25 +0200 Subject: [PATCH 045/343] add paper.md sections; closes #222 --- paper.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/paper.md b/paper.md index aee25fa0..6e18d45e 100644 --- a/paper.md +++ b/paper.md @@ -119,3 +119,27 @@ affiliations: index: 22 date: 2023-06-19 paper_url: https://doi.org/10.1038/s41587-023-01848-y + +--- + +# Statement of need + +Building a knowledge graph for biomedical tasks usually takes months or years, +often requiring a team of experts in knowledge representation, ontology +engineering, and software development. This is a major bottleneck for +biomedical research, as it prevents researchers from quickly building +knowledge graphs for their specific research questions. We propose BioCypher, +a knowledge graph construction tool that democratises knowledge representation +by enabling biomedical researchers to build knowledge graphs more easily. + +# Summary + +BioCypher is an open-source Python framework built around the concept of a +“threefold modularity”: modularity of data sources, modularity of +structure-giving ontology, and modularity of output formats. This design allows +for a high degree of flexibility and reusability, rationalising efforts by +leveraging the biomedical community. + +# References + +For all references, see the [paper](https://doi.org/10.1038/s41587-023-01848-y). From cc3be5759a7a5b2b27f51597ccb2ad684d07e20e Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Tue, 1 Aug 2023 13:03:43 +0200 Subject: [PATCH 046/343] add CI/CD workflow that depends on docker .. add --host param to postgres to allow conection --- .github/workflows/ci_cd.yaml | 55 ++++++++++++++++++++++++++++++++++++ biocypher/_write.py | 2 ++ test/conftest.py | 8 ++---- test/test_write_postgres.py | 16 +++++------ 4 files changed, 68 insertions(+), 13 deletions(-) create mode 100644 .github/workflows/ci_cd.yaml diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml new file mode 100644 index 00000000..418df54b --- /dev/null +++ b/.github/workflows/ci_cd.yaml @@ -0,0 +1,55 @@ +name: Tests + +on: + pull_request: + push: + branches: + - main + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout Repository + uses: actions/checkout@v2 + + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: '3.9' + + - name: Install Poetry + run: | + curl -sSL https://install.python-poetry.org | python - + poetry --version + poetry config virtualenvs.create false + + - name: Install Dependencies + run: poetry install + + - name: Start Neo4j Docker + run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise + + - name: Run Tests + run: coverage run -m pytest + + - name: Generate coverage badge + run: coverage-badge -f -o docs/coverage.svg + + - name: Check if there are any changes + id: verify_diff + run: | + git diff --quiet . || echo "changed=true" >> $GITHUB_OUTPUT + + - name: Commit changes + if: steps.verify_diff.outputs.changed == 'true' + run: | + git config --global user.email "no-reply@github.com" + git config --global user.name "GitHub Actions" + git add docs/coverage.svg + git commit -m "Update coverage badge" + git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }} + git push + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/biocypher/_write.py b/biocypher/_write.py index 233b69f9..2836e01e 100644 --- a/biocypher/_write.py +++ b/biocypher/_write.py @@ -1782,6 +1782,7 @@ def _construct_import_call(self) -> str: f"{self.import_call_bin_prefix}psql -f {import_file_path}" ) import_call += f" --dbname {self.db_name}" + import_call += f" --host localhost" import_call += f" --port {self.db_port}" import_call += f" --user {self.db_user}" import_call += '\necho "Done!"\n' @@ -1796,6 +1797,7 @@ def _construct_import_call(self) -> str: import_call += f"PGPASSWORD={self.db_password} " import_call += f'{self.import_call_bin_prefix}psql -c "{command}"' import_call += f" --dbname {self.db_name}" + import_call += f" --host localhost" import_call += f" --port {self.db_port}" import_call += f" --user {self.db_user}" import_call += '\necho "Done!"\n' diff --git a/test/conftest.py b/test/conftest.py index c23a77fb..bc9b9fca 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -447,9 +447,7 @@ def skip_if_offline_postgresql(request, postgresql_param): ) # an empty command, just to test if connection is possible - command = ( - f"PGPASSWORD={password} psql -c '' --port {port} --user {user}" - ) + command = f"PGPASSWORD={password} psql -c '' --host localhost --port {port} --user {user}" process = subprocess.run(command, shell=True) # returncode is 0 when success @@ -510,13 +508,13 @@ def create_database_postgres(postgresql_param): ) # create the database - command = f"PGPASSWORD={password} psql -c 'CREATE DATABASE \"{dbname}\";' --port {port} --user {user}" + command = f"PGPASSWORD={password} psql -c 'CREATE DATABASE \"{dbname}\";' --host localhost --port {port} --user {user}" process = subprocess.run(command, shell=True) yield dbname, user, port, password, process.returncode == 0 # 0 if success # teardown - command = f"PGPASSWORD={password} psql -c 'DROP DATABASE \"{dbname}\";' --port {port} --user {user}" + command = f"PGPASSWORD={password} psql -c 'DROP DATABASE \"{dbname}\";' --host localhost --port {port} --user {user}" process = subprocess.run(command, shell=True) diff --git a/test/test_write_postgres.py b/test/test_write_postgres.py index cbad24c7..a9e7d3d7 100644 --- a/test/test_write_postgres.py +++ b/test/test_write_postgres.py @@ -121,7 +121,7 @@ def node_gen(nodes): assert result.returncode == 0 # check data in the databases - command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM protein;' --dbname {dbname} --port {port} --user {user}" + command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM protein;' --dbname {dbname} --host localhost --port {port} --user {user}" result = subprocess.run( command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) @@ -131,7 +131,7 @@ def node_gen(nodes): assert "4" in result.stdout.decode() # check data in the databases - command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM microrna;' --dbname {dbname} --port {port} --user {user}" + command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM microrna;' --dbname {dbname} --host localhost --port {port} --user {user}" result = subprocess.run( command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) @@ -194,7 +194,7 @@ def node_gen(nodes): assert result.returncode == 0 # check data in the databases - command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM protein;' --dbname {dbname} --port {port} --user {user}" + command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM protein;' --dbname {dbname} --host localhost --port {port} --user {user}" result = subprocess.run( command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) @@ -204,7 +204,7 @@ def node_gen(nodes): assert "5" in result.stdout.decode() # check data in the databases - command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM microrna;' --dbname {dbname} --port {port} --user {user}" + command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM microrna;' --dbname {dbname} --host localhost --port {port} --user {user}" result = subprocess.run( command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) @@ -272,7 +272,7 @@ def edge_gen2(edges): assert result.returncode == 0 # check data in the databases - command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM is_mutated_in;' --dbname {dbname} --port {port} --user {user}" + command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM is_mutated_in;' --dbname {dbname} --host localhost --port {port} --user {user}" result = subprocess.run( command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) @@ -281,7 +281,7 @@ def edge_gen2(edges): # 2 entries in table assert "8" in result.stdout.decode() - command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM perturbed_in_disease;' --dbname {dbname} --port {port} --user {user}" + command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM perturbed_in_disease;' --dbname {dbname} --host localhost --port {port} --user {user}" result = subprocess.run( command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) @@ -348,7 +348,7 @@ def edge_gen2(edges): assert result.returncode == 0 # check data in the databases - command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM is_mutated_in;' --dbname {dbname} --port {port} --user {user}" + command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM is_mutated_in;' --dbname {dbname} --host localhost --port {port} --user {user}" result = subprocess.run( command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) @@ -357,7 +357,7 @@ def edge_gen2(edges): # 2 entires in table assert "8" in result.stdout.decode() - command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM perturbed_in_disease;' --dbname {dbname} --port {port} --user {user}" + command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM perturbed_in_disease;' --dbname {dbname} --host localhost --port {port} --user {user}" result = subprocess.run( command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) From 986b8b567b36ca8ff831ff8f89524a8058a05af6 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Tue, 1 Aug 2023 13:17:55 +0200 Subject: [PATCH 047/343] make host a parameter everywhere --- biocypher/_config/biocypher_config.yaml | 1 + biocypher/_write.py | 157 +++++++++++++----------- test/conftest.py | 16 ++- test/test_write_postgres.py | 20 +-- 4 files changed, 110 insertions(+), 84 deletions(-) diff --git a/biocypher/_config/biocypher_config.yaml b/biocypher/_config/biocypher_config.yaml index a31167be..81d737ee 100644 --- a/biocypher/_config/biocypher_config.yaml +++ b/biocypher/_config/biocypher_config.yaml @@ -102,6 +102,7 @@ postgresql: database_name: postgres # DB name user: postgres # user name password: postgres # password + host: localhost # host port: 5432 # port # PostgreSQL import batch writer settings diff --git a/biocypher/_write.py b/biocypher/_write.py index 2836e01e..6f69f398 100644 --- a/biocypher/_write.py +++ b/biocypher/_write.py @@ -40,74 +40,6 @@ class _BatchWriter(ABC): - """ - Abtract parent class for writing node and edge representations to disk using the - format specified by each database type. The database-specific functions are implemented - by the respective child-classes. This abstract class contains all methods expected by - a bach writer instance, some of which need to be overwritten by the child classes. - - Each batch writer instance has a fixed representation that needs to be passed - at instantiation via the :py:attr:`schema` argument. The instance - also expects an ontology adapter via :py:attr:`ontology_adapter` to be able - to convert and extend the hierarchy. - - Requires the following methods to be overwritten by database-specific writer classes: - - _write_node_headers - - _write_edge_headers - - _construct_import_call - - _write_array_string - - _get_import_script_name - - Args: - ontology: - Instance of :py:class:`Ontology` to enable translation and - ontology queries - - translator: - Instance of :py:class:`Translator` to enable translation of - nodes and manipulation of properties. - - deduplicator: - Instance of :py:class:`Deduplicator` to enable deduplication - of nodes and edges. - - delimiter: - The delimiter to use for the CSV files. - - array_delimiter: - The delimiter to use for array properties. - - quote: - The quote character to use for the CSV files. - - dirname: - Path for exporting CSV files. - - db_name: - Name of the database that will be used in the generated - commands. - - import_call_bin_prefix: - Path prefix for the admin import call binary. - - import_call_file_prefix: - Path prefix for the data files (headers and parts) in the import - call. - - wipe: - Whether to force import (removing existing DB content). (Specific to Neo4j.) - - strict_mode: - Whether to enforce source, version, and license properties. - - skip_bad_relationships: - Whether to skip relationships that do not have a valid - start and end node. (Specific to Neo4j.) - - skip_duplicate_nodes: - Whether to skip duplicate nodes. (Specific to Neo4j.) - """ - @abstractmethod def _get_default_import_call_bin_prefix(self): """ @@ -209,11 +141,96 @@ def __init__( skip_duplicate_nodes: bool = False, db_user: str = None, db_password: str = None, + db_host: str = None, db_port: str = None, ): + """ + + Abtract parent class for writing node and edge representations to disk + using the format specified by each database type. The database-specific + functions are implemented by the respective child-classes. This abstract + class contains all methods expected by a bach writer instance, some of + which need to be overwritten by the child classes. + + Each batch writer instance has a fixed representation that needs to be + passed at instantiation via the :py:attr:`schema` argument. The instance + also expects an ontology adapter via :py:attr:`ontology_adapter` to be + able to convert and extend the hierarchy. + + Requires the following methods to be overwritten by database-specific + writer classes: + + - _write_node_headers + - _write_edge_headers + - _construct_import_call + - _write_array_string + - _get_import_script_name + + Args: + ontology: + Instance of :py:class:`Ontology` to enable translation and + ontology queries + + translator: + Instance of :py:class:`Translator` to enable translation of + nodes and manipulation of properties. + + deduplicator: + Instance of :py:class:`Deduplicator` to enable deduplication + of nodes and edges. + + delimiter: + The delimiter to use for the CSV files. + + array_delimiter: + The delimiter to use for array properties. + + quote: + The quote character to use for the CSV files. + + dirname: + Path for exporting CSV files. + + db_name: + Name of the database that will be used in the generated + commands. + + import_call_bin_prefix: + Path prefix for the admin import call binary. + + import_call_file_prefix: + Path prefix for the data files (headers and parts) in the import + call. + + wipe: + Whether to force import (removing existing DB content). (Specific to Neo4j.) + + strict_mode: + Whether to enforce source, version, and license properties. + + skip_bad_relationships: + Whether to skip relationships that do not have a valid + start and end node. (Specific to Neo4j.) + + skip_duplicate_nodes: + Whether to skip duplicate nodes. (Specific to Neo4j.) + + db_user: + The database user. + + db_password: + The database password. + + db_host: + The database host. Defaults to localhost. + + db_port: + The database port. + """ self.db_name = db_name self.db_user = db_user self.db_password = db_password + self.db_host = db_host or "localhost" self.db_port = db_port self.delim, self.escaped_delim = self._process_delimiter(delimiter) @@ -1782,7 +1799,7 @@ def _construct_import_call(self) -> str: f"{self.import_call_bin_prefix}psql -f {import_file_path}" ) import_call += f" --dbname {self.db_name}" - import_call += f" --host localhost" + import_call += f" --host {self.db_host}" import_call += f" --port {self.db_port}" import_call += f" --user {self.db_user}" import_call += '\necho "Done!"\n' @@ -1797,7 +1814,7 @@ def _construct_import_call(self) -> str: import_call += f"PGPASSWORD={self.db_password} " import_call += f'{self.import_call_bin_prefix}psql -c "{command}"' import_call += f" --dbname {self.db_name}" - import_call += f" --host localhost" + import_call += f" --host {self.db_host}" import_call += f" --port {self.db_port}" import_call += f" --user {self.db_user}" import_call += '\necho "Done!"\n' diff --git a/test/conftest.py b/test/conftest.py index bc9b9fca..27a01825 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -38,6 +38,7 @@ def pytest_addoption(parser): ), ("user_postgresql", "Tests access PostgreSQL as this user."), ("password_postgresql", "Password to access PostgreSQL."), + ("host_postgresql", "Host of the PostgreSQL server."), ("port_postgresql", "Port of the PostgreSQL server."), ) @@ -409,6 +410,7 @@ def postgresql_param(request): keys = ( "user_postgresql", "password_postgresql", + "host_postgresql", "port_postgresql", ) @@ -440,14 +442,15 @@ def skip_if_offline_postgresql(request, postgresql_param): if marker: params = postgresql_param - user, port, password = ( + user, host, port, password = ( params["db_user"], + params["db_host"], params["db_port"], params["db_password"], ) # an empty command, just to test if connection is possible - command = f"PGPASSWORD={password} psql -c '' --host localhost --port {port} --user {user}" + command = f"PGPASSWORD={password} psql -c '' --host {host} --port {port} --user {user}" process = subprocess.run(command, shell=True) # returncode is 0 when success @@ -500,21 +503,22 @@ def bw_tab_postgresql( @pytest.fixture(scope="session") def create_database_postgres(postgresql_param): params = postgresql_param - dbname, user, port, password = ( + dbname, user, host, port, password = ( params["db_name"], params["db_user"], + params["db_host"], params["db_port"], params["db_password"], ) # create the database - command = f"PGPASSWORD={password} psql -c 'CREATE DATABASE \"{dbname}\";' --host localhost --port {port} --user {user}" + command = f"PGPASSWORD={password} psql -c 'CREATE DATABASE \"{dbname}\";' --host {host} --port {port} --user {user}" process = subprocess.run(command, shell=True) - yield dbname, user, port, password, process.returncode == 0 # 0 if success + yield dbname, user, host, port, password, process.returncode == 0 # 0 if success # teardown - command = f"PGPASSWORD={password} psql -c 'DROP DATABASE \"{dbname}\";' --host localhost --port {port} --user {user}" + command = f"PGPASSWORD={password} psql -c 'DROP DATABASE \"{dbname}\";' --host {host} --port {port} --user {user}" process = subprocess.run(command, shell=True) diff --git a/test/test_write_postgres.py b/test/test_write_postgres.py index a9e7d3d7..efc7339f 100644 --- a/test/test_write_postgres.py +++ b/test/test_write_postgres.py @@ -76,6 +76,7 @@ def test_database_import_node_data_from_gen_comma_postgresql( ( dbname, user, + host, port, password, create_database_success, @@ -121,7 +122,7 @@ def node_gen(nodes): assert result.returncode == 0 # check data in the databases - command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM protein;' --dbname {dbname} --host localhost --port {port} --user {user}" + command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM protein;' --dbname {dbname} --host {host} --port {port} --user {user}" result = subprocess.run( command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) @@ -131,7 +132,7 @@ def node_gen(nodes): assert "4" in result.stdout.decode() # check data in the databases - command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM microrna;' --dbname {dbname} --host localhost --port {port} --user {user}" + command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM microrna;' --dbname {dbname} --host {host} --port {port} --user {user}" result = subprocess.run( command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) @@ -149,6 +150,7 @@ def test_database_import_node_data_from_gen_tab_postgresql( ( dbname, user, + host, port, password, create_database_success, @@ -194,7 +196,7 @@ def node_gen(nodes): assert result.returncode == 0 # check data in the databases - command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM protein;' --dbname {dbname} --host localhost --port {port} --user {user}" + command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM protein;' --dbname {dbname} --host {host} --port {port} --user {user}" result = subprocess.run( command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) @@ -204,7 +206,7 @@ def node_gen(nodes): assert "5" in result.stdout.decode() # check data in the databases - command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM microrna;' --dbname {dbname} --host localhost --port {port} --user {user}" + command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM microrna;' --dbname {dbname} --host {host} --port {port} --user {user}" result = subprocess.run( command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) @@ -222,6 +224,7 @@ def test_database_import_edge_data_from_gen_comma_postgresql( ( dbname, user, + host, port, password, create_database_success, @@ -272,7 +275,7 @@ def edge_gen2(edges): assert result.returncode == 0 # check data in the databases - command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM is_mutated_in;' --dbname {dbname} --host localhost --port {port} --user {user}" + command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM is_mutated_in;' --dbname {dbname} --host {host} --port {port} --user {user}" result = subprocess.run( command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) @@ -281,7 +284,7 @@ def edge_gen2(edges): # 2 entries in table assert "8" in result.stdout.decode() - command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM perturbed_in_disease;' --dbname {dbname} --host localhost --port {port} --user {user}" + command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM perturbed_in_disease;' --dbname {dbname} --host {host} --port {port} --user {user}" result = subprocess.run( command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) @@ -299,6 +302,7 @@ def test_database_import_edge_data_from_gen_tab_postgresql( ( dbname, user, + host, port, password, create_database_success, @@ -348,7 +352,7 @@ def edge_gen2(edges): assert result.returncode == 0 # check data in the databases - command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM is_mutated_in;' --dbname {dbname} --host localhost --port {port} --user {user}" + command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM is_mutated_in;' --dbname {dbname} --host {host} --port {port} --user {user}" result = subprocess.run( command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) @@ -357,7 +361,7 @@ def edge_gen2(edges): # 2 entires in table assert "8" in result.stdout.decode() - command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM perturbed_in_disease;' --dbname {dbname} --host localhost --port {port} --user {user}" + command = f"PGPASSWORD={password} psql -c 'SELECT COUNT(*) FROM perturbed_in_disease;' --dbname {dbname} --host {host} --port {port} --user {user}" result = subprocess.run( command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) From 76c051854ab6ed8750aad174ce2881ebbfe2536f Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Tue, 1 Aug 2023 13:18:33 +0200 Subject: [PATCH 048/343] =?UTF-8?q?Bump=20version:=200.5.18=20=E2=86=92=20?= =?UTF-8?q?0.5.19?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- biocypher/_metadata.py | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 24922a3f..ad773ee7 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.5.18 +current_version = 0.5.19 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+) diff --git a/biocypher/_metadata.py b/biocypher/_metadata.py index 5ff8347b..21852747 100644 --- a/biocypher/_metadata.py +++ b/biocypher/_metadata.py @@ -19,7 +19,7 @@ import toml -_VERSION = "0.5.18" +_VERSION = "0.5.19" def get_metadata(): diff --git a/pyproject.toml b/pyproject.toml index 47a0eb6f..a51d2b49 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "biocypher" -version = "0.5.18" +version = "0.5.19" description = "A unifying framework for biomedical research knowledge graphs" authors = [ "Sebastian Lobentanzer ", From 926573c5935f6058cf3aa61c9509154854faddb1 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Tue, 1 Aug 2023 13:22:30 +0200 Subject: [PATCH 049/343] add postgres docker to CI and give password --- .github/workflows/ci_cd.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index 418df54b..9e11ffb0 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -31,8 +31,11 @@ jobs: - name: Start Neo4j Docker run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise + - name: Start Postgres Docker + run: docker run --name pg --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest + - name: Run Tests - run: coverage run -m pytest + run: coverage run -m pytest --password=your_password_here - name: Generate coverage badge run: coverage-badge -f -o docs/coverage.svg From 2659b919bb38eba287fd68019f95d1f667ca869a Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Tue, 1 Aug 2023 13:28:01 +0200 Subject: [PATCH 050/343] remove docker name --- .github/workflows/ci_cd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index 9e11ffb0..a35169ff 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -32,7 +32,7 @@ jobs: run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise - name: Start Postgres Docker - run: docker run --name pg --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest + run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest - name: Run Tests run: coverage run -m pytest --password=your_password_here From b0630c5edf36709a251712c545fd59cd3a4664c6 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Tue, 1 Aug 2023 13:29:06 +0200 Subject: [PATCH 051/343] add path assert --- test/test_write_neo4j.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/test_write_neo4j.py b/test/test_write_neo4j.py index 3092488d..640b537f 100644 --- a/test/test_write_neo4j.py +++ b/test/test_write_neo4j.py @@ -275,6 +275,7 @@ def node_gen(nodes): passed = bw._write_node_data(node_gen(nodes), batch_size=1e6) tmp_path = bw.outdir + assert os.path.exists(tmp_path) p_csv = os.path.join(tmp_path, "Protein-part000.csv") m_csv = os.path.join(tmp_path, "microRNA-part000.csv") From 4c39712e64734ab625b3ccb211f9669df4cd58ef Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Tue, 1 Aug 2023 13:42:31 +0200 Subject: [PATCH 052/343] fix test --- test/test_write_neo4j.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_write_neo4j.py b/test/test_write_neo4j.py index 640b537f..52387819 100644 --- a/test/test_write_neo4j.py +++ b/test/test_write_neo4j.py @@ -278,7 +278,7 @@ def node_gen(nodes): assert os.path.exists(tmp_path) p_csv = os.path.join(tmp_path, "Protein-part000.csv") - m_csv = os.path.join(tmp_path, "microRNA-part000.csv") + m_csv = os.path.join(tmp_path, "MicroRNA-part000.csv") with open(p_csv) as f: pr = f.read() From 8f9ad4fa7bd159df24b0ddfa43c2ac52adf03180 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Tue, 1 Aug 2023 13:45:51 +0200 Subject: [PATCH 053/343] add coverage-badge package --- poetry.lock | 17 ++++++++++++++++- pyproject.toml | 1 + 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/poetry.lock b/poetry.lock index 20df3964..8b16622c 100644 --- a/poetry.lock +++ b/poetry.lock @@ -196,6 +196,17 @@ tomli = {version = "*", optional = true, markers = "python_full_version <= \"3.1 [package.extras] toml = ["tomli"] +[[package]] +name = "coverage-badge" +version = "1.1.0" +description = "Generate coverage badges for Coverage.py." +category = "dev" +optional = false +python-versions = "*" + +[package.dependencies] +coverage = "*" + [[package]] name = "cycler" version = "0.11.0" @@ -1486,7 +1497,7 @@ testing = ["big-O", "flake8 (<5)", "jaraco.functools", "jaraco.itertools", "more [metadata] lock-version = "1.1" python-versions = "^3.9" -content-hash = "680e0899addcbe36db24cee7d75fced89e4961457decc8fcd69b40df201d8602" +content-hash = "fb89c165552e777ab38309aead61452103dc99f78f65e1a9af3d8771c2d75343" [metadata.files] alabaster = [ @@ -1786,6 +1797,10 @@ coverage = [ {file = "coverage-7.2.2-pp37.pp38.pp39-none-any.whl", hash = "sha256:872d6ce1f5be73f05bea4df498c140b9e7ee5418bfa2cc8204e7f9b817caa968"}, {file = "coverage-7.2.2.tar.gz", hash = "sha256:36dd42da34fe94ed98c39887b86db9d06777b1c8f860520e21126a75507024f2"}, ] +coverage-badge = [ + {file = "coverage-badge-1.1.0.tar.gz", hash = "sha256:c824a106503e981c02821e7d32f008fb3984b2338aa8c3800ec9357e33345b78"}, + {file = "coverage_badge-1.1.0-py2.py3-none-any.whl", hash = "sha256:e365d56e5202e923d1b237f82defd628a02d1d645a147f867ac85c58c81d7997"}, +] cycler = [ {file = "cycler-0.11.0-py3-none-any.whl", hash = "sha256:3a27e95f763a428a739d2add979fa7494c912a32c17c4c38c4d5f082cad165a3"}, {file = "cycler-0.11.0.tar.gz", hash = "sha256:9c87405839a19696e837b3b818fed3f5f69f16f1eec1a1ad77e043dcea9c772f"}, diff --git a/pyproject.toml b/pyproject.toml index a51d2b49..4da026be 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -54,6 +54,7 @@ isort = "^5.10.1" ipython = "^8.7.0" ipykernel = "^6.23.1" sphinxext-opengraph = "^0.8.2" +coverage-badge = "^1.1.0" [build-system] requires = ["poetry-core>=1.0.0"] From 1fdb2d4d4e2a84649ae311789a5aa32c2f4472da Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Tue, 1 Aug 2023 13:49:46 +0200 Subject: [PATCH 054/343] add CI and coverage badges, links, yml -> yaml --- .github/workflows/{sphinx_autodoc.yml => sphinx_autodoc.yaml} | 0 README.md | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) rename .github/workflows/{sphinx_autodoc.yml => sphinx_autodoc.yaml} (100%) diff --git a/.github/workflows/sphinx_autodoc.yml b/.github/workflows/sphinx_autodoc.yaml similarity index 100% rename from .github/workflows/sphinx_autodoc.yml rename to .github/workflows/sphinx_autodoc.yaml diff --git a/README.md b/README.md index 518a7271..eb230d20 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,9 @@ ![Python](https://img.shields.io/badge/python-3.10-blue.svg) [![PyPI version](https://badge.fury.io/py/biocypher.svg)](https://badge.fury.io/py/biocypher) [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) -![Docs build](https://github.com/biocypher/biocypher/actions/workflows/sphinx_autodoc.yml/badge.svg) +[![CI](https://github.com/biocypher/biocypher/actions/workflows/ci_cd.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/ci_cd.yaml) +![Coverage](docs/coverage.svg) +[![Docs build](https://github.com/biocypher/biocypher/actions/workflows/sphinx_autodoc.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/sphinx_autodoc.yaml) [![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) From 2a3c887d96b3c06faced83d817a050c9b8843a5d Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Tue, 1 Aug 2023 13:51:58 +0200 Subject: [PATCH 055/343] manually add coverage badge --- docs/coverage.svg | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 docs/coverage.svg diff --git a/docs/coverage.svg b/docs/coverage.svg new file mode 100644 index 00000000..a8c7e72a --- /dev/null +++ b/docs/coverage.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + coverage + coverage + 92% + 92% + + From 8d256cb0316a3a3eac5e8b116c87ca5ed151393d Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Tue, 1 Aug 2023 15:33:11 +0200 Subject: [PATCH 056/343] switch to autosummary for API reference, .. refactor documentation, clean up links and outdated information, .. rename submodule documentation to API --- .gitignore | 2 + biocypher/_write.py | 2 + docs/adapters.md | 2 +- docs/api.rst | 158 ++++++++++++++++++++++++++++++++++++++ docs/conf.py | 1 + docs/contents.rst | 2 +- docs/index.rst | 4 +- docs/installation.md | 4 +- docs/neo4j.md | 112 ++++----------------------- docs/quickstart.md | 10 +-- docs/submodule.rst | 50 ------------ docs/tutorial-adapter.md | 4 +- docs/tutorial-ontology.md | 2 +- docs/tutorial.md | 33 ++++---- 14 files changed, 211 insertions(+), 175 deletions(-) create mode 100644 docs/api.rst delete mode 100644 docs/submodule.rst diff --git a/.gitignore b/.gitignore index c47b3265..86bd3c49 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,8 @@ build/ docs/pypath_log/ docs/_build/ +docs/biocypher-log/ +docs/modules/ .DS_Store .vscode biocypher.egg-info/ diff --git a/biocypher/_write.py b/biocypher/_write.py index 6f69f398..5f7716de 100644 --- a/biocypher/_write.py +++ b/biocypher/_write.py @@ -1009,6 +1009,7 @@ class _Neo4jBatchWriter(_BatchWriter): This class inherits from the abstract class "_BatchWriter" and implements the Neo4j-specific methods: + - _write_node_headers - _write_edge_headers - _construct_import_call @@ -1520,6 +1521,7 @@ class _PostgreSQLBatchWriter(_BatchWriter): This class inherits from the abstract class "_BatchWriter" and implements the PostgreSQL-specific methods: + - _write_node_headers - _write_edge_headers - _construct_import_call diff --git a/docs/adapters.md b/docs/adapters.md index 20feaee7..00468185 100644 --- a/docs/adapters.md +++ b/docs/adapters.md @@ -1,4 +1,4 @@ -(adapters)= +(adapters_info)= # Adapters BioCypher is a modular framework, with the main purpose of avoiding redundant diff --git a/docs/api.rst b/docs/api.rst new file mode 100644 index 00000000..a763794a --- /dev/null +++ b/docs/api.rst @@ -0,0 +1,158 @@ +.. _api-reference: + +############# +API Reference +############# + +.. _api_core: + +The main BioCypher interface +============================ + +Create a BioCypher instance by running: + +.. code-block:: python + + from biocypher import BioCypher + bc = BioCypher() + +Most of the settings should be configured by :ref:`YAML files `. See +below for more information on the BioCypher class. + +.. module:: biocypher +.. autosummary:: + :toctree: modules + + BioCypher + +.. _api_write: + +Database creation by file +========================= + +Using the BioCypher instance, you can create a database by writing files by +using the :meth:`BioCypher.write_nodes` and :meth:`BioCypher.write_edges` +methods, which accept collections of nodes and edges either as :ref:`tuples +` or as :class:`BioCypherNode` and :class:`BioCypherEdge` :ref:`objects +`. For example: + +.. code-block:: python + + # given lists of nodes and edges + bc.write_nodes(node_list) + bc.write_edges(edge_list) + +.. note:: + + To facilitate the interaction with the various database management systems + (DBMSs), BioCypher provides utility functions, such as writing a Neo4j + admin import statement to be used for creating a Neo4j database + (:meth:`BioCypher.write_import_call`). The most commonly used utility + functions are also available in the wrapper function + :meth:`BioCypher.summary`. See the :class:`BioCypher` :ref:`class + ` for more information. + +Details about the :mod:`biocypher._write` module responsible for these methods +can be found below. + +.. module:: biocypher._write +.. autosummary:: + :toctree: modules + + get_writer + _BatchWriter + _Neo4jBatchWriter + _PostgreSQLBatchWriter + _ArangoDBBatchWriter + +.. _api_connect: + +Database creation and manipulation by Driver +============================================ + +BioCypher also provides a driver for each of the supported DBMSs. The driver can +be used to create a database and to write nodes and edges to it, as well as +allowing more subtle manipulation usually not encountered in creating a database +from scratch as in the :ref:`file-based workflow `. This includes +merging (creation of entities only if they don't exist) and deletion. For +example: + +.. code-block:: python + + # given lists of nodes and edges + bc = BioCypher() + bc.write_nodes(node_set_1) + bc.write_edges(edge_set_1) + bc.merge_nodes(node_set_2) + bc.merge_edges(edge_set_2) + +Details about the :mod:`biocypher._connect` module responsible for these methods +can be found below. + +.. module:: biocypher._connect +.. autosummary:: + :toctree: modules + + get_driver + _Neo4jDriver + + +Ontology ingestion, parsing, and manipulation +============================================= +.. module:: biocypher._ontology +.. autosummary:: + :toctree: modules + + Ontology + OntologyAdapter + +Mapping of data inputs to KG ontology +===================================== +.. module:: biocypher._mapping +.. autosummary:: + :toctree: modules + + OntologyMapping + +.. _api_create: + +Base classes for node and edge representations in BioCypher +=========================================================== +.. module:: biocypher._create +.. autosummary:: + :toctree: modules + + BioCypherNode + BioCypherEdge + BioCypherRelAsNode + +Translation functionality for implemented types of representation +================================================================= +.. module:: biocypher._translate +.. autosummary:: + :toctree: modules + + Translator + +Logging +======= +.. module:: biocypher._logger +.. autosummary:: + :toctree: modules + + get_logger + +Miscellaneous utility functions +=============================== +.. module:: biocypher._misc +.. autosummary:: + :toctree: modules + + to_list + ensure_iterable + create_tree_visualisation + from_pascal + pascalcase_to_sentencecase + snakecase_to_sentencecase + sentencecase_to_snakecase + sentencecase_to_pascalcase diff --git a/docs/conf.py b/docs/conf.py index d51ea793..ed058b6e 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -47,6 +47,7 @@ "sphinx.ext.autodoc", "sphinx.ext.napoleon", "sphinx.ext.todo", # not for output but to remove warnings + "sphinx.ext.autosummary", "sphinxext.opengraph", "myst_parser", # markdown support "sphinx_rtd_theme", diff --git a/docs/contents.rst b/docs/contents.rst index ba530b2b..50b3839e 100644 --- a/docs/contents.rst +++ b/docs/contents.rst @@ -13,4 +13,4 @@ tutorial-adapter neo4j r-bioc - submodule + api diff --git a/docs/index.rst b/docs/index.rst index 0e26b682..89b6ebc1 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -91,9 +91,9 @@ make this framework truly accessible and comprehensive, we need the input of the biomedical community. We are therefore inviting you to join us in this endeavour! -================== +===================================================== Connect your Knowledge Graph to Large Language Models -================== +===================================================== To facilitate the use of knowledge graphs in downstream tasks, we have developed a framework to connect knowledge graphs to large language models. This framework diff --git a/docs/installation.md b/docs/installation.md index 5a209552..c0749227 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -64,8 +64,8 @@ database named `test` running on standard bolt port `7687` tests by running `% pytest` in the root directory of the repository with the command line argument `--password=`. -Once this is set up, you can go through the [tutorial](tutorial) or use it in -your project as a local dependency. +Once this is set up, you can go through the [tutorial](tutorial_basic) or use it +in your project as a local dependency. (config)= # Configuration diff --git a/docs/neo4j.md b/docs/neo4j.md index e07fb9b4..ede96f03 100644 --- a/docs/neo4j.md +++ b/docs/neo4j.md @@ -18,55 +18,14 @@ refer to the [APOC documentation](https://neo4j.com/labs/apoc/). ## Communication via the Neo4j Python Driver -The BioCypher [Driver](driver) is the main submodule of BioCypher. It -establishes a connection with a running graph database via the -{py:class}`neo4j.GraphDatabase.driver`, integrates the funtions of the -other submodules, and serves as outside interface of BioCypher. The -``Driver`` is the main class for interacting with BioCypher in the host -module's adapter class. It handles authentification and basic database -management as well as the creation and manipulation of graph entries. It -can be instantiated and accessed like this: - -``` -import biocypher - -# offline mode -d = biocypher.Driver( - db_name = "neo4j", - offline = True -) - -# online mode -d = biocypher.Driver( - db_name = "neo4j", - db_user = "neo4j", - db_passwd = "neo4j" -) -``` - -In our example, it is instantiated in the initialisation of the adapter, -and then called on for [interacting with a running graph](running) and -for exporting a complete database in CSV format for the [Neo4j -admin-import feature](admin_import). Upon instantiation, it -automatically assesses the graph database it is connected to (specified -using the ``db_name`` argument) regarding whether or not it already -contains a BioCypher graph, and, if so, what the structure of this graph -is. +BioCypher provides a Python driver for interacting with Neo4j, which is +accessed through the ``BioCypher`` class when setting `offline` to `False`. +More details can be found in the [API docs](api_connect). If there exists no BioCypher graph in the currently active database, or if the user explicitly specifies so using the ``wipe`` attribute of the driver, a new BioCypher database is created using the schema -configuration specified in the [schema-config.yaml](schema-config). - -(running)= -## Interacting with a running Neo4j instance - -Once instantiated, the BioCypher driver can be used to modify the -current graph by adding or deleting nodes, edges, properties, -constraints, et cetera. Most commonly, the methods -{py:meth}`biocypher.driver.Driver.add_nodes()` and -{py:meth}`biocypher.driver.Driver.add_edges()` are used to introduce new -entries into the graph database. +configuration specified in the [schema-config.yaml](tut_01_schema). (admin_import)= ## Exporting for the `neo4j-admin import` feature @@ -85,62 +44,25 @@ process, which is why the BioCypher export functionality has been specifically designed to perform type and content checking for all data to be written to the graph. -Data input from the source database is exactly as in the case of -[interacting with a running database](running), with the data -representation being converted to a series of CSV files in a designated -output folder (standard being ``biocypher-out/`` and the current datetime). -BioCypher creates separate header and data files for all node and edge -types to be represented in the graph via the driver methods -{py:meth}`biocypher.driver.Driver.write_nodes()` and -{py:meth}`biocypher.driver.Driver.write_edges()`. Additionally, it creates -a file called ``neo4j-admin-import-call.txt`` containing the console -command for creating a new database, which only has to be executed from -the directory of the currently running Neo4j database. - -The name of the database to be created is given by the ``db_name`` -attribute of the driver methods, ie, ``write_nodes()`` and -``write_edges()``, which should receive the same name as in the -``PyPath`` adapter example, and can be arbitrary. In case the -``db_name`` is not the default Neo4j database name, ``neo4j``, the -database needs to be created in Neo4j before or after using the -``neo4j-admin import`` statement. This can be done by executing, in the +Data input from the source database is exactly as in the case of interacting +with a running database, with the data representation being converted to a +series of CSV files in a designated output folder (standard being +``biocypher-out/`` and the current datetime). BioCypher creates separate header +and data files for all node and edge types to be represented in the graph. +Additionally, it creates a file called ``neo4j-admin-import-call.txt`` +containing the console command for creating a new database, which only has to be +executed from the directory of the currently running Neo4j database. + +The name of the database to be created is given by the ``db_name`` setting, and +can be arbitrary. In case the ``db_name`` is not the default Neo4j database +name, ``neo4j``, the database needs to be created in Neo4j before or after using +the ``neo4j-admin import`` statement. This can be done by executing, in the running database (```` being the name assigned in the method): 1. ``:use system`` 2. ``create database `` 3. ``:use `` -(translation)= -## Translating between original and BioCypher vocabulary -For quickly transitioning to BioCypher, single terms or entire queries -can be translated using the information provided in the -`schema_config.yaml`. The translation functionality can be accessed -through the driver methods {py:meth}`biocypher.driver.translate_term()`, -{py:meth}`biocypher.driver.reverse_translate_term()`, -{py:meth}`biocypher.driver.translate_query()`, and -{py:meth}`biocypher.driver.reverse_translate_query()`. For instance, to -find out the designation of "gene_gene" relationships in BioCypher, one -can call: - -``` -driver.translate_term("gene_gene") -# 'GeneToGeneAssociation' -``` - -Similarly, to discover the original naming of -"PostTranslationalInteraction" relationships, one can call the reverse -function: - -``` -driver.reverse_translate_term("PostTranslationalInteraction") -# 'post_translational' -``` - -{py:meth}`biocypher.driver.translate_query()` and -{py:meth}`biocypher.driver.reverse_translate_query()` replace all label -designations (following a ":") in entire CYPHER query strings with the -BioCypher or original versions, respectively. - (neo4j_tut)= # Tutorial - Neo4j diff --git a/docs/quickstart.md b/docs/quickstart.md index 07210be0..53c897ac 100644 --- a/docs/quickstart.md +++ b/docs/quickstart.md @@ -10,7 +10,7 @@ ::: :::{grid-item-card} New to BioCypher? Follow the tutorial: -:link: tutorial +:link: tutorial_basic :link-type: ref :text-align: center {octicon}`package;3em` {octicon}`question;3em` {octicon}`checklist;3em` {octicon}`light-bulb;3em` @@ -34,7 +34,7 @@ consecutive steps: 1. Clearly define the scope of your project, including the data sources you want to use, the entities and relationships you want to represent, and the -[ontologies](ontologies) that should inform these entities. +[ontologies](tutorial_ontologies) that should inform these entities. 2. Using these definitions, find existing [adapters of data sources](qs_input-adapter) or, if necessary, create your own. For the data @@ -162,7 +162,7 @@ protein: # top-level entry, has to match ontology For BioCypher classes, similar to the internal representation in the Biolink model, we use lower sentence-case notation, e.g., `protein` and `small molecule`. For file names and Neo4j labels, these are converted to PascalCase. -For more information, see the [Ontology tutorial](ontology). +For more information, see the [Ontology tutorial](tutorial_ontologies). ``` The above configuration of the protein class specifies its representation as a @@ -231,8 +231,8 @@ df = bc.to_df() ``` For more information on the usage of these functions, please refer to the -[Tutorial](tutorial) section and the [full API -documentation](submodule.rst#api-reference). +[Tutorial](tutorial_basic) section and the [full API +documentation](api-reference). (qs_config)= ## The biocypher configuration YAML file diff --git a/docs/submodule.rst b/docs/submodule.rst deleted file mode 100644 index 18f1d214..00000000 --- a/docs/submodule.rst +++ /dev/null @@ -1,50 +0,0 @@ -.. _api-reference: - -############# -API Reference -############# - -``_core.py``: The main BioCypher interface -========================================= -.. automodule:: biocypher._core - :members: - -``_write.py``: Write the Graph to various formats for batch import -================================================================== -.. automodule:: biocypher._write - :members: - -``_connect.py``: On-line functionality for interaction with a DBMS -=============================================================== -.. automodule:: biocypher._connect - :members: - -``_mapping.py``: Mapping of data inputs to KG ontology -=================================================== -.. automodule:: biocypher._mapping - :members: - -``_ontology.py``: Ontology ingestion, parsing, and manipulation -============================================================== -.. automodule:: biocypher._ontology - :members: - -``_create.py``: Base classes for node and edge representations in BioCypher -========================================================================= -.. automodule:: biocypher._create - :members: - -``_translate.py``: Translation functionality for implemented types of representation -================================================================================== -.. automodule:: biocypher._translate - :members: - -``_logger.py``: Logging -===================== -.. automodule:: biocypher._logger - :members: - -``_misc.py``: Miscellaneous utility functions -=========================================== -.. automodule:: biocypher._misc - :members: diff --git a/docs/tutorial-adapter.md b/docs/tutorial-adapter.md index 567b9f04..ce1488c9 100644 --- a/docs/tutorial-adapter.md +++ b/docs/tutorial-adapter.md @@ -3,8 +3,8 @@ ```{note} -For a list of existing and planned adapters, please see [here](adapters). You -can also get an overview of pipelines and the adapters they use in our [meta +For a list of existing and planned adapters, please see [here](adapters_info). +You can also get an overview of pipelines and the adapters they use in our [meta graph](https://meta.biocypher.org). ``` diff --git a/docs/tutorial-ontology.md b/docs/tutorial-ontology.md index 2da20011..a63556a3 100644 --- a/docs/tutorial-ontology.md +++ b/docs/tutorial-ontology.md @@ -1,4 +1,4 @@ -(ontologies)= +(tutorial_ontologies)= # Tutorial - Handling Ontologies ![Adapters and ontologies](figure_modularity.png) diff --git a/docs/tutorial.md b/docs/tutorial.md index 345e1cd8..e2477eb9 100644 --- a/docs/tutorial.md +++ b/docs/tutorial.md @@ -6,7 +6,7 @@ link](https://colab.research.google.com/github/biocypher/biocypher/blob/main/tut ``` -(tutorial)= +(tutorial_basic)= # Tutorial - Basics The main purpose of BioCypher is to facilitate the pre-processing of biomedical data to save development time in the maintenance of curated knowledge graphs @@ -76,6 +76,7 @@ directory, and are called using the `biocypher_config_path` argument at instantiation of the BioCypher interface. For more information, see also the [Quickstart Configuration](qs_config) section. +(tut_01)= ## Section 1: Adding data ```{admonition} Tutorial files :class: note @@ -172,20 +173,19 @@ protein: # mapping input_label: uniprot_protein # connection to input stream ``` -The first line (`protein`) identifies our entity and connects to the -ontological backbone; here we define the first class to be represented in the -graph. In the configuration YAML, we represent entities — similar to the -internal representation of Biolink — in lower sentence case (e.g., "small -molecule"). Conversely, for class names, in file names, and property graph -labels, we use PascalCase instead (e.g., "SmallMolecule") to avoid issues with -handling spaces. The transformation is done by BioCypher internally. BioCypher -does not strictly enforce the entities allowed in this class definition; in -fact, we provide [several methods of extending the existing ontological -backbone *ad hoc* by providing custom inheritance or hybridising -ontologies](biolink). However, every entity should at some point be connected -to the underlying ontology, otherwise the multiple hierarchical labels will not -be populated. Following this first line are three indented values of the -protein class. +The first line (`protein`) identifies our entity and connects to the ontological +backbone; here we define the first class to be represented in the graph. In the +configuration YAML, we represent entities — similar to the internal +representation of Biolink — in lower sentence case (e.g., "small molecule"). +Conversely, for class names, in file names, and property graph labels, we use +PascalCase instead (e.g., "SmallMolecule") to avoid issues with handling spaces. +The transformation is done by BioCypher internally. BioCypher does not strictly +enforce the entities allowed in this class definition; in fact, we provide +[several methods of extending the existing ontological backbone *ad hoc* by +providing custom inheritance or hybridising ontologies](tut_hybridising). +However, every entity should at some point be connected to the underlying +ontology, otherwise the multiple hierarchical labels will not be populated. +Following this first line are three indented values of the protein class. The second line (`represented_as`) tells BioCypher in which way each entity should be represented in the graph; the only options are `node` and `edge`. @@ -561,7 +561,8 @@ hash of the concatenation of these values. Edge IDs are active by default, but can be deactivated by setting the `use_id` field to `false` in the `schema_config.yaml` file. -```{yaml} schema_config.yaml +```{code-block} yaml +:caption: schema_config.yaml protein protein interaction: is_a: pairwise molecular interaction represented_as: edge From 164ab3de61d3bfe6a1683dd2f5ec37ca73dfdf80 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Tue, 1 Aug 2023 15:35:21 +0200 Subject: [PATCH 057/343] remove pandas tutorials, rename notebook --- tutorial/01__basic_import_pandas.py | 29 -------- tutorial/02__merge_pandas.py | 37 ---------- tutorial/03__implicit_subclass_pandas.py | 39 ----------- tutorial/04__properties_pandas.py | 39 ----------- tutorial/05__property_inheritance_pandas.py | 44 ------------ tutorial/06__relationships_pandas.py | 63 ----------------- tutorial/06_schema_config_pandas.yaml | 25 ------- tutorial/07__synonyms_pandas.py | 68 ------------------- tutorial/07_schema_config_pandas.yaml | 31 --------- ...as.ipynb => example_notebook_pandas.ipynb} | 0 10 files changed, 375 deletions(-) delete mode 100644 tutorial/01__basic_import_pandas.py delete mode 100644 tutorial/02__merge_pandas.py delete mode 100644 tutorial/03__implicit_subclass_pandas.py delete mode 100644 tutorial/04__properties_pandas.py delete mode 100644 tutorial/05__property_inheritance_pandas.py delete mode 100644 tutorial/06__relationships_pandas.py delete mode 100644 tutorial/06_schema_config_pandas.yaml delete mode 100644 tutorial/07__synonyms_pandas.py delete mode 100644 tutorial/07_schema_config_pandas.yaml rename tutorial/{08_basics_pandas.ipynb => example_notebook_pandas.ipynb} (100%) diff --git a/tutorial/01__basic_import_pandas.py b/tutorial/01__basic_import_pandas.py deleted file mode 100644 index e12c4cc9..00000000 --- a/tutorial/01__basic_import_pandas.py +++ /dev/null @@ -1,29 +0,0 @@ -from biocypher import BioCypher -from tutorial.data_generator import Protein - - -def main(): - # Setup: create a list of proteins to be imported - proteins = [Protein() for _ in range(10)] - - # Extract id, label, and property dictionary - def node_generator(): - for protein in proteins: - yield ( - protein.get_id(), - protein.get_label(), - protein.get_properties(), - ) - - # Create BioCypher driver - bc = BioCypher( - biocypher_config_path="tutorial/01_biocypher_config.yaml", - schema_config_path="tutorial/01_schema_config.yaml", - ) - # Run the import - bc.add(node_generator()) - bc.to_df() - - -if __name__ == "__main__": - main() diff --git a/tutorial/02__merge_pandas.py b/tutorial/02__merge_pandas.py deleted file mode 100644 index 6f9aa126..00000000 --- a/tutorial/02__merge_pandas.py +++ /dev/null @@ -1,37 +0,0 @@ -from biocypher import BioCypher -from tutorial.data_generator import Protein, EntrezProtein - - -def main(): - # Setup: create a list of proteins to be imported - proteins = [ - p - for sublist in zip( - [Protein() for _ in range(10)], - [EntrezProtein() for _ in range(10)], - ) - for p in sublist - ] - - # Extract id, label, and property dictionary - def node_generator(): - for protein in proteins: - yield ( - protein.get_id(), - protein.get_label(), - protein.get_properties(), - ) - - # Create BioCypher driver - bc = BioCypher( - biocypher_config_path="tutorial/02_biocypher_config.yaml", - schema_config_path="tutorial/02_schema_config.yaml", - ) - # Run the import - bc.add(node_generator()) - - print(bc.to_df()) - - -if __name__ == "__main__": - main() diff --git a/tutorial/03__implicit_subclass_pandas.py b/tutorial/03__implicit_subclass_pandas.py deleted file mode 100644 index 709984a1..00000000 --- a/tutorial/03__implicit_subclass_pandas.py +++ /dev/null @@ -1,39 +0,0 @@ -from biocypher import BioCypher -from tutorial.data_generator import Protein, EntrezProtein - - -def main(): - # Setup: create a list of proteins to be imported - proteins = [ - p - for sublist in zip( - [Protein() for _ in range(10)], - [EntrezProtein() for _ in range(10)], - ) - for p in sublist - ] - - # Extract id, label, and property dictionary - def node_generator(): - for protein in proteins: - yield ( - protein.get_id(), - protein.get_label(), - protein.get_properties(), - ) - - # Create BioCypher driver - bc = BioCypher( - biocypher_config_path="tutorial/03_biocypher_config.yaml", - schema_config_path="tutorial/03_schema_config.yaml", - ) - # Run the import - bc.add(node_generator()) - - for name, df in bc.to_df().items(): - print(name) - print(df) - - -if __name__ == "__main__": - main() diff --git a/tutorial/04__properties_pandas.py b/tutorial/04__properties_pandas.py deleted file mode 100644 index fc39e294..00000000 --- a/tutorial/04__properties_pandas.py +++ /dev/null @@ -1,39 +0,0 @@ -from biocypher import BioCypher -from tutorial.data_generator import EntrezProtein, RandomPropertyProtein - - -def main(): - # Setup: create a list of proteins to be imported - proteins = [ - p - for sublist in zip( - [RandomPropertyProtein() for _ in range(10)], - [EntrezProtein() for _ in range(10)], - ) - for p in sublist - ] - - # Extract id, label, and property dictionary - def node_generator(): - for protein in proteins: - yield ( - protein.get_id(), - protein.get_label(), - protein.get_properties(), - ) - - # Create BioCypher driver - bc = BioCypher( - biocypher_config_path="tutorial/04_biocypher_config.yaml", - schema_config_path="tutorial/04_schema_config.yaml", - ) - # Run the import - bc.add(node_generator()) - - for name, df in bc.to_df().items(): - print(name) - print(df) - - -if __name__ == "__main__": - main() diff --git a/tutorial/05__property_inheritance_pandas.py b/tutorial/05__property_inheritance_pandas.py deleted file mode 100644 index b0ccf2ec..00000000 --- a/tutorial/05__property_inheritance_pandas.py +++ /dev/null @@ -1,44 +0,0 @@ -from biocypher import BioCypher -from tutorial.data_generator import ( - EntrezProtein, - RandomPropertyProtein, - RandomPropertyProteinIsoform, -) - - -def main(): - # Setup: create a list of proteins to be imported - proteins = [ - p - for sublist in zip( - [RandomPropertyProtein() for _ in range(10)], - [RandomPropertyProteinIsoform() for _ in range(10)], - [EntrezProtein() for _ in range(10)], - ) - for p in sublist - ] - - # Extract id, label, and property dictionary - def node_generator(): - for protein in proteins: - yield ( - protein.get_id(), - protein.get_label(), - protein.get_properties(), - ) - - # Create BioCypher driver - bc = BioCypher( - biocypher_config_path="tutorial/05_biocypher_config.yaml", - schema_config_path="tutorial/05_schema_config.yaml", - ) - # Run the import - bc.add(node_generator()) - - for name, df in bc.to_df().items(): - print(name) - print(df) - - -if __name__ == "__main__": - main() diff --git a/tutorial/06__relationships_pandas.py b/tutorial/06__relationships_pandas.py deleted file mode 100644 index b67a5b4d..00000000 --- a/tutorial/06__relationships_pandas.py +++ /dev/null @@ -1,63 +0,0 @@ -from biocypher import BioCypher -from tutorial.data_generator import ( - EntrezProtein, - InteractionGenerator, - RandomPropertyProtein, - RandomPropertyProteinIsoform, -) - - -def main(): - # Setup: create a list of proteins to be imported - proteins = [ - p - for sublist in zip( - [RandomPropertyProtein() for _ in range(10)], - [RandomPropertyProteinIsoform() for _ in range(10)], - [EntrezProtein() for _ in range(10)], - ) - for p in sublist - ] - - # Extract id, label, and property dictionary - def node_generator(): - for protein in proteins: - yield ( - protein.get_id(), - protein.get_label(), - protein.get_properties(), - ) - - # Simulate edges - ppi = InteractionGenerator( - interactors=[p.get_id() for p in proteins], - interaction_probability=0.05, - ).generate_interactions() - - # Extract id, source, target, label, and property dictionary - def edge_generator(): - for interaction in ppi: - yield ( - interaction.get_id(), - interaction.get_source_id(), - interaction.get_target_id(), - interaction.get_label(), - interaction.get_properties(), - ) - - # Create BioCypher driver - bc = BioCypher( - biocypher_config_path="tutorial/06_biocypher_config.yaml", - schema_config_path="tutorial/06_schema_config_pandas.yaml", - ) - # Run the import - bc.add(node_generator()) - bc.add(edge_generator()) - - for name, df in bc.to_df().items(): - print(name) - print(df) - - -if __name__ == "__main__": - main() diff --git a/tutorial/06_schema_config_pandas.yaml b/tutorial/06_schema_config_pandas.yaml deleted file mode 100644 index c030ccce..00000000 --- a/tutorial/06_schema_config_pandas.yaml +++ /dev/null @@ -1,25 +0,0 @@ -protein: - represented_as: node - preferred_id: [uniprot, entrez] - input_label: [uniprot_protein, entrez_protein] - properties: - sequence: str - description: str - taxon: str - mass: int - -protein isoform: - is_a: protein - inherit_properties: true - represented_as: node - preferred_id: uniprot - input_label: uniprot_isoform - -protein protein interaction: - is_a: pairwise molecular interaction - represented_as: edge - preferred_id: intact - input_label: interacts_with - properties: - method: str - source: str diff --git a/tutorial/07__synonyms_pandas.py b/tutorial/07__synonyms_pandas.py deleted file mode 100644 index 95ce0a13..00000000 --- a/tutorial/07__synonyms_pandas.py +++ /dev/null @@ -1,68 +0,0 @@ -from biocypher import BioCypher -from tutorial.data_generator import ( - Complex, - EntrezProtein, - InteractionGenerator, - RandomPropertyProtein, - RandomPropertyProteinIsoform, -) - - -def main(): - # Setup: create a list of proteins to be imported - proteins_complexes = [ - p - for sublist in zip( - [RandomPropertyProtein() for _ in range(10)], - [RandomPropertyProteinIsoform() for _ in range(10)], - [EntrezProtein() for _ in range(10)], - [Complex() for _ in range(10)], - ) - for p in sublist - ] - - # Extract id, label, and property dictionary - def node_generator(): - for p_or_c in proteins_complexes: - yield ( - p_or_c.get_id(), - p_or_c.get_label(), - p_or_c.get_properties(), - ) - - # Simulate edges - ppi = InteractionGenerator( - interactors=[p.get_id() for p in proteins_complexes], - interaction_probability=0.05, - ).generate_interactions() - - # Extract id, source, target, label, and property dictionary - def edge_generator(): - for interaction in ppi: - yield ( - interaction.get_id(), - interaction.get_source_id(), - interaction.get_target_id(), - interaction.get_label(), - interaction.get_properties(), - ) - - # Create BioCypher driver - bc = BioCypher( - biocypher_config_path="tutorial/07_biocypher_config.yaml", - schema_config_path="tutorial/07_schema_config_pandas.yaml", - ) - # Run the import - bc.add(node_generator()) - bc.add(edge_generator()) - - for name, df in bc.to_df().items(): - print(name) - print(df) - - # Visualise ontology schema and log duplicates / missing labels - bc.summary() - - -if __name__ == "__main__": - main() diff --git a/tutorial/07_schema_config_pandas.yaml b/tutorial/07_schema_config_pandas.yaml deleted file mode 100644 index d3c3ff9e..00000000 --- a/tutorial/07_schema_config_pandas.yaml +++ /dev/null @@ -1,31 +0,0 @@ -protein: - represented_as: node - preferred_id: [uniprot, entrez] - input_label: [uniprot_protein, entrez_protein] - properties: - sequence: str - description: str - taxon: str - mass: int - -protein isoform: - is_a: protein - inherit_properties: true - represented_as: node - preferred_id: uniprot - input_label: uniprot_isoform - -protein protein interaction: - is_a: pairwise molecular interaction - represented_as: edge - preferred_id: intact - input_label: interacts_with - properties: - method: str - source: str - -complex: - synonym_for: macromolecular complex - represented_as: node - preferred_id: complexportal - input_label: complex diff --git a/tutorial/08_basics_pandas.ipynb b/tutorial/example_notebook_pandas.ipynb similarity index 100% rename from tutorial/08_basics_pandas.ipynb rename to tutorial/example_notebook_pandas.ipynb From e6d61fb3fcf0e9d0607c62a06a1d2144a3d765ca Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Tue, 1 Aug 2023 16:17:13 +0200 Subject: [PATCH 058/343] render jupyter notebook as HTML tutorial using .. nbsphinx; fix links, move notebook to docs folder --- docs/conf.py | 1 + docs/contents.rst | 1 + .../notebooks/pandas_tutorial.ipynb | 222 +--------- docs/tutorial.md | 8 - poetry.lock | 410 +++++++++++++++++- pyproject.toml | 1 + 6 files changed, 423 insertions(+), 220 deletions(-) rename tutorial/example_notebook_pandas.ipynb => docs/notebooks/pandas_tutorial.ipynb (77%) diff --git a/docs/conf.py b/docs/conf.py index ed058b6e..c9d2518d 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -52,6 +52,7 @@ "myst_parser", # markdown support "sphinx_rtd_theme", "sphinx_design", + "nbsphinx", ] myst_enable_extensions = ["colon_fence"] diff --git a/docs/contents.rst b/docs/contents.rst index 50b3839e..de9a4b46 100644 --- a/docs/contents.rst +++ b/docs/contents.rst @@ -8,6 +8,7 @@ installation quickstart adapters + notebooks/pandas_tutorial.ipynb tutorial tutorial-ontology tutorial-adapter diff --git a/tutorial/example_notebook_pandas.ipynb b/docs/notebooks/pandas_tutorial.ipynb similarity index 77% rename from tutorial/example_notebook_pandas.ipynb rename to docs/notebooks/pandas_tutorial.ipynb index 877042e7..24cf26dd 100644 --- a/tutorial/example_notebook_pandas.ipynb +++ b/docs/notebooks/pandas_tutorial.ipynb @@ -5,7 +5,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "# BioCypher Tutorial - Basics with Pandas" + "# Example Notebook: BioCypher and Pandas" ] }, { @@ -13,6 +13,12 @@ "cell_type": "markdown", "metadata": {}, "source": [ + "
\n", + "**Tip:** You can __[run the tutorial interactively in Google Colab](https://colab.research.google.com/github/biocypher/biocypher/blob/main/docs/notebooks/pandas_tutorial.ipynb)__.\n", + "
\n", + "\n", + "## Introduction\n", + "\n", "The main purpose of BioCypher is to facilitate the pre-processing of biomedical data, and thus save development time in the maintenance of curated knowledge graphs, while allowing simple and efficient creation of task-specific lightweight knowledge graphs in a user-friendly and biology-centric fashion.\n", "\n", "We are going to use a toy example to familiarise the user with the basic functionality of BioCypher. One central task of BioCypher is the harmonisation of dissimilar datasets describing the same entities. Thus, in this example, the input data - which in the real-world use case could come from any type of interface - are represented by simulated data containing some examples of differently formatted biomedical entities such as proteins and their interactions.\n", @@ -41,7 +47,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "To run this tutorial, you will first need to install perform some setup steps specific to running on Google Colab. You can collapse this section and run the setup steps with one click, as they are not required for the explanation of BioCyper's functionality. You can of course also run the steps one by one, if you want to see what is happening. The real tutorial starts with section 1, \"Adding data\"." + "To run this tutorial interactively, you will first need to install perform some setup steps specific to running on Google Colab. You can collapse this section and run the setup steps with one click, as they are not required for the explanation of BioCyper's functionality. You can of course also run the steps one by one, if you want to see what is happening. The real tutorial starts with [section 1, \"Adding data\"](https://biocypher.org/notebooks/pandas_tutorial.html#section-1-adding-data)." ] }, { @@ -85,30 +91,7 @@ "cell_type": "code", "execution_count": null, "metadata": {}, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "--2023-06-25 13:41:50-- https://github.com/biocypher/biocypher/raw/main/tutorial/data_generator.py\n", - "Resolving github.com (github.com)... 140.82.121.3\n", - "Connecting to github.com (github.com)|140.82.121.3|:443... connected.\n", - "HTTP request sent, awaiting response... 302 Found\n", - "Location: https://raw.githubusercontent.com/biocypher/biocypher/main/tutorial/data_generator.py [following]\n", - "--2023-06-25 13:41:51-- https://raw.githubusercontent.com/biocypher/biocypher/main/tutorial/data_generator.py\n", - "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", - "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", - "HTTP request sent, awaiting response... 200 OK\n", - "Length: 6970 (6,8K) [text/plain]\n", - "Saving to: ‘data_generator.py’\n", - "\n", - "data_generator.py 100%[===================>] 6,81K --.-KB/s in 0s \n", - "\n", - "2023-06-25 13:41:51 (28,3 MB/s) - ‘data_generator.py’ saved [6970/6970]\n", - "\n" - ] - } - ], + "outputs": [], "source": [ "!wget -O data_generator.py \"https://github.com/biocypher/biocypher/raw/main/tutorial/data_generator.py\"" ] @@ -117,190 +100,7 @@ "cell_type": "code", "execution_count": null, "metadata": {}, - "outputs": [ - { - "name": "stderr", - "output_type": "stream", - "text": [ - "--2023-06-25 13:41:51-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/01_biocypher_config.yaml\n", - "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", - "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", - "HTTP request sent, awaiting response... 200 OK\n", - "Length: 64 [text/plain]\n", - "Saving to: ‘01_biocypher_config.yaml.1’\n", - "\n", - " 0K 100% 2,96M=0s\n", - "\n", - "2023-06-25 13:41:51 (2,96 MB/s) - ‘01_biocypher_config.yaml.1’ saved [64/64]\n", - "\n", - "--2023-06-25 13:41:51-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/01_schema_config.yaml\n", - "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", - "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", - "HTTP request sent, awaiting response... 200 OK\n", - "Length: 93 [text/plain]\n", - "Saving to: ‘01_schema_config.yaml.1’\n", - "\n", - " 0K 100% 2,03M=0s\n", - "\n", - "2023-06-25 13:41:51 (2,03 MB/s) - ‘01_schema_config.yaml.1’ saved [93/93]\n", - "\n", - "--2023-06-25 13:41:51-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/02_biocypher_config.yaml\n", - "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", - "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", - "HTTP request sent, awaiting response... 200 OK\n", - "Length: 58 [text/plain]\n", - "Saving to: ‘02_biocypher_config.yaml.1’\n", - "\n", - " 0K 100% 3,21M=0s\n", - "\n", - "2023-06-25 13:41:52 (3,21 MB/s) - ‘02_biocypher_config.yaml.1’ saved [58/58]\n", - "\n", - "--2023-06-25 13:41:52-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/02_schema_config.yaml\n", - "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", - "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", - "HTTP request sent, awaiting response... 200 OK\n", - "Length: 111 [text/plain]\n", - "Saving to: ‘02_schema_config.yaml.1’\n", - "\n", - " 0K 100% 1,82M=0s\n", - "\n", - "2023-06-25 13:41:52 (1,82 MB/s) - ‘02_schema_config.yaml.1’ saved [111/111]\n", - "\n", - "--2023-06-25 13:41:52-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/03_biocypher_config.yaml\n", - "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", - "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", - "HTTP request sent, awaiting response... 200 OK\n", - "Length: 69 [text/plain]\n", - "Saving to: ‘03_biocypher_config.yaml.1’\n", - "\n", - " 0K 100% 1,43M=0s\n", - "\n", - "2023-06-25 13:41:52 (1,43 MB/s) - ‘03_biocypher_config.yaml.1’ saved [69/69]\n", - "\n", - "--2023-06-25 13:41:52-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/03_schema_config.yaml\n", - "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", - "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", - "HTTP request sent, awaiting response... 200 OK\n", - "Length: 121 [text/plain]\n", - "Saving to: ‘03_schema_config.yaml.1’\n", - "\n", - " 0K 100% 11,4M=0s\n", - "\n", - "2023-06-25 13:41:52 (11,4 MB/s) - ‘03_schema_config.yaml.1’ saved [121/121]\n", - "\n", - "--2023-06-25 13:41:52-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/04_biocypher_config.yaml\n", - "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", - "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", - "HTTP request sent, awaiting response... 200 OK\n", - "Length: 63 [text/plain]\n", - "Saving to: ‘04_biocypher_config.yaml.1’\n", - "\n", - " 0K 100% 1,04M=0s\n", - "\n", - "2023-06-25 13:41:52 (1,04 MB/s) - ‘04_biocypher_config.yaml.1’ saved [63/63]\n", - "\n", - "--2023-06-25 13:41:52-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/04_schema_config.yaml\n", - "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", - "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", - "HTTP request sent, awaiting response... 200 OK\n", - "Length: 221 [text/plain]\n", - "Saving to: ‘04_schema_config.yaml.1’\n", - "\n", - " 0K 100% 19,4M=0s\n", - "\n", - "2023-06-25 13:41:53 (19,4 MB/s) - ‘04_schema_config.yaml.1’ saved [221/221]\n", - "\n", - "--2023-06-25 13:41:53-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/05_biocypher_config.yaml\n", - "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", - "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", - "HTTP request sent, awaiting response... 200 OK\n", - "Length: 72 [text/plain]\n", - "Saving to: ‘05_biocypher_config.yaml.1’\n", - "\n", - " 0K 100% 1,58M=0s\n", - "\n", - "2023-06-25 13:41:53 (1,58 MB/s) - ‘05_biocypher_config.yaml.1’ saved [72/72]\n", - "\n", - "--2023-06-25 13:41:53-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/05_schema_config.yaml\n", - "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", - "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", - "HTTP request sent, awaiting response... 200 OK\n", - "Length: 370 [text/plain]\n", - "Saving to: ‘05_schema_config.yaml.1’\n", - "\n", - " 0K 100% 9,42M=0s\n", - "\n", - "2023-06-25 13:41:53 (9,42 MB/s) - ‘05_schema_config.yaml.1’ saved [370/370]\n", - "\n", - "--2023-06-25 13:41:53-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/06_biocypher_config.yaml\n", - "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", - "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", - "HTTP request sent, awaiting response... 200 OK\n", - "Length: 66 [text/plain]\n", - "Saving to: ‘06_biocypher_config.yaml.1’\n", - "\n", - " 0K 100% 4,99M=0s\n", - "\n", - "2023-06-25 13:41:53 (4,99 MB/s) - ‘06_biocypher_config.yaml.1’ saved [66/66]\n", - "\n", - "--2023-06-25 13:41:53-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/06_schema_config.yaml\n", - "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", - "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", - "HTTP request sent, awaiting response... 200 OK\n", - "Length: 579 [text/plain]\n", - "Saving to: ‘06_schema_config.yaml.1’\n", - "\n", - " 0K 100% 18,8M=0s\n", - "\n", - "2023-06-25 13:41:53 (18,8 MB/s) - ‘06_schema_config.yaml.1’ saved [579/579]\n", - "\n", - "--2023-06-25 13:41:53-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/06_schema_config_pandas.yaml\n", - "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", - "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", - "HTTP request sent, awaiting response... 200 OK\n", - "Length: 579 [text/plain]\n", - "Saving to: ‘06_schema_config_pandas.yaml.1’\n", - "\n", - " 0K 100% 14,3M=0s\n", - "\n", - "2023-06-25 13:41:54 (14,3 MB/s) - ‘06_schema_config_pandas.yaml.1’ saved [579/579]\n", - "\n", - "--2023-06-25 13:41:54-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/07_biocypher_config.yaml\n", - "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", - "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", - "HTTP request sent, awaiting response... 200 OK\n", - "Length: 79 [text/plain]\n", - "Saving to: ‘07_biocypher_config.yaml.1’\n", - "\n", - " 0K 100% 1,21M=0s\n", - "\n", - "2023-06-25 13:41:54 (1,21 MB/s) - ‘07_biocypher_config.yaml.1’ saved [79/79]\n", - "\n", - "--2023-06-25 13:41:54-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/07_schema_config.yaml\n", - "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", - "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", - "HTTP request sent, awaiting response... 200 OK\n", - "Length: 711 [text/plain]\n", - "Saving to: ‘07_schema_config.yaml.1’\n", - "\n", - " 0K 100% 25,2M=0s\n", - "\n", - "2023-06-25 13:41:54 (25,2 MB/s) - ‘07_schema_config.yaml.1’ saved [711/711]\n", - "\n", - "--2023-06-25 13:41:54-- https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/07_schema_config_pandas.yaml\n", - "Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.109.133, 185.199.111.133, 185.199.108.133, ...\n", - "Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.109.133|:443... connected.\n", - "HTTP request sent, awaiting response... 200 OK\n", - "Length: 711 [text/plain]\n", - "Saving to: ‘07_schema_config_pandas.yaml.1’\n", - "\n", - " 0K 100% 8,67M=0s\n", - "\n", - "2023-06-25 13:41:54 (8,67 MB/s) - ‘07_schema_config_pandas.yaml.1’ saved [711/711]\n", - "\n" - ] - } - ], + "outputs": [], "source": [ "owner = \"biocypher\"\n", "repo = \"biocypher\"\n", @@ -438,7 +238,7 @@ "managers, and other complicating factors. However, it always boils down to\n", "providing the BioCypher driver with a collection of tuples, one for each entity\n", "in the input data. For more info, see the section on\n", - "[Adapters](adapter_functions).\n", + "[Adapters](../adapters.md).\n", "\n", "As descibed above, *nodes* possess:\n", "\n", diff --git a/docs/tutorial.md b/docs/tutorial.md index e2477eb9..befc2461 100644 --- a/docs/tutorial.md +++ b/docs/tutorial.md @@ -1,11 +1,3 @@ -```{admonition} Google Colab Version of the Tutorial -:class: tip - -You can run the tutorial interactively in Google Colab by clicking [this -link](https://colab.research.google.com/github/biocypher/biocypher/blob/main/tutorial/08_basics_pandas.ipynb). - -``` - (tutorial_basic)= # Tutorial - Basics The main purpose of BioCypher is to facilitate the pre-processing of biomedical diff --git a/poetry.lock b/poetry.lock index 8b16622c..e2a65935 100644 --- a/poetry.lock +++ b/poetry.lock @@ -67,6 +67,36 @@ category = "dev" optional = false python-versions = "*" +[[package]] +name = "beautifulsoup4" +version = "4.12.2" +description = "Screen-scraping library" +category = "dev" +optional = false +python-versions = ">=3.6.0" + +[package.dependencies] +soupsieve = ">1.2" + +[package.extras] +html5lib = ["html5lib"] +lxml = ["lxml"] + +[[package]] +name = "bleach" +version = "6.0.0" +description = "An easy safelist-based HTML-sanitizing tool." +category = "dev" +optional = false +python-versions = ">=3.7" + +[package.dependencies] +six = ">=1.9.0" +webencodings = "*" + +[package.extras] +css = ["tinycss2 (>=1.1.0,<1.2)"] + [[package]] name = "bump2version" version = "1.0.1" @@ -231,6 +261,14 @@ category = "dev" optional = false python-versions = ">=3.5" +[[package]] +name = "defusedxml" +version = "0.7.1" +description = "XML bomb protection for Python stdlib modules" +category = "dev" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" + [[package]] name = "distlib" version = "0.3.6" @@ -269,6 +307,17 @@ python-versions = "*" [package.extras] tests = ["asttokens", "littleutils", "pytest", "rich"] +[[package]] +name = "fastjsonschema" +version = "2.18.0" +description = "Fastest Python implementation of JSON schema" +category = "dev" +optional = false +python-versions = "*" + +[package.extras] +devel = ["colorama", "json-spec", "jsonschema", "pylint", "pytest", "pytest-benchmark", "pytest-cache", "validictory"] + [[package]] name = "filelock" version = "3.10.7" @@ -518,6 +567,35 @@ MarkupSafe = ">=2.0" [package.extras] i18n = ["Babel (>=2.7)"] +[[package]] +name = "jsonschema" +version = "4.18.4" +description = "An implementation of JSON Schema validation for Python" +category = "dev" +optional = false +python-versions = ">=3.8" + +[package.dependencies] +attrs = ">=22.2.0" +jsonschema-specifications = ">=2023.03.6" +referencing = ">=0.28.4" +rpds-py = ">=0.7.1" + +[package.extras] +format = ["fqdn", "idna", "isoduration", "jsonpointer (>1.13)", "rfc3339-validator", "rfc3987", "uri-template", "webcolors (>=1.11)"] +format-nongpl = ["fqdn", "idna", "isoduration", "jsonpointer (>1.13)", "rfc3339-validator", "rfc3986-validator (>0.1.0)", "uri-template", "webcolors (>=1.11)"] + +[[package]] +name = "jsonschema-specifications" +version = "2023.7.1" +description = "The JSON Schema meta-schemas and vocabularies, exposed as a Registry" +category = "dev" +optional = false +python-versions = ">=3.8" + +[package.dependencies] +referencing = ">=0.28.0" + [[package]] name = "jupyter-client" version = "8.2.0" @@ -555,6 +633,14 @@ traitlets = ">=5.3" docs = ["myst-parser", "sphinx-autodoc-typehints", "sphinxcontrib-github-alt", "sphinxcontrib-spelling", "traitlets"] test = ["ipykernel", "pre-commit", "pytest", "pytest-cov", "pytest-timeout"] +[[package]] +name = "jupyterlab-pygments" +version = "0.2.2" +description = "Pygments theme using JupyterLab CSS variables" +category = "dev" +optional = false +python-versions = ">=3.7" + [[package]] name = "kiwisolver" version = "1.4.4" @@ -648,6 +734,14 @@ category = "dev" optional = false python-versions = ">=3.7" +[[package]] +name = "mistune" +version = "3.0.1" +description = "A sane and fast Markdown parser with useful plugins and renderers" +category = "dev" +optional = false +python-versions = ">=3.7" + [[package]] name = "more-itertools" version = "9.1.0" @@ -679,6 +773,94 @@ linkify = ["linkify-it-py (>=1.0,<2.0)"] rtd = ["ipython", "sphinx-book-theme", "sphinx-design", "sphinxcontrib.mermaid (>=0.7.1,<0.8.0)", "sphinxext-opengraph (>=0.6.3,<0.7.0)", "sphinxext-rediraffe (>=0.2.7,<0.3.0)"] testing = ["beautifulsoup4", "coverage[toml]", "pytest (>=6,<7)", "pytest-cov", "pytest-param-files (>=0.3.4,<0.4.0)", "pytest-regressions", "sphinx (<5.2)", "sphinx-pytest"] +[[package]] +name = "nbclient" +version = "0.8.0" +description = "A client library for executing notebooks. Formerly nbconvert's ExecutePreprocessor." +category = "dev" +optional = false +python-versions = ">=3.8.0" + +[package.dependencies] +jupyter-client = ">=6.1.12" +jupyter-core = ">=4.12,<5.0.0 || >=5.1.0" +nbformat = ">=5.1" +traitlets = ">=5.4" + +[package.extras] +dev = ["pre-commit"] +docs = ["autodoc-traits", "mock", "moto", "myst-parser", "nbclient[test]", "sphinx (>=1.7)", "sphinx-book-theme", "sphinxcontrib-spelling"] +test = ["flaky", "ipykernel (>=6.19.3)", "ipython", "ipywidgets", "nbconvert (>=7.0.0)", "pytest (>=7.0)", "pytest-asyncio", "pytest-cov (>=4.0)", "testpath", "xmltodict"] + +[[package]] +name = "nbconvert" +version = "7.7.3" +description = "Converting Jupyter Notebooks" +category = "dev" +optional = false +python-versions = ">=3.8" + +[package.dependencies] +beautifulsoup4 = "*" +bleach = "!=5.0.0" +defusedxml = "*" +importlib-metadata = {version = ">=3.6", markers = "python_version < \"3.10\""} +jinja2 = ">=3.0" +jupyter-core = ">=4.7" +jupyterlab-pygments = "*" +markupsafe = ">=2.0" +mistune = ">=2.0.3,<4" +nbclient = ">=0.5.0" +nbformat = ">=5.7" +packaging = "*" +pandocfilters = ">=1.4.1" +pygments = ">=2.4.1" +tinycss2 = "*" +traitlets = ">=5.1" + +[package.extras] +all = ["nbconvert[docs,qtpdf,serve,test,webpdf]"] +docs = ["ipykernel", "ipython", "myst-parser", "nbsphinx (>=0.2.12)", "pydata-sphinx-theme", "sphinx (==5.0.2)", "sphinxcontrib-spelling"] +qtpdf = ["nbconvert[qtpng]"] +qtpng = ["pyqtwebengine (>=5.15)"] +serve = ["tornado (>=6.1)"] +test = ["flaky", "ipykernel", "ipywidgets (>=7)", "pre-commit", "pytest", "pytest-dependency"] +webpdf = ["playwright"] + +[[package]] +name = "nbformat" +version = "5.9.2" +description = "The Jupyter Notebook format" +category = "dev" +optional = false +python-versions = ">=3.8" + +[package.dependencies] +fastjsonschema = "*" +jsonschema = ">=2.6" +jupyter-core = "*" +traitlets = ">=5.1" + +[package.extras] +docs = ["myst-parser", "pydata-sphinx-theme", "sphinx", "sphinxcontrib-github-alt", "sphinxcontrib-spelling"] +test = ["pep440", "pre-commit", "pytest", "testpath"] + +[[package]] +name = "nbsphinx" +version = "0.9.2" +description = "Jupyter Notebook Tools for Sphinx" +category = "dev" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +docutils = "*" +jinja2 = "*" +nbconvert = "!=5.4" +nbformat = "*" +sphinx = ">=1.8" +traitlets = ">=5" + [[package]] name = "neo4j" version = "4.4.10" @@ -795,6 +977,14 @@ sql-other = ["SQLAlchemy (>=1.4.16)"] test = ["hypothesis (>=6.34.2)", "pytest (>=7.0.0)", "pytest-asyncio (>=0.17.0)", "pytest-xdist (>=2.2.0)"] xml = ["lxml (>=4.6.3)"] +[[package]] +name = "pandocfilters" +version = "1.5.0" +description = "Utilities for writing pandoc filters in python" +category = "dev" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" + [[package]] name = "parso" version = "0.8.3" @@ -1063,6 +1253,18 @@ html = ["html5lib (>=1.0,<2.0)"] lxml = ["lxml (>=4.3.0,<5.0.0)"] networkx = ["networkx (>=2.0.0,<3.0.0)"] +[[package]] +name = "referencing" +version = "0.30.0" +description = "JSON Referencing + Python" +category = "dev" +optional = false +python-versions = ">=3.8" + +[package.dependencies] +attrs = ">=22.2.0" +rpds-py = ">=0.7.0" + [[package]] name = "requests" version = "2.28.2" @@ -1081,6 +1283,14 @@ urllib3 = ">=1.21.1,<1.27" socks = ["PySocks (>=1.5.6,!=1.5.7)"] use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"] +[[package]] +name = "rpds-py" +version = "0.9.2" +description = "Python bindings to Rust's persistent data structures (rpds)" +category = "dev" +optional = false +python-versions = ">=3.8" + [[package]] name = "setuptools" version = "67.6.1" @@ -1136,6 +1346,14 @@ category = "dev" optional = false python-versions = "*" +[[package]] +name = "soupsieve" +version = "2.4.1" +description = "A modern CSS selector implementation for Beautiful Soup." +category = "dev" +optional = false +python-versions = ">=3.7" + [[package]] name = "sphinx" version = "5.3.0" @@ -1349,6 +1567,21 @@ category = "main" optional = false python-versions = "*" +[[package]] +name = "tinycss2" +version = "1.2.1" +description = "A tiny CSS parser" +category = "dev" +optional = false +python-versions = ">=3.7" + +[package.dependencies] +webencodings = ">=0.4" + +[package.extras] +doc = ["sphinx", "sphinx_rtd_theme"] +test = ["flake8", "isort", "pytest"] + [[package]] name = "toml" version = "0.10.2" @@ -1474,6 +1707,14 @@ category = "dev" optional = false python-versions = "*" +[[package]] +name = "webencodings" +version = "0.5.1" +description = "Character encoding aliases for legacy web content" +category = "dev" +optional = false +python-versions = "*" + [[package]] name = "yapf" version = "0.32.0" @@ -1497,7 +1738,7 @@ testing = ["big-O", "flake8 (<5)", "jaraco.functools", "jaraco.itertools", "more [metadata] lock-version = "1.1" python-versions = "^3.9" -content-hash = "fb89c165552e777ab38309aead61452103dc99f78f65e1a9af3d8771c2d75343" +content-hash = "8e8d3740d828a8d8e9e11b8ff4f81d22a09bbe2929f6a1cb85391d2cb8245ee1" [metadata.files] alabaster = [ @@ -1528,6 +1769,14 @@ backcall = [ {file = "backcall-0.2.0-py2.py3-none-any.whl", hash = "sha256:fbbce6a29f263178a1f7915c1940bde0ec2b2a967566fe1c65c1dfb7422bd255"}, {file = "backcall-0.2.0.tar.gz", hash = "sha256:5cbdbf27be5e7cfadb448baf0aa95508f91f2bbc6c6437cd9cd06e2a4c215e1e"}, ] +beautifulsoup4 = [ + {file = "beautifulsoup4-4.12.2-py3-none-any.whl", hash = "sha256:bd2520ca0d9d7d12694a53d44ac482d181b4ec1888909b035a3dbf40d0f57d4a"}, + {file = "beautifulsoup4-4.12.2.tar.gz", hash = "sha256:492bbc69dca35d12daac71c4db1bfff0c876c00ef4a2ffacce226d4638eb72da"}, +] +bleach = [ + {file = "bleach-6.0.0-py3-none-any.whl", hash = "sha256:33c16e3353dbd13028ab4799a0f89a83f113405c766e9c122df8a06f5b85b3f4"}, + {file = "bleach-6.0.0.tar.gz", hash = "sha256:1a1a85c1595e07d8db14c5f09f09e6433502c51c595970edc090551f0db99414"}, +] bump2version = [ {file = "bump2version-1.0.1-py2.py3-none-any.whl", hash = "sha256:37f927ea17cde7ae2d7baf832f8e80ce3777624554a653006c9144f8017fe410"}, {file = "bump2version-1.0.1.tar.gz", hash = "sha256:762cb2bfad61f4ec8e2bdf452c7c267416f8c70dd9ecb1653fd0bbb01fa936e6"}, @@ -1829,6 +2078,10 @@ decorator = [ {file = "decorator-5.1.1-py3-none-any.whl", hash = "sha256:b8c3f85900b9dc423225913c5aace94729fe1fa9763b38939a95226f02d37186"}, {file = "decorator-5.1.1.tar.gz", hash = "sha256:637996211036b6385ef91435e4fae22989472f9d571faba8927ba8253acbc330"}, ] +defusedxml = [ + {file = "defusedxml-0.7.1-py2.py3-none-any.whl", hash = "sha256:a352e7e428770286cc899e2542b6cdaedb2b4953ff269a210103ec58f6198a61"}, + {file = "defusedxml-0.7.1.tar.gz", hash = "sha256:1bb3032db185915b62d7c6209c5a8792be6a32ab2fedacc84e01b52c51aa3e69"}, +] distlib = [ {file = "distlib-0.3.6-py2.py3-none-any.whl", hash = "sha256:f35c4b692542ca110de7ef0bea44d73981caeb34ca0b9b6b2e6d7790dda8f80e"}, {file = "distlib-0.3.6.tar.gz", hash = "sha256:14bad2d9b04d3a36127ac97f30b12a19268f211063d8f8ee4f47108896e11b46"}, @@ -1845,6 +2098,10 @@ executing = [ {file = "executing-1.2.0-py2.py3-none-any.whl", hash = "sha256:0314a69e37426e3608aada02473b4161d4caf5a4b244d1d0c48072b8fee7bacc"}, {file = "executing-1.2.0.tar.gz", hash = "sha256:19da64c18d2d851112f09c287f8d3dbbdf725ab0e569077efb6cdcbd3497c107"}, ] +fastjsonschema = [ + {file = "fastjsonschema-2.18.0-py3-none-any.whl", hash = "sha256:128039912a11a807068a7c87d0da36660afbfd7202780db26c4aa7153cfdc799"}, + {file = "fastjsonschema-2.18.0.tar.gz", hash = "sha256:e820349dd16f806e4bd1467a138dced9def4bc7d6213a34295272a6cac95b5bd"}, +] filelock = [ {file = "filelock-3.10.7-py3-none-any.whl", hash = "sha256:bde48477b15fde2c7e5a0713cbe72721cb5a5ad32ee0b8f419907960b9d75536"}, {file = "filelock-3.10.7.tar.gz", hash = "sha256:892be14aa8efc01673b5ed6589dbccb95f9a8596f0507e232626155495c18105"}, @@ -1937,6 +2194,14 @@ jinja2 = [ {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"}, {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"}, ] +jsonschema = [ + {file = "jsonschema-4.18.4-py3-none-any.whl", hash = "sha256:971be834317c22daaa9132340a51c01b50910724082c2c1a2ac87eeec153a3fe"}, + {file = "jsonschema-4.18.4.tar.gz", hash = "sha256:fb3642735399fa958c0d2aad7057901554596c63349f4f6b283c493cf692a25d"}, +] +jsonschema-specifications = [ + {file = "jsonschema_specifications-2023.7.1-py3-none-any.whl", hash = "sha256:05adf340b659828a004220a9613be00fa3f223f2b82002e273dee62fd50524b1"}, + {file = "jsonschema_specifications-2023.7.1.tar.gz", hash = "sha256:c91a50404e88a1f6ba40636778e2ee08f6e24c5613fe4c53ac24578a5a7f72bb"}, +] jupyter-client = [ {file = "jupyter_client-8.2.0-py3-none-any.whl", hash = "sha256:b18219aa695d39e2ad570533e0d71fb7881d35a873051054a84ee2a17c4b7389"}, {file = "jupyter_client-8.2.0.tar.gz", hash = "sha256:9fe233834edd0e6c0aa5f05ca2ab4bdea1842bfd2d8a932878212fc5301ddaf0"}, @@ -1945,6 +2210,10 @@ jupyter-core = [ {file = "jupyter_core-5.3.0-py3-none-any.whl", hash = "sha256:d4201af84559bc8c70cead287e1ab94aeef3c512848dde077b7684b54d67730d"}, {file = "jupyter_core-5.3.0.tar.gz", hash = "sha256:6db75be0c83edbf1b7c9f91ec266a9a24ef945da630f3120e1a0046dc13713fc"}, ] +jupyterlab-pygments = [ + {file = "jupyterlab_pygments-0.2.2-py2.py3-none-any.whl", hash = "sha256:2405800db07c9f770863bcf8049a529c3dd4d3e28536638bd7c1c01d2748309f"}, + {file = "jupyterlab_pygments-0.2.2.tar.gz", hash = "sha256:7405d7fde60819d905a9fa8ce89e4cd830e318cdad22a0030f7a901da705585d"}, +] kiwisolver = [ {file = "kiwisolver-1.4.4-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:2f5e60fabb7343a836360c4f0919b8cd0d6dbf08ad2ca6b9cf90bf0c76a3c4f6"}, {file = "kiwisolver-1.4.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:10ee06759482c78bdb864f4109886dff7b8a56529bc1609d4f1112b93fe6423c"}, @@ -2126,6 +2395,10 @@ mdurl = [ {file = "mdurl-0.1.2-py3-none-any.whl", hash = "sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8"}, {file = "mdurl-0.1.2.tar.gz", hash = "sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba"}, ] +mistune = [ + {file = "mistune-3.0.1-py3-none-any.whl", hash = "sha256:b9b3e438efbb57c62b5beb5e134dab664800bdf1284a7ee09e8b12b13eb1aac6"}, + {file = "mistune-3.0.1.tar.gz", hash = "sha256:e912116c13aa0944f9dc530db38eb88f6a77087ab128f49f84a48f4c05ea163c"}, +] more-itertools = [ {file = "more-itertools-9.1.0.tar.gz", hash = "sha256:cabaa341ad0389ea83c17a94566a53ae4c9d07349861ecb14dc6d0345cf9ac5d"}, {file = "more_itertools-9.1.0-py3-none-any.whl", hash = "sha256:d2bc7f02446e86a68911e58ded76d6561eea00cddfb2a91e7019bbb586c799f3"}, @@ -2134,6 +2407,22 @@ myst-parser = [ {file = "myst-parser-0.18.1.tar.gz", hash = "sha256:79317f4bb2c13053dd6e64f9da1ba1da6cd9c40c8a430c447a7b146a594c246d"}, {file = "myst_parser-0.18.1-py3-none-any.whl", hash = "sha256:61b275b85d9f58aa327f370913ae1bec26ebad372cc99f3ab85c8ec3ee8d9fb8"}, ] +nbclient = [ + {file = "nbclient-0.8.0-py3-none-any.whl", hash = "sha256:25e861299e5303a0477568557c4045eccc7a34c17fc08e7959558707b9ebe548"}, + {file = "nbclient-0.8.0.tar.gz", hash = "sha256:f9b179cd4b2d7bca965f900a2ebf0db4a12ebff2f36a711cb66861e4ae158e55"}, +] +nbconvert = [ + {file = "nbconvert-7.7.3-py3-none-any.whl", hash = "sha256:3022adadff3f86578a47fab7c2228bb3ca9c56a24345642a22f917f6168b48fc"}, + {file = "nbconvert-7.7.3.tar.gz", hash = "sha256:4a5996bf5f3cd16aa0431897ba1aa4c64842c2079f434b3dc6b8c4b252ef3355"}, +] +nbformat = [ + {file = "nbformat-5.9.2-py3-none-any.whl", hash = "sha256:1c5172d786a41b82bcfd0c23f9e6b6f072e8fb49c39250219e4acfff1efe89e9"}, + {file = "nbformat-5.9.2.tar.gz", hash = "sha256:5f98b5ba1997dff175e77e0c17d5c10a96eaed2cbd1de3533d1fc35d5e111192"}, +] +nbsphinx = [ + {file = "nbsphinx-0.9.2-py3-none-any.whl", hash = "sha256:2746680ece5ad3b0e980639d717a5041a1c1aafb416846b72dfaeecc306bc351"}, + {file = "nbsphinx-0.9.2.tar.gz", hash = "sha256:540db7f4066347f23d0650c4ae8e7d85334c69adf749e030af64c12e996ff88e"}, +] neo4j = [ {file = "neo4j-4.4.10.tar.gz", hash = "sha256:26db4f9c8f628e53bda62f15cf2a7bfac6e2073e962da761c7164b6b122fca44"}, ] @@ -2214,6 +2503,10 @@ pandas = [ {file = "pandas-2.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:99f7192d8b0e6daf8e0d0fd93baa40056684e4b4aaaef9ea78dff34168e1f2f0"}, {file = "pandas-2.0.1.tar.gz", hash = "sha256:19b8e5270da32b41ebf12f0e7165efa7024492e9513fb46fb631c5022ae5709d"}, ] +pandocfilters = [ + {file = "pandocfilters-1.5.0-py2.py3-none-any.whl", hash = "sha256:33aae3f25fd1a026079f5d27bdd52496f0e0803b3469282162bafdcbdf6ef14f"}, + {file = "pandocfilters-1.5.0.tar.gz", hash = "sha256:0b679503337d233b4339a817bfc8c50064e2eff681314376a47cb582305a7a38"}, +] parso = [ {file = "parso-0.8.3-py2.py3-none-any.whl", hash = "sha256:c001d4636cd3aecdaf33cbb40aebb59b094be2a74c556778ef5576c175e19e75"}, {file = "parso-0.8.3.tar.gz", hash = "sha256:8c07be290bb59f03588915921e29e8a50002acaf2cdc5fa0e0114f91709fafa0"}, @@ -2507,10 +2800,113 @@ rdflib = [ {file = "rdflib-6.3.2-py3-none-any.whl", hash = "sha256:36b4e74a32aa1e4fa7b8719876fb192f19ecd45ff932ea5ebbd2e417a0247e63"}, {file = "rdflib-6.3.2.tar.gz", hash = "sha256:72af591ff704f4caacea7ecc0c5a9056b8553e0489dd4f35a9bc52dbd41522e0"}, ] +referencing = [ + {file = "referencing-0.30.0-py3-none-any.whl", hash = "sha256:c257b08a399b6c2f5a3510a50d28ab5dbc7bbde049bcaf954d43c446f83ab548"}, + {file = "referencing-0.30.0.tar.gz", hash = "sha256:47237742e990457f7512c7d27486394a9aadaf876cbfaa4be65b27b4f4d47c6b"}, +] requests = [ {file = "requests-2.28.2-py3-none-any.whl", hash = "sha256:64299f4909223da747622c030b781c0d7811e359c37124b4bd368fb8c6518baa"}, {file = "requests-2.28.2.tar.gz", hash = "sha256:98b1b2782e3c6c4904938b84c0eb932721069dfdb9134313beff7c83c2df24bf"}, ] +rpds-py = [ + {file = "rpds_py-0.9.2-cp310-cp310-macosx_10_7_x86_64.whl", hash = "sha256:ab6919a09c055c9b092798ce18c6c4adf49d24d4d9e43a92b257e3f2548231e7"}, + {file = "rpds_py-0.9.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:d55777a80f78dd09410bd84ff8c95ee05519f41113b2df90a69622f5540c4f8b"}, + {file = "rpds_py-0.9.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a216b26e5af0a8e265d4efd65d3bcec5fba6b26909014effe20cd302fd1138fa"}, + {file = "rpds_py-0.9.2-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:29cd8bfb2d716366a035913ced99188a79b623a3512292963d84d3e06e63b496"}, + {file = "rpds_py-0.9.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:44659b1f326214950a8204a248ca6199535e73a694be8d3e0e869f820767f12f"}, + {file = "rpds_py-0.9.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:745f5a43fdd7d6d25a53ab1a99979e7f8ea419dfefebcab0a5a1e9095490ee5e"}, + {file = "rpds_py-0.9.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a987578ac5214f18b99d1f2a3851cba5b09f4a689818a106c23dbad0dfeb760f"}, + {file = "rpds_py-0.9.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:bf4151acb541b6e895354f6ff9ac06995ad9e4175cbc6d30aaed08856558201f"}, + {file = "rpds_py-0.9.2-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:03421628f0dc10a4119d714a17f646e2837126a25ac7a256bdf7c3943400f67f"}, + {file = "rpds_py-0.9.2-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:13b602dc3e8dff3063734f02dcf05111e887f301fdda74151a93dbbc249930fe"}, + {file = "rpds_py-0.9.2-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:fae5cb554b604b3f9e2c608241b5d8d303e410d7dfb6d397c335f983495ce7f6"}, + {file = "rpds_py-0.9.2-cp310-none-win32.whl", hash = "sha256:47c5f58a8e0c2c920cc7783113df2fc4ff12bf3a411d985012f145e9242a2764"}, + {file = "rpds_py-0.9.2-cp310-none-win_amd64.whl", hash = "sha256:4ea6b73c22d8182dff91155af018b11aac9ff7eca085750455c5990cb1cfae6e"}, + {file = "rpds_py-0.9.2-cp311-cp311-macosx_10_7_x86_64.whl", hash = "sha256:e564d2238512c5ef5e9d79338ab77f1cbbda6c2d541ad41b2af445fb200385e3"}, + {file = "rpds_py-0.9.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f411330a6376fb50e5b7a3e66894e4a39e60ca2e17dce258d53768fea06a37bd"}, + {file = "rpds_py-0.9.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0e7521f5af0233e89939ad626b15278c71b69dc1dfccaa7b97bd4cdf96536bb7"}, + {file = "rpds_py-0.9.2-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:8d3335c03100a073883857e91db9f2e0ef8a1cf42dc0369cbb9151c149dbbc1b"}, + {file = "rpds_py-0.9.2-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d25b1c1096ef0447355f7293fbe9ad740f7c47ae032c2884113f8e87660d8f6e"}, + {file = "rpds_py-0.9.2-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6a5d3fbd02efd9cf6a8ffc2f17b53a33542f6b154e88dd7b42ef4a4c0700fdad"}, + {file = "rpds_py-0.9.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c5934e2833afeaf36bd1eadb57256239785f5af0220ed8d21c2896ec4d3a765f"}, + {file = "rpds_py-0.9.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:095b460e117685867d45548fbd8598a8d9999227e9061ee7f012d9d264e6048d"}, + {file = "rpds_py-0.9.2-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:91378d9f4151adc223d584489591dbb79f78814c0734a7c3bfa9c9e09978121c"}, + {file = "rpds_py-0.9.2-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:24a81c177379300220e907e9b864107614b144f6c2a15ed5c3450e19cf536fae"}, + {file = "rpds_py-0.9.2-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:de0b6eceb46141984671802d412568d22c6bacc9b230174f9e55fc72ef4f57de"}, + {file = "rpds_py-0.9.2-cp311-none-win32.whl", hash = "sha256:700375326ed641f3d9d32060a91513ad668bcb7e2cffb18415c399acb25de2ab"}, + {file = "rpds_py-0.9.2-cp311-none-win_amd64.whl", hash = "sha256:0766babfcf941db8607bdaf82569ec38107dbb03c7f0b72604a0b346b6eb3298"}, + {file = "rpds_py-0.9.2-cp312-cp312-macosx_10_7_x86_64.whl", hash = "sha256:b1440c291db3f98a914e1afd9d6541e8fc60b4c3aab1a9008d03da4651e67386"}, + {file = "rpds_py-0.9.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:0f2996fbac8e0b77fd67102becb9229986396e051f33dbceada3debaacc7033f"}, + {file = "rpds_py-0.9.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9f30d205755566a25f2ae0382944fcae2f350500ae4df4e795efa9e850821d82"}, + {file = "rpds_py-0.9.2-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:159fba751a1e6b1c69244e23ba6c28f879a8758a3e992ed056d86d74a194a0f3"}, + {file = "rpds_py-0.9.2-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a1f044792e1adcea82468a72310c66a7f08728d72a244730d14880cd1dabe36b"}, + {file = "rpds_py-0.9.2-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9251eb8aa82e6cf88510530b29eef4fac825a2b709baf5b94a6094894f252387"}, + {file = "rpds_py-0.9.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:01899794b654e616c8625b194ddd1e5b51ef5b60ed61baa7a2d9c2ad7b2a4238"}, + {file = "rpds_py-0.9.2-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:b0c43f8ae8f6be1d605b0465671124aa8d6a0e40f1fb81dcea28b7e3d87ca1e1"}, + {file = "rpds_py-0.9.2-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:207f57c402d1f8712618f737356e4b6f35253b6d20a324d9a47cb9f38ee43a6b"}, + {file = "rpds_py-0.9.2-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:b52e7c5ae35b00566d244ffefba0f46bb6bec749a50412acf42b1c3f402e2c90"}, + {file = "rpds_py-0.9.2-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:978fa96dbb005d599ec4fd9ed301b1cc45f1a8f7982d4793faf20b404b56677d"}, + {file = "rpds_py-0.9.2-cp38-cp38-macosx_10_7_x86_64.whl", hash = "sha256:6aa8326a4a608e1c28da191edd7c924dff445251b94653988efb059b16577a4d"}, + {file = "rpds_py-0.9.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:aad51239bee6bff6823bbbdc8ad85136c6125542bbc609e035ab98ca1e32a192"}, + {file = "rpds_py-0.9.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4bd4dc3602370679c2dfb818d9c97b1137d4dd412230cfecd3c66a1bf388a196"}, + {file = "rpds_py-0.9.2-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:dd9da77c6ec1f258387957b754f0df60766ac23ed698b61941ba9acccd3284d1"}, + {file = "rpds_py-0.9.2-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:190ca6f55042ea4649ed19c9093a9be9d63cd8a97880106747d7147f88a49d18"}, + {file = "rpds_py-0.9.2-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:876bf9ed62323bc7dcfc261dbc5572c996ef26fe6406b0ff985cbcf460fc8a4c"}, + {file = "rpds_py-0.9.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fa2818759aba55df50592ecbc95ebcdc99917fa7b55cc6796235b04193eb3c55"}, + {file = "rpds_py-0.9.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:9ea4d00850ef1e917815e59b078ecb338f6a8efda23369677c54a5825dbebb55"}, + {file = "rpds_py-0.9.2-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:5855c85eb8b8a968a74dc7fb014c9166a05e7e7a8377fb91d78512900aadd13d"}, + {file = "rpds_py-0.9.2-cp38-cp38-musllinux_1_2_i686.whl", hash = "sha256:14c408e9d1a80dcb45c05a5149e5961aadb912fff42ca1dd9b68c0044904eb32"}, + {file = "rpds_py-0.9.2-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:65a0583c43d9f22cb2130c7b110e695fff834fd5e832a776a107197e59a1898e"}, + {file = "rpds_py-0.9.2-cp38-none-win32.whl", hash = "sha256:71f2f7715935a61fa3e4ae91d91b67e571aeb5cb5d10331ab681256bda2ad920"}, + {file = "rpds_py-0.9.2-cp38-none-win_amd64.whl", hash = "sha256:674c704605092e3ebbbd13687b09c9f78c362a4bc710343efe37a91457123044"}, + {file = "rpds_py-0.9.2-cp39-cp39-macosx_10_7_x86_64.whl", hash = "sha256:07e2c54bef6838fa44c48dfbc8234e8e2466d851124b551fc4e07a1cfeb37260"}, + {file = "rpds_py-0.9.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:f7fdf55283ad38c33e35e2855565361f4bf0abd02470b8ab28d499c663bc5d7c"}, + {file = "rpds_py-0.9.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:890ba852c16ace6ed9f90e8670f2c1c178d96510a21b06d2fa12d8783a905193"}, + {file = "rpds_py-0.9.2-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:50025635ba8b629a86d9d5474e650da304cb46bbb4d18690532dd79341467846"}, + {file = "rpds_py-0.9.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:517cbf6e67ae3623c5127206489d69eb2bdb27239a3c3cc559350ef52a3bbf0b"}, + {file = "rpds_py-0.9.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0836d71ca19071090d524739420a61580f3f894618d10b666cf3d9a1688355b1"}, + {file = "rpds_py-0.9.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9c439fd54b2b9053717cca3de9583be6584b384d88d045f97d409f0ca867d80f"}, + {file = "rpds_py-0.9.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:f68996a3b3dc9335037f82754f9cdbe3a95db42bde571d8c3be26cc6245f2324"}, + {file = "rpds_py-0.9.2-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:7d68dc8acded354c972116f59b5eb2e5864432948e098c19fe6994926d8e15c3"}, + {file = "rpds_py-0.9.2-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:f963c6b1218b96db85fc37a9f0851eaf8b9040aa46dec112611697a7023da535"}, + {file = "rpds_py-0.9.2-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:5a46859d7f947061b4010e554ccd1791467d1b1759f2dc2ec9055fa239f1bc26"}, + {file = "rpds_py-0.9.2-cp39-none-win32.whl", hash = "sha256:e07e5dbf8a83c66783a9fe2d4566968ea8c161199680e8ad38d53e075df5f0d0"}, + {file = "rpds_py-0.9.2-cp39-none-win_amd64.whl", hash = "sha256:682726178138ea45a0766907957b60f3a1bf3acdf212436be9733f28b6c5af3c"}, + {file = "rpds_py-0.9.2-pp310-pypy310_pp73-macosx_10_7_x86_64.whl", hash = "sha256:196cb208825a8b9c8fc360dc0f87993b8b260038615230242bf18ec84447c08d"}, + {file = "rpds_py-0.9.2-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:c7671d45530fcb6d5e22fd40c97e1e1e01965fc298cbda523bb640f3d923b387"}, + {file = "rpds_py-0.9.2-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:83b32f0940adec65099f3b1c215ef7f1d025d13ff947975a055989cb7fd019a4"}, + {file = "rpds_py-0.9.2-pp310-pypy310_pp73-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:7f67da97f5b9eac838b6980fc6da268622e91f8960e083a34533ca710bec8611"}, + {file = "rpds_py-0.9.2-pp310-pypy310_pp73-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:03975db5f103997904c37e804e5f340c8fdabbb5883f26ee50a255d664eed58c"}, + {file = "rpds_py-0.9.2-pp310-pypy310_pp73-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:987b06d1cdb28f88a42e4fb8a87f094e43f3c435ed8e486533aea0bf2e53d931"}, + {file = "rpds_py-0.9.2-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c861a7e4aef15ff91233751619ce3a3d2b9e5877e0fcd76f9ea4f6847183aa16"}, + {file = "rpds_py-0.9.2-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:02938432352359805b6da099c9c95c8a0547fe4b274ce8f1a91677401bb9a45f"}, + {file = "rpds_py-0.9.2-pp310-pypy310_pp73-musllinux_1_2_aarch64.whl", hash = "sha256:ef1f08f2a924837e112cba2953e15aacfccbbfcd773b4b9b4723f8f2ddded08e"}, + {file = "rpds_py-0.9.2-pp310-pypy310_pp73-musllinux_1_2_i686.whl", hash = "sha256:35da5cc5cb37c04c4ee03128ad59b8c3941a1e5cd398d78c37f716f32a9b7f67"}, + {file = "rpds_py-0.9.2-pp310-pypy310_pp73-musllinux_1_2_x86_64.whl", hash = "sha256:141acb9d4ccc04e704e5992d35472f78c35af047fa0cfae2923835d153f091be"}, + {file = "rpds_py-0.9.2-pp38-pypy38_pp73-macosx_10_7_x86_64.whl", hash = "sha256:79f594919d2c1a0cc17d1988a6adaf9a2f000d2e1048f71f298b056b1018e872"}, + {file = "rpds_py-0.9.2-pp38-pypy38_pp73-macosx_11_0_arm64.whl", hash = "sha256:a06418fe1155e72e16dddc68bb3780ae44cebb2912fbd8bb6ff9161de56e1798"}, + {file = "rpds_py-0.9.2-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8b2eb034c94b0b96d5eddb290b7b5198460e2d5d0c421751713953a9c4e47d10"}, + {file = "rpds_py-0.9.2-pp38-pypy38_pp73-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:8b08605d248b974eb02f40bdcd1a35d3924c83a2a5e8f5d0fa5af852c4d960af"}, + {file = "rpds_py-0.9.2-pp38-pypy38_pp73-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a0805911caedfe2736935250be5008b261f10a729a303f676d3d5fea6900c96a"}, + {file = "rpds_py-0.9.2-pp38-pypy38_pp73-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ab2299e3f92aa5417d5e16bb45bb4586171c1327568f638e8453c9f8d9e0f020"}, + {file = "rpds_py-0.9.2-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8c8d7594e38cf98d8a7df25b440f684b510cf4627fe038c297a87496d10a174f"}, + {file = "rpds_py-0.9.2-pp38-pypy38_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:8b9ec12ad5f0a4625db34db7e0005be2632c1013b253a4a60e8302ad4d462afd"}, + {file = "rpds_py-0.9.2-pp38-pypy38_pp73-musllinux_1_2_aarch64.whl", hash = "sha256:1fcdee18fea97238ed17ab6478c66b2095e4ae7177e35fb71fbe561a27adf620"}, + {file = "rpds_py-0.9.2-pp38-pypy38_pp73-musllinux_1_2_i686.whl", hash = "sha256:933a7d5cd4b84f959aedeb84f2030f0a01d63ae6cf256629af3081cf3e3426e8"}, + {file = "rpds_py-0.9.2-pp38-pypy38_pp73-musllinux_1_2_x86_64.whl", hash = "sha256:686ba516e02db6d6f8c279d1641f7067ebb5dc58b1d0536c4aaebb7bf01cdc5d"}, + {file = "rpds_py-0.9.2-pp39-pypy39_pp73-macosx_10_7_x86_64.whl", hash = "sha256:0173c0444bec0a3d7d848eaeca2d8bd32a1b43f3d3fde6617aac3731fa4be05f"}, + {file = "rpds_py-0.9.2-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:d576c3ef8c7b2d560e301eb33891d1944d965a4d7a2eacb6332eee8a71827db6"}, + {file = "rpds_py-0.9.2-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ed89861ee8c8c47d6beb742a602f912b1bb64f598b1e2f3d758948721d44d468"}, + {file = "rpds_py-0.9.2-pp39-pypy39_pp73-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:1054a08e818f8e18910f1bee731583fe8f899b0a0a5044c6e680ceea34f93876"}, + {file = "rpds_py-0.9.2-pp39-pypy39_pp73-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:99e7c4bb27ff1aab90dcc3e9d37ee5af0231ed98d99cb6f5250de28889a3d502"}, + {file = "rpds_py-0.9.2-pp39-pypy39_pp73-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c545d9d14d47be716495076b659db179206e3fd997769bc01e2d550eeb685596"}, + {file = "rpds_py-0.9.2-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9039a11bca3c41be5a58282ed81ae422fa680409022b996032a43badef2a3752"}, + {file = "rpds_py-0.9.2-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:fb39aca7a64ad0c9490adfa719dbeeb87d13be137ca189d2564e596f8ba32c07"}, + {file = "rpds_py-0.9.2-pp39-pypy39_pp73-musllinux_1_2_aarch64.whl", hash = "sha256:2d8b3b3a2ce0eaa00c5bbbb60b6713e94e7e0becab7b3db6c5c77f979e8ed1f1"}, + {file = "rpds_py-0.9.2-pp39-pypy39_pp73-musllinux_1_2_i686.whl", hash = "sha256:99b1c16f732b3a9971406fbfe18468592c5a3529585a45a35adbc1389a529a03"}, + {file = "rpds_py-0.9.2-pp39-pypy39_pp73-musllinux_1_2_x86_64.whl", hash = "sha256:c27ee01a6c3223025f4badd533bea5e87c988cb0ba2811b690395dfe16088cfe"}, + {file = "rpds_py-0.9.2.tar.gz", hash = "sha256:8d70e8f14900f2657c249ea4def963bed86a29b81f81f5b76b5a9215680de945"}, +] setuptools = [ {file = "setuptools-67.6.1-py3-none-any.whl", hash = "sha256:e728ca814a823bf7bf60162daf9db95b93d532948c4c0bea762ce62f60189078"}, {file = "setuptools-67.6.1.tar.gz", hash = "sha256:257de92a9d50a60b8e22abfcbb771571fde0dbf3ec234463212027a4eeecbe9a"}, @@ -2531,6 +2927,10 @@ sortedcontainers = [ {file = "sortedcontainers-2.4.0-py2.py3-none-any.whl", hash = "sha256:a163dcaede0f1c021485e957a39245190e74249897e2ae4b2aa38595db237ee0"}, {file = "sortedcontainers-2.4.0.tar.gz", hash = "sha256:25caa5a06cc30b6b83d11423433f65d1f9d76c4c6a0c90e3379eaa43b9bfdb88"}, ] +soupsieve = [ + {file = "soupsieve-2.4.1-py3-none-any.whl", hash = "sha256:1c1bfee6819544a3447586c889157365a27e10d88cde3ad3da0cf0ddf646feb8"}, + {file = "soupsieve-2.4.1.tar.gz", hash = "sha256:89d12b2d5dfcd2c9e8c22326da9d9aa9cb3dfab0a83a024f05704076ee8d35ea"}, +] sphinx = [ {file = "Sphinx-5.3.0.tar.gz", hash = "sha256:51026de0a9ff9fc13c05d74913ad66047e104f56a129ff73e174eb5c3ee794b5"}, {file = "sphinx-5.3.0-py3-none-any.whl", hash = "sha256:060ca5c9f7ba57a08a1219e547b269fadf125ae25b06b9fa7f66768efb652d6d"}, @@ -2590,6 +2990,10 @@ stack-data = [ stringcase = [ {file = "stringcase-1.2.0.tar.gz", hash = "sha256:48a06980661908efe8d9d34eab2b6c13aefa2163b3ced26972902e3bdfd87008"}, ] +tinycss2 = [ + {file = "tinycss2-1.2.1-py3-none-any.whl", hash = "sha256:2b80a96d41e7c3914b8cda8bc7f705a4d9c49275616e886103dd839dfc847847"}, + {file = "tinycss2-1.2.1.tar.gz", hash = "sha256:8cff3a8f066c2ec677c06dbc7b45619804a6938478d9d73c284b29d14ecb0627"}, +] toml = [ {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"}, {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"}, @@ -2643,6 +3047,10 @@ wcwidth = [ {file = "wcwidth-0.2.6-py2.py3-none-any.whl", hash = "sha256:795b138f6875577cd91bba52baf9e445cd5118fd32723b460e30a0af30ea230e"}, {file = "wcwidth-0.2.6.tar.gz", hash = "sha256:a5220780a404dbe3353789870978e472cfe477761f06ee55077256e509b156d0"}, ] +webencodings = [ + {file = "webencodings-0.5.1-py2.py3-none-any.whl", hash = "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78"}, + {file = "webencodings-0.5.1.tar.gz", hash = "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"}, +] yapf = [ {file = "yapf-0.32.0-py2.py3-none-any.whl", hash = "sha256:8fea849025584e486fd06d6ba2bed717f396080fd3cc236ba10cb97c4c51cf32"}, {file = "yapf-0.32.0.tar.gz", hash = "sha256:a3f5085d37ef7e3e004c4ba9f9b3e40c54ff1901cd111f05145ae313a7c67d1b"}, diff --git a/pyproject.toml b/pyproject.toml index 4da026be..86a007fa 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -55,6 +55,7 @@ ipython = "^8.7.0" ipykernel = "^6.23.1" sphinxext-opengraph = "^0.8.2" coverage-badge = "^1.1.0" +nbsphinx = "^0.9.2" [build-system] requires = ["poetry-core>=1.0.0"] From f73b3d3ac3d29bb9404144bae4a6126098b00a40 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Tue, 1 Aug 2023 16:22:48 +0200 Subject: [PATCH 059/343] install pandoc on workflow runner --- .github/workflows/sphinx_autodoc.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/sphinx_autodoc.yaml b/.github/workflows/sphinx_autodoc.yaml index 8ee331e1..e00b1001 100644 --- a/.github/workflows/sphinx_autodoc.yaml +++ b/.github/workflows/sphinx_autodoc.yaml @@ -36,6 +36,8 @@ jobs: run: poetry install --no-interaction --no-root - name: Install library run: poetry install --no-interaction + - name: Install pandoc + run: sudo apt-get -y install pandoc - name: Build documentation run: poetry run make html --directory docs/ - name: Commit files From ffaf4c43efbe1b77109adfb74eca689b948931e1 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Tue, 1 Aug 2023 17:08:12 +0200 Subject: [PATCH 060/343] try different coverage strategy (publish subdir) --- .github/workflows/ci_cd.yaml | 19 +++++-------------- README.md | 2 +- docs/coverage.svg | 21 --------------------- 3 files changed, 6 insertions(+), 36 deletions(-) delete mode 100644 docs/coverage.svg diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index a35169ff..e68506e2 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -38,21 +38,12 @@ jobs: run: coverage run -m pytest --password=your_password_here - name: Generate coverage badge - run: coverage-badge -f -o docs/coverage.svg - - - name: Check if there are any changes - id: verify_diff - run: | - git diff --quiet . || echo "changed=true" >> $GITHUB_OUTPUT + run: coverage-badge -f -o coverage/coverage.svg - name: Commit changes - if: steps.verify_diff.outputs.changed == 'true' - run: | - git config --global user.email "no-reply@github.com" - git config --global user.name "GitHub Actions" - git add docs/coverage.svg - git commit -m "Update coverage badge" - git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }} - git push + uses: s0/git-publish-subdir-action@develop env: + REPO: self + BRANCH: coverage + FOLDER: coverage GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/README.md b/README.md index eb230d20..78c66c0e 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [![PyPI version](https://badge.fury.io/py/biocypher.svg)](https://badge.fury.io/py/biocypher) [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) [![CI](https://github.com/biocypher/biocypher/actions/workflows/ci_cd.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/ci_cd.yaml) -![Coverage](docs/coverage.svg) +![Coverage](https://raw.githubusercontent.com/biocypher/biocypher/coverage/coverage.svg) [![Docs build](https://github.com/biocypher/biocypher/actions/workflows/sphinx_autodoc.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/sphinx_autodoc.yaml) [![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit) diff --git a/docs/coverage.svg b/docs/coverage.svg deleted file mode 100644 index a8c7e72a..00000000 --- a/docs/coverage.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - coverage - coverage - 92% - 92% - - From 94fa56c60df7114a47dd89c153d1623f9a150b5b Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Tue, 1 Aug 2023 17:13:04 +0200 Subject: [PATCH 061/343] return coverage to docs folder in subfolder --- .github/workflows/ci_cd.yaml | 2 +- docs/coverage/coverage.svg | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 docs/coverage/coverage.svg diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index e68506e2..14ccf808 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -45,5 +45,5 @@ jobs: env: REPO: self BRANCH: coverage - FOLDER: coverage + FOLDER: docs/coverage GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/docs/coverage/coverage.svg b/docs/coverage/coverage.svg new file mode 100644 index 00000000..1c7007cd --- /dev/null +++ b/docs/coverage/coverage.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + coverage + coverage + 89% + 89% + + From 06b3cf50b2042def22e4b282ee9fa0f7299841fc Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Tue, 1 Aug 2023 17:17:13 +0200 Subject: [PATCH 062/343] fix path --- .github/workflows/ci_cd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index 14ccf808..90f150c8 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -38,7 +38,7 @@ jobs: run: coverage run -m pytest --password=your_password_here - name: Generate coverage badge - run: coverage-badge -f -o coverage/coverage.svg + run: coverage-badge -f -o docs/coverage/coverage.svg - name: Commit changes uses: s0/git-publish-subdir-action@develop From 419969f84d5e72b80367cae5096539bd8bc803c0 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Tue, 1 Aug 2023 19:40:15 +0200 Subject: [PATCH 063/343] fix notebook section link --- docs/notebooks/pandas_tutorial.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/notebooks/pandas_tutorial.ipynb b/docs/notebooks/pandas_tutorial.ipynb index 24cf26dd..76a1e0fd 100644 --- a/docs/notebooks/pandas_tutorial.ipynb +++ b/docs/notebooks/pandas_tutorial.ipynb @@ -47,7 +47,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "To run this tutorial interactively, you will first need to install perform some setup steps specific to running on Google Colab. You can collapse this section and run the setup steps with one click, as they are not required for the explanation of BioCyper's functionality. You can of course also run the steps one by one, if you want to see what is happening. The real tutorial starts with [section 1, \"Adding data\"](https://biocypher.org/notebooks/pandas_tutorial.html#section-1-adding-data)." + "To run this tutorial interactively, you will first need to install perform some setup steps specific to running on Google Colab. You can collapse this section and run the setup steps with one click, as they are not required for the explanation of BioCyper's functionality. You can of course also run the steps one by one, if you want to see what is happening. The real tutorial starts with [section 1, \"Adding data\"](https://biocypher.org/notebooks/pandas_tutorial.html#Section-1:-Adding-data) (do not follow this link on colab, as you will be taken back to the website; please scroll down instead)." ] }, { From 8ac6d2e6029bad2ac10757cc9597a1159ccc9ad2 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Tue, 1 Aug 2023 19:51:28 +0200 Subject: [PATCH 064/343] small changes to tutorial notebook --- .gitignore | 2 ++ docs/notebooks/pandas_tutorial.ipynb | 15 ++++----------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 86bd3c49..b30db48a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,8 @@ docs/pypath_log/ docs/_build/ docs/biocypher-log/ docs/modules/ +docs/notebooks/*.yaml +docs/notebooks/*.py .DS_Store .vscode biocypher.egg-info/ diff --git a/docs/notebooks/pandas_tutorial.ipynb b/docs/notebooks/pandas_tutorial.ipynb index 76a1e0fd..2ac02902 100644 --- a/docs/notebooks/pandas_tutorial.ipynb +++ b/docs/notebooks/pandas_tutorial.ipynb @@ -23,7 +23,7 @@ "\n", "We are going to use a toy example to familiarise the user with the basic functionality of BioCypher. One central task of BioCypher is the harmonisation of dissimilar datasets describing the same entities. Thus, in this example, the input data - which in the real-world use case could come from any type of interface - are represented by simulated data containing some examples of differently formatted biomedical entities such as proteins and their interactions.\n", "\n", - "There are two other versions of this tutorial, which only differ in the output format. The first uses a CSV output format to write files suitable for Neo4j admin import, and the second creates an in-memory collection of Pandas dataframes. You can find both in the tutorial directory of the BioCypher repository. This tutorial simply takes the in-memory approach to a Jupyter notebook." + "There are two other versions of this tutorial, which only differ in the output format. The first uses a CSV output format to write files suitable for Neo4j admin import, and the second creates an in-memory collection of Pandas dataframes. You can find the former in the tutorial directory of the BioCypher repository. This tutorial simply takes the latter, in-memory approach to a Jupyter notebook." ] }, { @@ -76,7 +76,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 3, "metadata": {}, "outputs": [], "source": [ @@ -84,7 +84,7 @@ "import requests\n", "import subprocess\n", "\n", - "schema_path = \"https://raw.githubusercontent.com/dbdimitrov/biocypher/pandas-tutorial/tutorial/\"" + "schema_path = \"https://raw.githubusercontent.com/biocypher/biocypher/main/tutorial/\"" ] }, { @@ -1340,13 +1340,6 @@ "source": [ "bc.show_ontology_structure()" ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [] } ], "metadata": { @@ -1365,7 +1358,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.9.17" + "version": "3.10.6" }, "orig_nbformat": 4, "vscode": { From b318647664f946c038ef3bb37d3b9677626d8c18 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Tue, 1 Aug 2023 20:02:03 +0200 Subject: [PATCH 065/343] restore schema config for colab notebook --- tutorial/06_schema_config_pandas.yaml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 tutorial/06_schema_config_pandas.yaml diff --git a/tutorial/06_schema_config_pandas.yaml b/tutorial/06_schema_config_pandas.yaml new file mode 100644 index 00000000..c030ccce --- /dev/null +++ b/tutorial/06_schema_config_pandas.yaml @@ -0,0 +1,25 @@ +protein: + represented_as: node + preferred_id: [uniprot, entrez] + input_label: [uniprot_protein, entrez_protein] + properties: + sequence: str + description: str + taxon: str + mass: int + +protein isoform: + is_a: protein + inherit_properties: true + represented_as: node + preferred_id: uniprot + input_label: uniprot_isoform + +protein protein interaction: + is_a: pairwise molecular interaction + represented_as: edge + preferred_id: intact + input_label: interacts_with + properties: + method: str + source: str From a0799d11700a2df5425a64f82aee3cec8a08e266 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Fri, 4 Aug 2023 20:49:05 +0200 Subject: [PATCH 066/343] test file for get module test --- test/test_CSVs.zip | Bin 0 -> 623 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test/test_CSVs.zip diff --git a/test/test_CSVs.zip b/test/test_CSVs.zip new file mode 100644 index 0000000000000000000000000000000000000000..7e9183c1a8472219780a1ca293825f9e901a26f6 GIT binary patch literal 623 zcmWIWW@Zs#-~ht+OIgAhpx_gb=44P{NXyJgHPlNkE(;CeWne$#em3PX5QFH_3T_5Q zmamKq3_$G+47TSSxegofupFpfXkXZ~NBiidVyAVC&ia4r-X7b?(#^+wYjdpX+_#4~ z`Ys55t20#O*8aAl#ABtCxBIUx`8WT)*|}@&%Cr@&*-PK7tIg|jHC(Bh7Vtpm-Ll=) z|E(CrpMEpZxXI<&yU!uwPKfwb&x_mOxt_7)I_x0ea`DcC*;|g3e6@NWs3l-mGjO QcQ66rIv~9om{b@T01(I3!T Date: Fri, 4 Aug 2023 21:27:49 +0200 Subject: [PATCH 067/343] add pooch and tqdm --- poetry.lock | 59 +++++++++++++++++++++++++++++++++++++++++++------- pyproject.toml | 2 ++ 2 files changed, 53 insertions(+), 8 deletions(-) diff --git a/poetry.lock b/poetry.lock index e2a65935..3b984532 100644 --- a/poetry.lock +++ b/poetry.lock @@ -117,7 +117,7 @@ python-versions = "~=3.7" name = "certifi" version = "2022.12.7" description = "Python package for providing Mozilla's CA Bundle." -category = "dev" +category = "main" optional = false python-versions = ">=3.6" @@ -152,7 +152,7 @@ python-versions = ">=3.7" name = "charset-normalizer" version = "3.1.0" description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." -category = "dev" +category = "main" optional = false python-versions = ">=3.7.0" @@ -396,7 +396,7 @@ license = ["ukkonen"] name = "idna" version = "3.4" description = "Internationalized Domain Names in Applications (IDNA)" -category = "dev" +category = "main" optional = false python-versions = ">=3.5" @@ -932,7 +932,7 @@ python-versions = ">=3.8" name = "packaging" version = "23.0" description = "Core utilities for Python packages" -category = "dev" +category = "main" optional = false python-versions = ">=3.7" @@ -1032,7 +1032,7 @@ tests = ["check-manifest", "coverage", "defusedxml", "markdown2", "olefile", "pa name = "platformdirs" version = "3.2.0" description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." -category = "dev" +category = "main" optional = false python-versions = ">=3.7" @@ -1052,6 +1052,24 @@ python-versions = ">=3.6" dev = ["pre-commit", "tox"] testing = ["pytest", "pytest-benchmark"] +[[package]] +name = "pooch" +version = "1.7.0" +description = "\"Pooch manages your Python library's sample data files: it automatically downloads and stores them in a local directory, with support for versioning and corruption checks.\"" +category = "main" +optional = false +python-versions = ">=3.7" + +[package.dependencies] +packaging = ">=20.0" +platformdirs = ">=2.5.0" +requests = ">=2.19.0" + +[package.extras] +progress = ["tqdm (>=4.41.0,<5.0.0)"] +sftp = ["paramiko (>=2.7.0)"] +xxhash = ["xxhash (>=1.4.3)"] + [[package]] name = "pre-commit" version = "3.2.1" @@ -1269,7 +1287,7 @@ rpds-py = ">=0.7.0" name = "requests" version = "2.28.2" description = "Python HTTP for Humans." -category = "dev" +category = "main" optional = false python-versions = ">=3.7, <4" @@ -1630,6 +1648,23 @@ virtualenv = ">=20.21" docs = ["furo (>=2022.12.7)", "sphinx (>=6.1.3)", "sphinx-argparse-cli (>=1.11)", "sphinx-autodoc-typehints (>=1.22,!=1.23.4)", "sphinx-copybutton (>=0.5.1)", "sphinx-inline-tabs (>=2022.1.2b11)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=22.12)"] testing = ["build[virtualenv] (>=0.10)", "covdefaults (>=2.3)", "devpi-process (>=0.3)", "diff-cover (>=7.5)", "distlib (>=0.3.6)", "flaky (>=3.7)", "hatch-vcs (>=0.3)", "hatchling (>=1.13)", "psutil (>=5.9.4)", "pytest (>=7.2.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)", "pytest-xdist (>=3.2.1)", "re-assert (>=1.1)", "time-machine (>=2.9)", "wheel (>=0.40)"] +[[package]] +name = "tqdm" +version = "4.65.0" +description = "Fast, Extensible Progress Meter" +category = "main" +optional = false +python-versions = ">=3.7" + +[package.dependencies] +colorama = {version = "*", markers = "platform_system == \"Windows\""} + +[package.extras] +dev = ["py-make (>=0.1.0)", "twine", "wheel"] +notebook = ["ipywidgets (>=6)"] +slack = ["slack-sdk"] +telegram = ["requests"] + [[package]] name = "traitlets" version = "5.9.0" @@ -1673,7 +1708,7 @@ python-versions = ">=2" name = "urllib3" version = "1.26.15" description = "HTTP library with thread-safe connection pooling, file post, and more." -category = "dev" +category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" @@ -1738,7 +1773,7 @@ testing = ["big-O", "flake8 (<5)", "jaraco.functools", "jaraco.itertools", "more [metadata] lock-version = "1.1" python-versions = "^3.9" -content-hash = "8e8d3740d828a8d8e9e11b8ff4f81d22a09bbe2929f6a1cb85391d2cb8245ee1" +content-hash = "080913c088924c3ac7bd9bc8165a79228f26bd2804ab3a3e5a4f03275a885fdd" [metadata.files] alabaster = [ @@ -2595,6 +2630,10 @@ pluggy = [ {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"}, {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"}, ] +pooch = [ + {file = "pooch-1.7.0-py3-none-any.whl", hash = "sha256:74258224fc33d58f53113cf955e8d51bf01386b91492927d0d1b6b341a765ad7"}, + {file = "pooch-1.7.0.tar.gz", hash = "sha256:f174a1041b6447f0eef8860f76d17f60ed2f857dc0efa387a7f08228af05d998"}, +] pre-commit = [ {file = "pre_commit-3.2.1-py2.py3-none-any.whl", hash = "sha256:a06a7fcce7f420047a71213c175714216498b49ebc81fe106f7716ca265f5bb6"}, {file = "pre_commit-3.2.1.tar.gz", hash = "sha256:b5aee7d75dbba21ee161ba641b01e7ae10c5b91967ebf7b2ab0dfae12d07e1f1"}, @@ -3019,6 +3058,10 @@ tox = [ {file = "tox-4.4.8-py3-none-any.whl", hash = "sha256:12fe562b8992ea63b1e92556b7e28600cd1b70c9e01ce08984f60ce2d32c243c"}, {file = "tox-4.4.8.tar.gz", hash = "sha256:524640254de8b0f03facbdc6b7c18a35700592e3ada0ede42f509b3504b745ff"}, ] +tqdm = [ + {file = "tqdm-4.65.0-py3-none-any.whl", hash = "sha256:c4f53a17fe37e132815abceec022631be8ffe1b9381c2e6e30aa70edc99e9671"}, + {file = "tqdm-4.65.0.tar.gz", hash = "sha256:1871fb68a86b8fb3b59ca4cdd3dcccbc7e6d613eeed31f4c332531977b89beb5"}, +] traitlets = [ {file = "traitlets-5.9.0-py3-none-any.whl", hash = "sha256:9e6ec080259b9a5940c797d58b613b5e31441c2257b87c2e795c5228ae80d2d8"}, {file = "traitlets-5.9.0.tar.gz", hash = "sha256:f6cde21a9c68cf756af02035f72d5a723bf607e862e7be33ece505abf4a3bad9"}, diff --git a/pyproject.toml b/pyproject.toml index 86a007fa..bed922b1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,6 +34,8 @@ networkx = "^3.0" stringcase = "^1.2.0" neo4j-utils = "0.0.7" pandas = "^2.0.1" +pooch = "^1.7.0" +tqdm = "^4.65.0" [tool.poetry.group.dev.dependencies] sphinx = ">=5.0.0" From 884f74580bfb42a9625f32517696f90b79bd08c1 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Fri, 4 Aug 2023 21:28:40 +0200 Subject: [PATCH 068/343] first version of get module and test --- biocypher/_get.py | 168 ++++++++++++++++++++++++++++++++++++++++++++++ test/test_get.py | 59 ++++++++++++++++ 2 files changed, 227 insertions(+) create mode 100644 biocypher/_get.py create mode 100644 test/test_get.py diff --git a/biocypher/_get.py b/biocypher/_get.py new file mode 100644 index 00000000..9035da25 --- /dev/null +++ b/biocypher/_get.py @@ -0,0 +1,168 @@ +#!/usr/bin/env python + +# +# Copyright 2021, Heidelberg University Clinic +# +# File author(s): Sebastian Lobentanzer +# ... +# +# Distributed under MIT licence, see the file `LICENSE`. +# +""" +BioCypher get module. Used to download and cache data from external sources. +""" + +from ._logger import logger + +logger.debug(f"Loading module {__name__}.") + +from datetime import datetime, timedelta +from tempfile import TemporaryDirectory +import os +import json + +import pooch + + +class Resource: + def __init__(self, name: str, url: str, lifetime: int = 0): + """ + A resource is a file that can be downloaded from a URL and cached + locally. This class implements checks of the minimum requirements for + a resource, to be implemented by a biocypher adapter. + + Args: + name (str): The name of the resource. + + url (str): The URL of the resource. + + lifetime (int): The lifetime of the resource in days. If 0, the + resource is considered to be permanent. + """ + self.name = name + self.url = url + self.lifetime = lifetime + + +class Downloader: + def __init__(self, cache_dir: str): + """ + A downloader is a collection of resources that can be downloaded + and cached locally. It manages the lifetime of downloaded resources by + keeping a JSON record of the download date of each resource. + + Args: + cache_dir (str): The directory where the resources are cached. If + not given, a temporary directory is created. + """ + self.cache_dir = cache_dir or TemporaryDirectory().name + self.cache_file = os.path.join(self.cache_dir, "cache.json") + self.cache_dict = self._load_cache_dict() + + # download function that accepts a resource or a list of resources + def download(self, *resources: Resource): + """ + Download one or multiple resources. + + Args: + resources (Resource): The resource or resources to download. + + Returns: + str or list: The path or paths to the downloaded resource(s). + """ + paths = [] + for resource in resources: + paths.append(self._download_or_cache(resource)) + + # flatten list + paths = [path for sublist in paths for path in sublist] + + return paths + + def _download_or_cache(self, resource: Resource, cache: bool = True): + """ + Download a resource if it is not cached or exceeded its lifetime. + + Args: + resource (Resource): The resource to download. + + Returns: + str or list: The path or paths to the downloaded resource(s). + """ + # check if resource is cached + cache_record = self._get_cache_record(resource) + + if cache_record: + # check if resource is expired (formatted in days) + dl = datetime.fromisoformat(cache_record.get("date_downloaded")) + lt = timedelta(days=resource.lifetime) + expired = dl + lt < datetime.now() + else: + expired = True + + # download resource + if expired or not cache: + logger.info(f"Downloading resource {resource.name}.") + + path = pooch.retrieve( + resource.url, + None, + fname=resource.name, + path=self.cache_dir, + processor=pooch.Unzip(), + progressbar=True, + ) + + # sometimes a compressed file contains multiple files + # TODO ask for a list of files in the archive to be used from the + # adapter + + # update cache record + self._update_cache_record(resource) + + return path + + def _load_cache_dict(self): + """ + Load the cache dictionary from the cache file. Create an empty cache + file if it does not exist. + """ + if not os.path.exists(self.cache_dir): + logger.info(f"Creating cache directory {self.cache_dir}.") + os.makedirs(self.cache_dir) + + if not os.path.exists(self.cache_file): + logger.info(f"Creating cache file {self.cache_file}.") + with open(self.cache_file, "w") as f: + json.dump({}, f) + + with open(self.cache_file, "r") as f: + logger.info(f"Loading cache file {self.cache_file}.") + return json.load(f) + + def _get_cache_record(self, resource: Resource): + """ + Get the cache record of a resource. + + Args: + resource (Resource): The resource to get the cache record of. + + Returns: + The cache record of the resource. + """ + return self.cache_dict.get(resource.name, {}) + + def _update_cache_record(self, resource: Resource): + """ + Update the cache record of a resource. + + Args: + resource (Resource): The resource to update the cache record of. + """ + cache_record = {} + cache_record["url"] = resource.url + cache_record["date_downloaded"] = datetime.now() + cache_record["lifetime"] = resource.lifetime + self.cache_dict[resource.name] = cache_record + with open(self.cache_file, "w") as f: + json.dump(self.cache_dict, f, default=str) diff --git a/test/test_get.py b/test/test_get.py new file mode 100644 index 00000000..1c0a628b --- /dev/null +++ b/test/test_get.py @@ -0,0 +1,59 @@ +import os +import json + +from hypothesis import given +from hypothesis import strategies as st +import pytest + +from biocypher._get import Resource, Downloader + + +@given(st.builds(Resource)) +def test_resource(resource): + assert isinstance(resource.name, str) + assert isinstance(resource.url, str) + assert isinstance(resource.lifetime, int) + + +@given(st.builds(Downloader)) +def test_downloader(downloader): + assert isinstance(downloader.cache_dir, str) + assert isinstance(downloader.cache_file, str) + + +def test_download(): + # use temp dir, no cache file present + downloader = Downloader(cache_dir=None) + assert os.path.exists(downloader.cache_dir) + assert os.path.exists(downloader.cache_file) + resource = Resource( + "test_resource", + "https://github.com/biocypher/biocypher/raw/get-module/test/test_CSVs.zip", + lifetime=7, + ) + paths = downloader.download(resource) + with open(downloader.cache_file, "r") as f: + cache = json.load(f) + assert ( + cache["test_resource"]["url"] + == "https://github.com/biocypher/biocypher/raw/get-module/test/test_CSVs.zip" + ) + assert cache["test_resource"]["lifetime"] == 7 + assert cache["test_resource"]["date_downloaded"] + for path in paths: + assert os.path.exists(path) + + +def test_download_expired(): + # set up test file to be expired, monkeypatch? + { + "test_resource": { + "url": "https://github.com/biocypher/biocypher/raw/get-module/test/test_CSVs.zip", + "date_downloaded": "2022-08-04 20:41:09.375915", + "lifetime": 7, + } + } + + +def test_download_resource_list(): + pass From 7596344aedfce1827fb2aabeaaf530fc9da453f3 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Sat, 5 Aug 2023 02:45:43 +0200 Subject: [PATCH 069/343] download lists and directories --- biocypher/_get.py | 153 +++++++++++++++++++++++++++++++++++++++++----- test/test_get.py | 53 +++++++++++++++- 2 files changed, 189 insertions(+), 17 deletions(-) diff --git a/biocypher/_get.py b/biocypher/_get.py index 9035da25..2fe34817 100644 --- a/biocypher/_get.py +++ b/biocypher/_get.py @@ -12,6 +12,8 @@ BioCypher get module. Used to download and cache data from external sources. """ +from __future__ import annotations + from ._logger import logger logger.debug(f"Loading module {__name__}.") @@ -20,12 +22,19 @@ from tempfile import TemporaryDirectory import os import json +import ftplib import pooch class Resource: - def __init__(self, name: str, url: str, lifetime: int = 0): + def __init__( + self, + name: str, + url_s: str | list[str], + lifetime: int = 0, + is_dir: bool = False, + ): """ A resource is a file that can be downloaded from a URL and cached locally. This class implements checks of the minimum requirements for @@ -40,8 +49,9 @@ def __init__(self, name: str, url: str, lifetime: int = 0): resource is considered to be permanent. """ self.name = name - self.url = url + self.url_s = url_s self.lifetime = lifetime + self.is_dir = is_dir class Downloader: @@ -74,8 +84,9 @@ def download(self, *resources: Resource): for resource in resources: paths.append(self._download_or_cache(resource)) - # flatten list - paths = [path for sublist in paths for path in sublist] + # flatten list if it is nested + if is_nested(paths): + paths = [path for sublist in paths for path in sublist] return paths @@ -104,14 +115,29 @@ def _download_or_cache(self, resource: Resource, cache: bool = True): if expired or not cache: logger.info(f"Downloading resource {resource.name}.") - path = pooch.retrieve( - resource.url, - None, - fname=resource.name, - path=self.cache_dir, - processor=pooch.Unzip(), - progressbar=True, - ) + if resource.is_dir: + files = self._get_files(resource) + resource.url_s = [resource.url_s + "/" + file for file in files] + resource.is_dir = False + paths = self._download_or_cache(resource, cache) + elif isinstance(resource.url_s, list): + paths = [] + for url in resource.url_s: + fname = resource.name + "_" + url[url.rfind("/") + 1 :] + paths.append( + self._retrieve( + url=url, + fname=fname, + path=os.path.join(self.cache_dir, resource.name), + ) + ) + else: + fname = resource.url_s[resource.url_s.rfind("/") + 1 :] + paths = self._retrieve( + url=resource.url_s, + fname=fname, + path=os.path.join(self.cache_dir, resource.name), + ) # sometimes a compressed file contains multiple files # TODO ask for a list of files in the archive to be used from the @@ -120,7 +146,90 @@ def _download_or_cache(self, resource: Resource, cache: bool = True): # update cache record self._update_cache_record(resource) - return path + return paths + + def _retrieve( + self, + url: str, + fname: str, + path: str, + known_hash: str = None, + ): + """ + Retrieve a file from a URL using Pooch. Infer type of file from + extension and use appropriate processor. + + Args: + url (str): The URL to retrieve the file from. + + fname (str): The name of the file. + + path (str): The path to the file. + """ + if fname.endswith(".zip"): + return pooch.retrieve( + url=url, + known_hash=known_hash, + fname=fname, + path=path, + processor=pooch.Unzip(), + progressbar=True, + ) + + elif fname.endswith(".tar.gz"): + return pooch.retrieve( + url=url, + known_hash=known_hash, + fname=fname, + path=path, + processor=pooch.Untar(), + progressbar=True, + ) + + elif fname.endswith(".gz"): + return pooch.retrieve( + url=url, + known_hash=known_hash, + fname=fname, + path=path, + processor=pooch.Decompress(), + progressbar=True, + ) + + else: + return pooch.retrieve( + url=url, + known_hash=known_hash, + fname=fname, + path=path, + progressbar=True, + ) + + def _get_files(self, resource: Resource): + """ + Get the files contained in a directory resource. + + Args: + resource (Resource): The directory resource. + + Returns: + list: The files contained in the directory. + """ + if resource.url_s.startswith("ftp://"): + # remove protocol + url = resource.url_s[6:] + # get base url + url = url[: url.find("/")] + # get directory (remove initial slash as well) + dir = resource.url_s[7 + len(url) :] + # get files + ftp = ftplib.FTP(url) + ftp.login() + ftp.cwd(dir) + files = ftp.nlst() + ftp.quit() + + return files def _load_cache_dict(self): """ @@ -160,9 +269,25 @@ def _update_cache_record(self, resource: Resource): resource (Resource): The resource to update the cache record of. """ cache_record = {} - cache_record["url"] = resource.url + cache_record["url"] = resource.url_s cache_record["date_downloaded"] = datetime.now() cache_record["lifetime"] = resource.lifetime self.cache_dict[resource.name] = cache_record with open(self.cache_file, "w") as f: json.dump(self.cache_dict, f, default=str) + + +def is_nested(lst): + """ + Check if a list is nested. + + Args: + lst (list): The list to check. + + Returns: + bool: True if the list is nested, False otherwise. + """ + for item in lst: + if isinstance(item, list): + return True + return False diff --git a/test/test_get.py b/test/test_get.py index 1c0a628b..cede15e1 100644 --- a/test/test_get.py +++ b/test/test_get.py @@ -8,20 +8,65 @@ from biocypher._get import Resource, Downloader +@pytest.fixture +def downloader(): + return Downloader(cache_dir=None) + + @given(st.builds(Resource)) def test_resource(resource): assert isinstance(resource.name, str) - assert isinstance(resource.url, str) + assert isinstance(resource.url_s, str) or isinstance(resource.url_s, list) assert isinstance(resource.lifetime, int) -@given(st.builds(Downloader)) def test_downloader(downloader): assert isinstance(downloader.cache_dir, str) assert isinstance(downloader.cache_file, str) -def test_download(): +def test_download_file(downloader): + resource = Resource( + "test_resource", + "https://github.com/biocypher/biocypher/raw/main/biocypher/_config/test_config.yaml", + ) + paths = downloader.download(resource) + assert len(paths) == 1 + assert os.path.exists(paths[0]) + + +def test_download_file_list(downloader): + resource = Resource( + "test_resource", + [ + "https://github.com/biocypher/biocypher/raw/main/biocypher/_config/test_config.yaml", + "https://github.com/biocypher/biocypher/raw/main/biocypher/_config/test_schema_config_disconnected.yaml", + ], + ) + paths = downloader.download(resource) + assert len(paths) == 2 + assert os.path.exists(paths[0]) + assert os.path.exists(paths[1]) + + +def test_download_directory(): + # use temp dir, no cache file present + downloader = Downloader(cache_dir=None) + assert os.path.exists(downloader.cache_dir) + assert os.path.exists(downloader.cache_file) + resource = Resource( + "ot_indication", + "ftp://ftp.ebi.ac.uk/pub/databases/opentargets/platform/23.06/output/etl/parquet/go", + lifetime=7, + is_dir=True, + ) + paths = downloader.download(resource) + assert len(paths) == 17 + for path in paths: + assert os.path.exists(path) + + +def test_download_zip(): # use temp dir, no cache file present downloader = Downloader(cache_dir=None) assert os.path.exists(downloader.cache_dir) @@ -43,6 +88,8 @@ def test_download(): for path in paths: assert os.path.exists(path) + # use files downloaded here and manipulate cache file to test expiration? + def test_download_expired(): # set up test file to be expired, monkeypatch? From 4aceb184692686e6e43a7ebcb6ee360103612a22 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Sat, 5 Aug 2023 03:01:00 +0200 Subject: [PATCH 070/343] test expiry --- biocypher/_get.py | 6 +++++- test/test_get.py | 23 +++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/biocypher/_get.py b/biocypher/_get.py index 2fe34817..5ad6c136 100644 --- a/biocypher/_get.py +++ b/biocypher/_get.py @@ -105,7 +105,7 @@ def _download_or_cache(self, resource: Resource, cache: bool = True): if cache_record: # check if resource is expired (formatted in days) - dl = datetime.fromisoformat(cache_record.get("date_downloaded")) + dl = cache_record.get("date_downloaded") lt = timedelta(days=resource.lifetime) expired = dl + lt < datetime.now() else: @@ -228,6 +228,10 @@ def _get_files(self, resource: Resource): ftp.cwd(dir) files = ftp.nlst() ftp.quit() + else: + raise NotImplementedError( + "Only FTP directories are supported at the moment." + ) return files diff --git a/test/test_get.py b/test/test_get.py index cede15e1..7b093631 100644 --- a/test/test_get.py +++ b/test/test_get.py @@ -1,3 +1,4 @@ +from datetime import datetime, timedelta import os import json @@ -29,11 +30,27 @@ def test_download_file(downloader): resource = Resource( "test_resource", "https://github.com/biocypher/biocypher/raw/main/biocypher/_config/test_config.yaml", + lifetime=7, ) paths = downloader.download(resource) assert len(paths) == 1 assert os.path.exists(paths[0]) + # test caching + paths = downloader.download(resource) + # should not download again + assert paths[0] is None + + # manipulate cache dict to test expiration (datetime format) + downloader.cache_dict["test_resource"][ + "date_downloaded" + ] = datetime.now() - timedelta(days=8) + + paths = downloader.download(resource) + # should download again + assert len(paths) == 1 + assert paths[0] is not None + def test_download_file_list(downloader): resource = Resource( @@ -65,6 +82,12 @@ def test_download_directory(): for path in paths: assert os.path.exists(path) + # test caching + paths = downloader.download(resource) + # should not download again + assert len(paths) == 1 + assert paths[0] is None + def test_download_zip(): # use temp dir, no cache file present From fd559c1c044be385157d6f9a51309a3a48650762 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Wed, 23 Aug 2023 14:20:42 +0200 Subject: [PATCH 071/343] core getter function --- biocypher/_core.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/biocypher/_core.py b/biocypher/_core.py index 2cf6f796..b74c96ab 100644 --- a/biocypher/_core.py +++ b/biocypher/_core.py @@ -22,6 +22,7 @@ logger.debug(f"Loading module {__name__}.") +from ._get import Downloader from ._write import get_writer from ._config import config as _config from ._config import update_from_file as _file_update @@ -389,6 +390,24 @@ def merge_edges(self, edges) -> bool: # write edge files return self._driver.add_biocypher_edges(tedges) + # DOWNLOAD AND CACHE MANAGEMENT METHODS ### + + def _get_downloader(self): + """ + Create downloader if not exists. + """ + + if not self._downloader: + self._downloader = Downloader() + + def download(self, force: bool = False) -> None: + """ + Use the :class:`Downloader` class to download or load from cache the + resources given by the adapter. + """ + + self._get_downloader() + # OVERVIEW AND CONVENIENCE METHODS ### def log_missing_input_labels(self) -> Optional[dict[str, list[str]]]: From 8234048b268b83d51e08965bef7b68fd9ec9c838 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Wed, 23 Aug 2023 14:22:41 +0200 Subject: [PATCH 072/343] remove test init file closes #255 --- test/__init__.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 test/__init__.py diff --git a/test/__init__.py b/test/__init__.py deleted file mode 100644 index e69de29b..00000000 From 69611757914ebb04d1da5c1b0ad1cfda09ccc222 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Wed, 23 Aug 2023 17:51:40 +0200 Subject: [PATCH 073/343] refactor translator-ontology-mapping chain translator depends on ontology, which depends on mapping, without forks closes #263 --- biocypher/_connect.py | 18 +-- biocypher/_core.py | 48 ++++-- biocypher/_ontology.py | 18 +-- biocypher/_translate.py | 47 +++--- biocypher/_write.py | 78 ++++++---- test/conftest.py | 52 +++---- test/test_core.py | 10 ++ write_mode.drawio.svg | 337 ++++++++++++++++++++++++++++++++++++++++ 8 files changed, 496 insertions(+), 112 deletions(-) create mode 100644 write_mode.drawio.svg diff --git a/biocypher/_connect.py b/biocypher/_connect.py index 3e2a2a93..a19d5264 100644 --- a/biocypher/_connect.py +++ b/biocypher/_connect.py @@ -53,8 +53,6 @@ class _Neo4jDriver: increment_version (bool): Whether to increment the version number. - ontology (Ontology): The ontology to use for mapping. - translator (Translator): The translator to use for mapping. """ @@ -66,14 +64,12 @@ def __init__( user: str, password: str, multi_db: bool, - ontology: Ontology, translator: Translator, wipe: bool = False, fetch_size: int = 1000, increment_version: bool = True, ): - self._ontology = ontology - self._translator = translator + self.translator = translator self._driver = neo4j_utils.Driver( db_name=database_name, @@ -103,7 +99,7 @@ def _update_meta_graph(self): "MATCH (v:BioCypher) " "WHERE NOT (v)-[:PRECEDES]->() " "RETURN v", ) # add version node - self.add_biocypher_nodes(self._ontology) + self.add_biocypher_nodes(self.translator.ontology) # connect version node to previous if db_version[0]: @@ -111,7 +107,7 @@ def _update_meta_graph(self): previous_id = previous["v"]["id"] e_meta = BioCypherEdge( previous_id, - self._ontology.get_dict().get("node_id"), + self.translator.ontology.get_dict().get("node_id"), "PRECEDES", ) self.add_biocypher_edges(e_meta) @@ -142,7 +138,7 @@ def _create_constraints(self): logger.info("Creating constraints for node types in config.") # get structure - for leaf in self._ontology.extended_schema.items(): + for leaf in self.translator.ontology.mapping.extended_schema.items(): label = _misc.sentencecase_to_pascalcase(leaf[0]) if leaf[1]["represented_as"] == "node": s = ( @@ -172,7 +168,7 @@ def add_nodes(self, id_type_tuples: Iterable[tuple]) -> tuple: - second entry: Neo4j summary. """ - bn = self._translator.translate_nodes(id_type_tuples) + bn = self.translator.translate_nodes(id_type_tuples) return self.add_biocypher_nodes(bn) def add_edges(self, id_src_tar_type_tuples: Iterable[tuple]) -> tuple: @@ -204,7 +200,7 @@ def add_edges(self, id_src_tar_type_tuples: Iterable[tuple]) -> tuple: - second entry: Neo4j summary. """ - bn = self._translator.translate_edges(id_src_tar_type_tuples) + bn = self.translator.translate_edges(id_src_tar_type_tuples) return self.add_biocypher_edges(bn) def add_biocypher_nodes( @@ -375,7 +371,6 @@ def add_biocypher_edges( def get_driver( dbms: str, translator: "Translator", - ontology: "Ontology", ): """ Function to return the writer class. @@ -394,7 +389,6 @@ def get_driver( user=dbms_config["user"], password=dbms_config["password"], multi_db=dbms_config["multi_db"], - ontology=ontology, translator=translator, ) diff --git a/biocypher/_core.py b/biocypher/_core.py index 2cf6f796..70596f44 100644 --- a/biocypher/_core.py +++ b/biocypher/_core.py @@ -181,19 +181,6 @@ def _get_ontology_mapping(self) -> OntologyMapping: return self._ontology_mapping - def _get_translator(self) -> Translator: - """ - Create translator if not exists and return. - """ - - if not self._translator: - self._translator = Translator( - ontology_mapping=self._get_ontology_mapping(), - strict_mode=self._strict_mode, - ) - - return self._translator - def _get_ontology(self) -> Ontology: """ Create ontology if not exists and return. @@ -208,17 +195,28 @@ def _get_ontology(self) -> Ontology: return self._ontology + def _get_translator(self) -> Translator: + """ + Create translator if not exists and return. + """ + + if not self._translator: + self._translator = Translator( + ontology=self._get_ontology(), + strict_mode=self._strict_mode, + ) + + return self._translator + def _get_writer(self): """ Create writer if not online. Set as instance variable `self._writer`. """ - # Get worker if self._offline: self._writer = get_writer( dbms=self._dbms, translator=self._get_translator(), - ontology=self._get_ontology(), deduplicator=self._get_deduplicator(), output_directory=self._output_directory, strict_mode=self._strict_mode, @@ -235,7 +233,6 @@ def _get_driver(self): self._driver = get_driver( dbms=self._dbms, translator=self._get_translator(), - ontology=self._get_ontology(), deduplicator=self._get_deduplicator(), ) else: @@ -504,6 +501,25 @@ def write_import_call(self) -> None: self._writer.write_import_call() + def write_schema_info(self) -> None: + """ + Write an extended schema info YAML file that extends the + `schema_config.yaml` with run-time information of the built KG. For + instance, include information on whether something is a relationship + (which is important in the case of representing relationships as nodes) + and the actual sources and targets of edges. Since this file can be used + in place of the original `schema_config.yaml` file, it indicates that it + is the extended schema by setting `is_schema_info` to `true`. + + We start by using the `extended_schema` dictionary from the ontology + class instance, which contains all expanded entities and relationships. + """ + + if not self._offline: + raise NotImplementedError( + "Cannot write schema info in online mode." + ) + # TRANSLATION METHODS ### def translate_term(self, term: str) -> str: diff --git a/biocypher/_ontology.py b/biocypher/_ontology.py index e22e4465..bf98bce3 100644 --- a/biocypher/_ontology.py +++ b/biocypher/_ontology.py @@ -269,7 +269,7 @@ def __init__( """ self._head_ontology_meta = head_ontology - self.extended_schema = ontology_mapping.extended_schema + self.mapping = ontology_mapping self._tail_ontology_meta = tail_ontologies self._tail_ontologies = None @@ -403,7 +403,7 @@ def _extend_ontology(self) -> None: if not self._nx_graph: self._nx_graph = self._head_ontology.get_nx_graph().copy() - for key, value in self.extended_schema.items(): + for key, value in self.mapping.extended_schema.items(): if not value.get("is_a"): if self._nx_graph.has_node(value.get("synonym_for")): continue @@ -485,7 +485,7 @@ def _add_properties(self) -> None: setting the synonym as the primary node label. """ - for key, value in self.extended_schema.items(): + for key, value in self.mapping.extended_schema.items(): if key in self._nx_graph.nodes: self._nx_graph.nodes[key].update(value) @@ -541,9 +541,9 @@ def show_ontology_structure(self, to_disk: str = None, full: bool = False): if not full: # set of leaves and their intermediate parents up to the root - filter_nodes = set(self.extended_schema.keys()) + filter_nodes = set(self.mapping.extended_schema.keys()) - for node in self.extended_schema.keys(): + for node in self.mapping.extended_schema.keys(): filter_nodes.update(self.get_ancestors(node).nodes) # filter graph @@ -557,11 +557,11 @@ def show_ontology_structure(self, to_disk: str = None, full: bool = False): tree = _misc.create_tree_visualisation(G) # add synonym information - for node in self.extended_schema: - if self.extended_schema[node].get("synonym_for"): + for node in self.mapping.extended_schema: + if self.mapping.extended_schema[node].get("synonym_for"): tree.nodes[node].tag = ( f"{node} = " - f"{self.extended_schema[node].get('synonym_for')}" + f"{self.mapping.extended_schema[node].get('synonym_for')}" ) tree.show() @@ -602,7 +602,7 @@ def get_dict(self) -> dict: "node_id": self._get_current_id(), "node_label": "BioCypher", "properties": { - "schema": "self.extended_schema", + "schema": "self.ontology_mapping.extended_schema", }, } diff --git a/biocypher/_translate.py b/biocypher/_translate.py index 663d11ab..8438d54b 100644 --- a/biocypher/_translate.py +++ b/biocypher/_translate.py @@ -23,7 +23,7 @@ from . import _misc from ._create import BioCypherEdge, BioCypherNode, BioCypherRelAsNode -from ._mapping import OntologyMapping +from ._ontology import Ontology __all__ = ["BiolinkAdapter", "Translator"] @@ -41,9 +41,7 @@ class Translator: and cypher queries. """ - def __init__( - self, ontology_mapping: "OntologyMapping", strict_mode: bool = False - ): + def __init__(self, ontology: "Ontology", strict_mode: bool = False): """ Args: leaves: @@ -57,7 +55,7 @@ def __init__( carry source, licence, and version information. """ - self.extended_schema = ontology_mapping.extended_schema + self.ontology = ontology self.strict_mode = strict_mode # record nodes without biolink type configured in schema_config.yaml @@ -132,8 +130,9 @@ def _get_preferred_id(self, _bl_type: str) -> str: """ return ( - self.extended_schema[_bl_type]["preferred_id"] - if "preferred_id" in self.extended_schema.get(_bl_type, {}) + self.ontology.mapping.extended_schema[_bl_type]["preferred_id"] + if "preferred_id" + in self.ontology.mapping.extended_schema.get(_bl_type, {}) else "id" ) @@ -142,7 +141,9 @@ def _filter_props(self, bl_type: str, props: dict) -> dict: Filters properties for those specified in schema_config if any. """ - filter_props = self.extended_schema[bl_type].get("properties", {}) + filter_props = self.ontology.mapping.extended_schema[bl_type].get( + "properties", {} + ) # strict mode: add required properties (only if there is a whitelist) if self.strict_mode and filter_props: @@ -150,7 +151,7 @@ def _filter_props(self, bl_type: str, props: dict) -> dict: {"source": "str", "licence": "str", "version": "str"}, ) - exclude_props = self.extended_schema[bl_type].get( + exclude_props = self.ontology.mapping.extended_schema[bl_type].get( "exclude_properties", [] ) @@ -188,7 +189,7 @@ def _filter_props(self, bl_type: str, props: dict) -> dict: def translate_edges( self, - id_src_tar_type_prop_tuples: Iterable, + edge_tuples: Iterable, ) -> Generator[Union[BioCypherEdge, BioCypherRelAsNode], None, None]: """ Translates input edge representation to a representation that @@ -197,7 +198,7 @@ def translate_edges( Args: - id_src_tar_type_prop_tuples (list of tuples): + edge_tuples (list of tuples): collection of tuples representing source and target of an interaction via their unique ids as well as the type @@ -206,18 +207,18 @@ def translate_edges( Can optionally possess its own ID. """ - self._log_begin_translate(id_src_tar_type_prop_tuples, "edges") + self._log_begin_translate(edge_tuples, "edges") # legacy: deal with 4-tuples (no edge id) # TODO remove for performance reasons once safe - id_src_tar_type_prop_tuples = peekable(id_src_tar_type_prop_tuples) - if len(id_src_tar_type_prop_tuples.peek()) == 4: - id_src_tar_type_prop_tuples = [ + edge_tuples = peekable(edge_tuples) + if len(edge_tuples.peek()) == 4: + edge_tuples = [ (None, src, tar, typ, props) - for src, tar, typ, props in id_src_tar_type_prop_tuples + for src, tar, typ, props in edge_tuples ] - for _id, _src, _tar, _type, _props in id_src_tar_type_prop_tuples: + for _id, _src, _tar, _type, _props in edge_tuples: # check for strict mode requirements if self.strict_mode: if not "source" in _props: @@ -239,7 +240,9 @@ def translate_edges( # filter properties for those specified in schema_config if any _filtered_props = self._filter_props(bl_type, _props) - rep = self.extended_schema[bl_type]["represented_as"] + rep = self.ontology.mapping.extended_schema[bl_type][ + "represented_as" + ] if rep == "node": if _id: @@ -295,9 +298,9 @@ def translate_edges( yield BioCypherRelAsNode(n, e_s, e_t) else: - edge_label = self.extended_schema[bl_type].get( - "label_as_edge" - ) + edge_label = self.ontology.mapping.extended_schema[ + bl_type + ].get("label_as_edge") if edge_label is None: edge_label = bl_type @@ -356,7 +359,7 @@ def _update_ontology_types(self): self._ontology_mapping = {} - for key, value in self.extended_schema.items(): + for key, value in self.ontology.mapping.extended_schema.items(): labels = value.get("input_label") or value.get("label_in_input") if isinstance(labels, str): diff --git a/biocypher/_write.py b/biocypher/_write.py index 5f7716de..8361f167 100644 --- a/biocypher/_write.py +++ b/biocypher/_write.py @@ -125,7 +125,6 @@ def _get_import_script_name(self) -> str: def __init__( self, - ontology: "Ontology", translator: "Translator", deduplicator: "Deduplicator", delimiter: str, @@ -167,10 +166,6 @@ class contains all methods expected by a bach writer instance, some of - _get_import_script_name Args: - ontology: - Instance of :py:class:`Ontology` to enable translation and - ontology queries - translator: Instance of :py:class:`Translator` to enable translation of nodes and manipulation of properties. @@ -251,8 +246,6 @@ class contains all methods expected by a bach writer instance, some of self.wipe = wipe self.strict_mode = strict_mode - self.extended_schema = ontology.extended_schema - self.ontology = ontology self.translator = translator self.deduplicator = deduplicator self.node_property_dict = {} @@ -451,8 +444,12 @@ def _write_node_data(self, nodes, batch_size): bin_l[label] = 1 # get properties from config if present - cprops = self.extended_schema.get(label).get( - "properties", + cprops = ( + self.translator.ontology.mapping.extended_schema.get( + label + ).get( + "properties", + ) ) if cprops: d = dict(cprops) @@ -486,7 +483,7 @@ def _write_node_data(self, nodes, batch_size): # get label hierarchy # multiple labels: - all_labels = self.ontology.get_ancestors(label) + all_labels = self.translator.ontology.get_ancestors(label) if all_labels: # convert to pascal case @@ -706,13 +703,23 @@ def _write_edge_data(self, edges, batch_size): # (may not be if it is an edge that carries the # "label_as_edge" property) cprops = None - if label in self.extended_schema: - cprops = self.extended_schema.get(label).get( + if ( + label + in self.translator.ontology.mapping.extended_schema + ): + cprops = self.translator.ontology.mapping.extended_schema.get( + label + ).get( "properties", ) else: # try via "label_as_edge" - for k, v in self.extended_schema.items(): + for ( + k, + v, + ) in ( + self.translator.ontology.mapping.extended_schema.items() + ): if isinstance(v, dict): if v.get("label_as_edge") == label: cprops = v.get("properties") @@ -873,9 +880,14 @@ def _write_single_edge_list_to_file( if label in ["IS_SOURCE_OF", "IS_TARGET_OF", "IS_PART_OF"]: skip_id = True - elif not self.extended_schema.get(label): + elif not self.translator.ontology.mapping.extended_schema.get( + label + ): # find label in schema by label_as_edge - for k, v in self.extended_schema.items(): + for ( + k, + v, + ) in self.translator.ontology.mapping.extended_schema.items(): if v.get("label_as_edge") == label: schema_label = k break @@ -884,7 +896,9 @@ def _write_single_edge_list_to_file( if schema_label: if ( - self.extended_schema.get(schema_label).get("use_id") + self.translator.ontology.mapping.extended_schema.get( + schema_label + ).get("use_id") == False ): skip_id = True @@ -1182,9 +1196,14 @@ def _write_edge_headers(self): if label in ["IS_SOURCE_OF", "IS_TARGET_OF", "IS_PART_OF"]: skip_id = True - elif not self.extended_schema.get(label): + elif not self.translator.ontology.mapping.extended_schema.get( + label + ): # find label in schema by label_as_edge - for k, v in self.extended_schema.items(): + for ( + k, + v, + ) in self.translator.ontology.mapping.extended_schema.items(): if v.get("label_as_edge") == label: schema_label = k break @@ -1195,7 +1214,9 @@ def _write_edge_headers(self): if schema_label: if ( - self.extended_schema.get(schema_label).get("use_id") + self.translator.ontology.mapping.extended_schema.get( + schema_label + ).get("use_id") == False ): skip_id = True @@ -1353,9 +1374,9 @@ def _write_node_headers(self): f.write(row) # add collection from schema config - collection = self.extended_schema[label].get( - "db_collection_name", None - ) + collection = self.translator.ontology.mapping.extended_schema[ + label + ].get("db_collection_name", None) # add file path to neo4 admin import statement # do once for each part file @@ -1434,16 +1455,19 @@ def _write_edge_headers(self): f.write(row) # add collection from schema config - if not self.extended_schema.get(label): - for _, v in self.extended_schema.items(): + if not self.translator.ontology.mapping.extended_schema.get(label): + for ( + _, + v, + ) in self.translator.ontology.mapping.extended_schema.items(): if v.get("label_as_edge") == label: collection = v.get("db_collection_name", None) break else: - collection = self.extended_schema[label].get( - "db_collection_name", None - ) + collection = self.translator.ontology.mapping.extended_schema[ + label + ].get("db_collection_name", None) # add file path to neo4 admin import statement (import call path # may be different from actual output path) diff --git a/test/conftest.py b/test/conftest.py index 27a01825..8204a909 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -149,8 +149,32 @@ def disconnected_mapping(): @pytest.fixture(scope="module") -def translator(extended_ontology_mapping): - return Translator(extended_ontology_mapping) +def hybrid_ontology(extended_ontology_mapping): + return Ontology( + head_ontology={ + "url": "https://github.com/biolink/biolink-model/raw/v3.2.1/biolink-model.owl.ttl", + "root_node": "entity", + }, + ontology_mapping=extended_ontology_mapping, + tail_ontologies={ + "so": { + "url": "test/so.owl", + "head_join_node": "sequence variant", + "tail_join_node": "sequence_variant", + }, + "mondo": { + "url": "test/mondo.owl", + "head_join_node": "disease", + "tail_join_node": "human disease", + "merge_nodes": False, + }, + }, + ) + + +@pytest.fixture(scope="module") +def translator(hybrid_ontology): + return Translator(hybrid_ontology) @pytest.fixture(scope="module") @@ -176,30 +200,6 @@ def mondo_adapter(): return OntologyAdapter("test/mondo.owl", "disease") -@pytest.fixture(scope="module") -def hybrid_ontology(extended_ontology_mapping): - return Ontology( - head_ontology={ - "url": "https://github.com/biolink/biolink-model/raw/v3.2.1/biolink-model.owl.ttl", - "root_node": "entity", - }, - ontology_mapping=extended_ontology_mapping, - tail_ontologies={ - "so": { - "url": "test/so.owl", - "head_join_node": "sequence variant", - "tail_join_node": "sequence_variant", - }, - "mondo": { - "url": "test/mondo.owl", - "head_join_node": "disease", - "tail_join_node": "human disease", - "merge_nodes": False, - }, - }, - ) - - # neo4j batch writer fixtures @pytest.fixture(scope="function") def bw(hybrid_ontology, translator, deduplicator, tmp_path): diff --git a/test/test_core.py b/test/test_core.py index 0ba455a0..62dd45bf 100644 --- a/test/test_core.py +++ b/test/test_core.py @@ -29,6 +29,16 @@ def test_log_duplicates(core, deduplicator, _get_nodes): assert True +@pytest.mark.parametrize("l", [4], scope="module") +def test_write_schema_info(core, _get_nodes, _get_edges): + core.add(_get_nodes) + core.add(_get_edges) + + # create rel as node situation + relasnodes = None + assert core.write_schema_info() == None + + # def test_access_translate(driver): # driver.start_ontology() diff --git a/write_mode.drawio.svg b/write_mode.drawio.svg new file mode 100644 index 00000000..f1c56ab1 --- /dev/null +++ b/write_mode.drawio.svg @@ -0,0 +1,337 @@ + + + + + + + + + _core + + + + + + _write + + + (_BatchWriter) + + + + + + + + + + + + _translate + + + (Translator) + + + + + + + + + + _ontology + + + (Ontology) + + + + + + + + + + +
+
+
+ Interface (__init__.py) +
+ BioCypher class +
+
+
+ + + Interface (__init__.py)... + + + + + + + + + + + _deduplicate + + + (Deduplicator) + + + + + + + + + + + + _mapping + + + (OntologyMapping) + + + + + + + + + + _create + + + + + + + + + + +
+
+
+ Data input (tuples) +
+
+
+ + + Data input (tuples) + + + + + + + + + + + +
+
+
+ Configuration (schema YAML) +
+
+
+ + + Configuration (schem... + + + + + + + + + +
+
+
+ Configuration (biocypher) +
+
+
+ + + Configuration (biocy... + + + + + + + +
+
+
+ Data input (BioCypher classes) +
+
+
+ + + Data input (BioCyphe... + + + + + + + + + +
+
+
+ This fork is problematic. We should only store the mapping in one place. +
+
+ Translator could depend on Ontology, or Ontology on Translator. Former is probably more intuitive. +
+
+ The writer would then depend only on the Translator or the Ontology, not both. Former is more intuitive here as well. +
+
+
+ + + This fork is problematic. We... + + + + + + + + + + Legend + + + + + + + +
+
+
+ magenta +
+
+
+ + + magenta + + + + + + + + +
+
+
+ orchestrates +
+
+
+ + + orchestrates + + + + + + + +
+
+
+ white +
+
+
+ + + white + + + + + + + +
+
+
+ depends on +
+
+
+ + + depends on + + + + + + + + +
+
+
+ green +
+
+
+ + + green + + + + + + + + +
+
+
+ data flow +
+
+
+ + + data flow + + + + + + + + + Text is not SVG - cannot display + + + + From 196c9417db0788645a5b0d45d86e351c5c2f0c46 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 24 Aug 2023 14:38:58 +0200 Subject: [PATCH 074/343] adjust test fixtures to refactor --- test/conftest.py | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/test/conftest.py b/test/conftest.py index 8204a909..11ba4d4c 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -202,9 +202,8 @@ def mondo_adapter(): # neo4j batch writer fixtures @pytest.fixture(scope="function") -def bw(hybrid_ontology, translator, deduplicator, tmp_path): +def bw(translator, deduplicator, tmp_path): bw = _Neo4jBatchWriter( - ontology=hybrid_ontology, translator=translator, deduplicator=deduplicator, output_directory=tmp_path, @@ -223,9 +222,8 @@ def bw(hybrid_ontology, translator, deduplicator, tmp_path): # neo4j batch writer fixtures @pytest.fixture(scope="function") -def bw_tab(hybrid_ontology, translator, deduplicator, tmp_path): +def bw_tab(translator, deduplicator, tmp_path): bw_tab = _Neo4jBatchWriter( - ontology=hybrid_ontology, translator=translator, deduplicator=deduplicator, output_directory=tmp_path, @@ -243,9 +241,8 @@ def bw_tab(hybrid_ontology, translator, deduplicator, tmp_path): @pytest.fixture(scope="function") -def bw_strict(hybrid_ontology, translator, deduplicator, tmp_path): +def bw_strict(translator, deduplicator, tmp_path): bw = _Neo4jBatchWriter( - ontology=hybrid_ontology, translator=translator, deduplicator=deduplicator, output_directory=tmp_path, @@ -459,11 +456,8 @@ def skip_if_offline_postgresql(request, postgresql_param): @pytest.fixture(scope="function") -def bw_comma_postgresql( - postgresql_param, hybrid_ontology, translator, deduplicator, tmp_path -): +def bw_comma_postgresql(postgresql_param, translator, deduplicator, tmp_path): bw_comma = _PostgreSQLBatchWriter( - ontology=hybrid_ontology, translator=translator, deduplicator=deduplicator, output_directory=tmp_path, @@ -480,11 +474,8 @@ def bw_comma_postgresql( @pytest.fixture(scope="function") -def bw_tab_postgresql( - postgresql_param, hybrid_ontology, translator, deduplicator, tmp_path -): +def bw_tab_postgresql(postgresql_param, translator, deduplicator, tmp_path): bw_tab = _PostgreSQLBatchWriter( - ontology=hybrid_ontology, translator=translator, deduplicator=deduplicator, output_directory=tmp_path, @@ -523,9 +514,8 @@ def create_database_postgres(postgresql_param): @pytest.fixture(scope="function") -def bw_arango(hybrid_ontology, translator, deduplicator, tmp_path): +def bw_arango(translator, deduplicator, tmp_path): bw_arango = _ArangoDBBatchWriter( - ontology=hybrid_ontology, translator=translator, deduplicator=deduplicator, output_directory=tmp_path, From a3ded2446881f9de1c5b457ce370249599df7e03 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 24 Aug 2023 14:48:40 +0200 Subject: [PATCH 075/343] more conftest fixes --- test/conftest.py | 2 - write_mode.drawio.svg | 227 +++++++++++++++++++----------------------- 2 files changed, 100 insertions(+), 129 deletions(-) diff --git a/test/conftest.py b/test/conftest.py index 11ba4d4c..fc5e62b1 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -342,7 +342,6 @@ def skip_if_offline_neo4j(request, neo4j_param, translator, hybrid_ontology): "wipe": True, "multi_db": True, "translator": translator, - "ontology": hybrid_ontology, } driver_args.update(marker_args) driver_args.update(neo4j_param) @@ -373,7 +372,6 @@ def create_driver(request, neo4j_param, translator, hybrid_ontology): "wipe": True, "multi_db": True, "translator": translator, - "ontology": hybrid_ontology, } driver_args.update(marker_args) driver_args.update(neo4j_param) diff --git a/write_mode.drawio.svg b/write_mode.drawio.svg index f1c56ab1..3d9b1e89 100644 --- a/write_mode.drawio.svg +++ b/write_mode.drawio.svg @@ -1,60 +1,60 @@ - + - - - + + + - + _core - + - + _write - + (_BatchWriter) - - - - - - - + + + + + + + - + _translate - + (Translator) - - - - - + + + + + - + _ontology - + (Ontology) - - - - - + + + + + -
+
Interface (__init__.py) @@ -64,58 +64,56 @@
- + Interface (__init__.py)... - - - - - + + + + + - + _deduplicate - + (Deduplicator) - - - - - - - + + + + + - + _mapping - + (OntologyMapping) - - - - - + + + + + - + _create - - - - - + + + + + -
+
Data input (tuples) @@ -123,20 +121,20 @@
- + Data input (tuples) - - - - - + + + + + -
+
Configuration (schema YAML) @@ -144,18 +142,18 @@
- + Configuration (schem... - - - + + + -
+
Configuration (biocypher) @@ -163,16 +161,16 @@
- + Configuration (biocy... - + -
+
Data input (BioCypher classes) @@ -180,51 +178,26 @@
- + Data input (BioCyphe... - - - - - - -
-
-
- This fork is problematic. We should only store the mapping in one place. -
-
- Translator could depend on Ontology, or Ontology on Translator. Former is probably more intuitive. -
-
- The writer would then depend only on the Translator or the Ontology, not both. Former is more intuitive here as well. -
-
-
- - - This fork is problematic. We... - - - - - - - + + + + - + Legend - - + + -
+
magenta @@ -232,17 +205,17 @@
- + magenta - - + + -
+
orchestrates @@ -250,16 +223,16 @@
- + orchestrates - + -
+
white @@ -267,16 +240,16 @@
- + white - + -
+
depends on @@ -284,17 +257,17 @@
- + depends on - - + + -
+
green @@ -302,17 +275,17 @@
- + green - - + + -
+
data flow @@ -320,7 +293,7 @@
- + data flow From 34cc67b9390f66627f0b2b58e7e257ad97e1decb Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 24 Aug 2023 14:57:20 +0200 Subject: [PATCH 076/343] remove ontology from more places --- biocypher/_pandas.py | 3 +-- biocypher/_write.py | 4 ---- test/conftest.py | 5 ++--- write_mode.drawio.svg | 50 ++++++++++++++++++++++++------------------- 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/biocypher/_pandas.py b/biocypher/_pandas.py index 24898b4a..3b9fa0db 100644 --- a/biocypher/_pandas.py +++ b/biocypher/_pandas.py @@ -4,8 +4,7 @@ class Pandas: - def __init__(self, ontology, translator, deduplicator): - self.ontology = ontology + def __init__(self, translator, deduplicator): self.translator = translator self.deduplicator = deduplicator diff --git a/biocypher/_write.py b/biocypher/_write.py index 8361f167..ed0e9a2f 100644 --- a/biocypher/_write.py +++ b/biocypher/_write.py @@ -1865,7 +1865,6 @@ def _construct_import_call(self) -> str: def get_writer( dbms: str, translator: "Translator", - ontology: "Ontology", deduplicator: "Deduplicator", output_directory: str, strict_mode: bool, @@ -1880,8 +1879,6 @@ def get_writer( translator: the Translator object. - ontology: the Ontology object. - output_directory: the directory to write the output files to. strict_mode: whether to use strict mode. @@ -1905,7 +1902,6 @@ def get_writer( if writer is not None: return writer( - ontology=ontology, translator=translator, deduplicator=deduplicator, delimiter=dbms_config.get("delimiter"), diff --git a/test/conftest.py b/test/conftest.py index fc5e62b1..8d08ed85 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -301,7 +301,6 @@ def create_core(request, tmp_path): @pytest.fixture(scope="function") def _pd(deduplicator): return Pandas( - ontology=None, translator=None, deduplicator=deduplicator, ) @@ -328,7 +327,7 @@ def neo4j_param(request): # skip test if neo4j is offline @pytest.fixture(autouse=True) -def skip_if_offline_neo4j(request, neo4j_param, translator, hybrid_ontology): +def skip_if_offline_neo4j(request, neo4j_param, translator): marker = request.node.get_closest_marker("requires_neo4j") if marker: @@ -356,7 +355,7 @@ def skip_if_offline_neo4j(request, neo4j_param, translator, hybrid_ontology): # neo4j driver fixture @pytest.fixture(name="driver", scope="function") -def create_driver(request, neo4j_param, translator, hybrid_ontology): +def create_driver(request, neo4j_param, translator): marker = None # request.node.get_closest_marker('inject_driver_args') marker_args = {} diff --git a/write_mode.drawio.svg b/write_mode.drawio.svg index 3d9b1e89..101709a6 100644 --- a/write_mode.drawio.svg +++ b/write_mode.drawio.svg @@ -1,8 +1,8 @@ - + - - + + @@ -20,10 +20,10 @@ - - - - + + + + @@ -35,8 +35,8 @@ - - + + @@ -69,11 +69,11 @@ - + - + - + _deduplicate @@ -82,8 +82,8 @@ (Deduplicator) - - + + @@ -95,18 +95,24 @@ (OntologyMapping) - + - - - + + + + + + + + + _create - - + + @@ -126,8 +132,8 @@ - - + + From fef2c9bcca8781c451d87328c504d4749260cd81 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 24 Aug 2023 15:02:41 +0200 Subject: [PATCH 077/343] fix pandas init --- biocypher/_core.py | 1 - 1 file changed, 1 deletion(-) diff --git a/biocypher/_core.py b/biocypher/_core.py index 70596f44..be4e5585 100644 --- a/biocypher/_core.py +++ b/biocypher/_core.py @@ -315,7 +315,6 @@ def add(self, entities): if not self._pd: self._pd = Pandas( translator=self._get_translator(), - ontology=self._get_ontology(), deduplicator=self._get_deduplicator(), ) From fc948d18014f6fca6cff794343c32a3ac152008a Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 24 Aug 2023 15:22:11 +0200 Subject: [PATCH 078/343] rel as nodes fixture --- test/conftest.py | 28 +++++++++++++++++++++++++++- test/test_write_neo4j.py | 35 ++++++----------------------------- 2 files changed, 33 insertions(+), 30 deletions(-) diff --git a/test/conftest.py b/test/conftest.py index 8d08ed85..9091bbbe 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -14,7 +14,7 @@ _ArangoDBBatchWriter, _PostgreSQLBatchWriter, ) -from biocypher._create import BioCypherEdge, BioCypherNode +from biocypher._create import BioCypherEdge, BioCypherNode, BioCypherRelAsNode from biocypher._pandas import Pandas from biocypher._connect import _Neo4jDriver from biocypher._mapping import OntologyMapping @@ -122,6 +122,32 @@ def _get_edges(l): return edges +@pytest.fixture(scope="function") +def _get_rel_as_nodes(l): + rels = [] + for i in range(l): + n = BioCypherNode( + node_id=f"i{i+1}", + node_label="post translational interaction", + properties={ + "directed": True, + "effect": -1, + }, + ) + e1 = BioCypherEdge( + source_id=f"i{i+1}", + target_id=f"p{i+1}", + relationship_label="IS_SOURCE_OF", + ) + e2 = BioCypherEdge( + source_id=f"i{i}", + target_id=f"p{i + 2}", + relationship_label="IS_TARGET_OF", + ) + rels.append(BioCypherRelAsNode(n, e1, e2)) + return rels + + @pytest.fixture(scope="function") def deduplicator(): return Deduplicator() diff --git a/test/test_write_neo4j.py b/test/test_write_neo4j.py index 52387819..4b5aa816 100644 --- a/test/test_write_neo4j.py +++ b/test/test_write_neo4j.py @@ -744,8 +744,9 @@ def test_write_duplicate_edges(bw, _get_edges): assert passed and l == 4 and c == 4 -def test_BioCypherRelAsNode_implementation(bw): - trips = _get_rel_as_nodes(4) +@pytest.mark.parametrize("l", [4], scope="module") +def test_BioCypherRelAsNode_implementation(bw, _get_rel_as_nodes): + trips = _get_rel_as_nodes def gen(lis): yield from lis @@ -779,35 +780,11 @@ def gen(lis): assert "\n" in p -def _get_rel_as_nodes(l): - rels = [] - for i in range(l): - n = BioCypherNode( - node_id=f"i{i+1}", - node_label="post translational interaction", - properties={ - "directed": True, - "effect": -1, - }, - ) - e1 = BioCypherEdge( - source_id=f"i{i+1}", - target_id=f"p{i+1}", - relationship_label="IS_SOURCE_OF", - ) - e2 = BioCypherEdge( - source_id=f"i{i}", - target_id=f"p{i + 2}", - relationship_label="IS_TARGET_OF", - ) - rels.append(BioCypherRelAsNode(n, e1, e2)) - return rels - - -def test_RelAsNode_overwrite_behaviour(bw): +@pytest.mark.parametrize("l", [8], scope="module") +def test_RelAsNode_overwrite_behaviour(bw, _get_rel_as_nodes): # if rel as node is called from successive write calls, SOURCE_OF, # TARGET_OF, and PART_OF should be continued, not overwritten - trips = _get_rel_as_nodes(8) + trips = _get_rel_as_nodes def gen1(lis): yield from lis[:5] From 44baa16deb74c2951fc88db30804c61362decfd4 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 24 Aug 2023 16:26:47 +0200 Subject: [PATCH 079/343] rel as node functionality in pandas closes #267 --- biocypher/_core.py | 20 ++++++-- biocypher/_deduplicate.py | 102 +++++++++++++++++++++++++++----------- biocypher/_pandas.py | 36 ++++++++++++-- test/test_core.py | 5 +- test/test_deduplicate.py | 8 +-- test/test_pandas.py | 15 ++++++ 6 files changed, 141 insertions(+), 45 deletions(-) diff --git a/biocypher/_core.py b/biocypher/_core.py index be4e5585..12cecd0e 100644 --- a/biocypher/_core.py +++ b/biocypher/_core.py @@ -25,7 +25,7 @@ from ._write import get_writer from ._config import config as _config from ._config import update_from_file as _file_update -from ._create import BioCypherEdge, BioCypherNode +from ._create import BioCypherEdge, BioCypherNode, BioCypherRelAsNode from ._pandas import Pandas from ._connect import get_driver from ._mapping import OntologyMapping @@ -320,8 +320,10 @@ def add(self, entities): entities = peekable(entities) - if isinstance(entities.peek(), BioCypherNode) or isinstance( - entities.peek(), BioCypherEdge + if ( + isinstance(entities.peek(), BioCypherNode) + or isinstance(entities.peek(), BioCypherEdge) + or isinstance(entities.peek(), BioCypherRelAsNode) ): tentities = entities elif len(entities.peek()) < 4: @@ -512,6 +514,9 @@ def write_schema_info(self) -> None: We start by using the `extended_schema` dictionary from the ontology class instance, which contains all expanded entities and relationships. + The information of whether something is a relationship can be gathered + from the deduplicator instance, which keeps track of all entities that + have been seen. """ if not self._offline: @@ -519,6 +524,15 @@ class instance, which contains all expanded entities and relationships. "Cannot write schema info in online mode." ) + ontology = self._get_ontology() + schema = ontology.mapping.extended_schema + schema["is_schema_info"] = True + + deduplicator = self._get_deduplicator() + for node in deduplicator.seen_nodes: + if node in schema["nodes"]: + schema["nodes"][node]["is_relationship"] = True + # TRANSLATION METHODS ### def translate_term(self, term: str) -> str: diff --git a/biocypher/_deduplicate.py b/biocypher/_deduplicate.py index 5ac79abb..4a1ce94a 100644 --- a/biocypher/_deduplicate.py +++ b/biocypher/_deduplicate.py @@ -2,7 +2,7 @@ logger.debug(f"Loading module {__name__}.") -from ._create import BioCypherEdge, BioCypherNode +from ._create import BioCypherEdge, BioCypherNode, BioCypherRelAsNode class Deduplicator: @@ -19,15 +19,17 @@ class Deduplicator: """ def __init__(self): - self.seen_node_ids = set() - self.duplicate_node_ids = set() - self.duplicate_node_types = set() + self.seen_entity_ids = set() + self.duplicate_entity_ids = set() - self.seen_edges = {} - self.duplicate_edge_ids = set() - self.duplicate_edge_types = set() + self.entity_types = set() + self.duplicate_entity_types = set() - def node_seen(self, node: BioCypherNode) -> bool: + self.seen_relationships = {} + self.duplicate_relationship_ids = set() + self.duplicate_relationship_types = set() + + def node_seen(self, entity: BioCypherNode) -> bool: """ Adds a node to the instance and checks if it has been seen before. @@ -37,19 +39,22 @@ def node_seen(self, node: BioCypherNode) -> bool: Returns: True if the node has been seen before, False otherwise. """ - if node.get_id() in self.seen_node_ids: - self.duplicate_node_ids.add(node.get_id()) - if node.get_label() not in self.duplicate_node_types: + if entity.get_label() not in self.entity_types: + self.entity_types.add(entity.get_label()) + + if entity.get_id() in self.seen_entity_ids: + self.duplicate_entity_ids.add(entity.get_id()) + if entity.get_label() not in self.duplicate_entity_types: logger.warning( - f"Duplicate node type {node.get_label()} found. " + f"Duplicate node type {entity.get_label()} found. " ) - self.duplicate_node_types.add(node.get_label()) + self.duplicate_entity_types.add(entity.get_label()) return True - self.seen_node_ids.add(node.get_id()) + self.seen_entity_ids.add(entity.get_id()) return False - def edge_seen(self, edge: BioCypherEdge) -> bool: + def edge_seen(self, relationship: BioCypherEdge) -> bool: """ Adds an edge to the instance and checks if it has been seen before. @@ -59,23 +64,57 @@ def edge_seen(self, edge: BioCypherEdge) -> bool: Returns: True if the edge has been seen before, False otherwise. """ - if edge.get_type() not in self.seen_edges: - self.seen_edges[edge.get_type()] = set() + if relationship.get_type() not in self.seen_relationships: + self.seen_relationships[relationship.get_type()] = set() # concatenate source and target if no id is present - if not edge.get_id(): - _id = f"{edge.get_source_id()}_{edge.get_target_id()}" + if not relationship.get_id(): + _id = ( + f"{relationship.get_source_id()}_{relationship.get_target_id()}" + ) else: - _id = edge.get_id() + _id = relationship.get_id() + + if _id in self.seen_relationships[relationship.get_type()]: + self.duplicate_relationship_ids.add(_id) + if relationship.get_type() not in self.duplicate_relationship_types: + logger.warning( + f"Duplicate edge type {relationship.get_type()} found. " + ) + self.duplicate_relationship_types.add(relationship.get_type()) + return True + + self.seen_relationships[relationship.get_type()].add(_id) + return False + + def rel_as_node_seen(self, rel_as_node: BioCypherRelAsNode) -> bool: + """ + Adds a rel_as_node to the instance (one entity and two relationships) + and checks if it has been seen before. Only the node is relevant for + identifying the rel_as_node as a duplicate. + + Args: + rel_as_node: BioCypherRelAsNode to be added. + + Returns: + True if the rel_as_node has been seen before, False otherwise. + """ + node = rel_as_node.get_node() + + if node.get_label() not in self.seen_relationships: + self.seen_relationships[node.get_label()] = set() + + # rel as node always has an id + _id = node.get_id() - if _id in self.seen_edges[edge.get_type()]: - self.duplicate_edge_ids.add(_id) - if edge.get_type() not in self.duplicate_edge_types: - logger.warning(f"Duplicate edge type {edge.get_type()} found. ") - self.duplicate_edge_types.add(edge.get_type()) + if _id in self.seen_relationships[node.get_type()]: + self.duplicate_relationship_ids.add(_id) + if node.get_type() not in self.duplicate_relationship_types: + logger.warning(f"Duplicate edge type {node.get_type()} found. ") + self.duplicate_relationship_types.add(node.get_type()) return True - self.seen_edges[edge.get_type()].add(_id) + self.seen_relationships[node.get_type()].add(_id) return False def get_duplicate_nodes(self): @@ -86,8 +125,8 @@ def get_duplicate_nodes(self): list: list of duplicate nodes """ - if self.duplicate_node_types: - return (self.duplicate_node_types, self.duplicate_node_ids) + if self.duplicate_entity_types: + return (self.duplicate_entity_types, self.duplicate_entity_ids) else: return None @@ -99,7 +138,10 @@ def get_duplicate_edges(self): list: list of duplicate edges """ - if self.duplicate_edge_types: - return (self.duplicate_edge_types, self.duplicate_edge_ids) + if self.duplicate_relationship_types: + return ( + self.duplicate_relationship_types, + self.duplicate_relationship_ids, + ) else: return None diff --git a/biocypher/_pandas.py b/biocypher/_pandas.py index 3b9fa0db..60bc10f4 100644 --- a/biocypher/_pandas.py +++ b/biocypher/_pandas.py @@ -1,6 +1,6 @@ import pandas as pd -from ._create import BioCypherEdge, BioCypherNode +from ._create import BioCypherEdge, BioCypherNode, BioCypherRelAsNode class Pandas: @@ -17,22 +17,48 @@ def _separate_entity_types(self, entities): """ lists = {} for entity in entities: - if not isinstance(entity, BioCypherNode) and not isinstance( - entity, BioCypherEdge + if ( + not isinstance(entity, BioCypherNode) + and not isinstance(entity, BioCypherEdge) + and not isinstance(entity, BioCypherRelAsNode) ): raise TypeError( - f"Expected a BioCypherNode or BioCypherEdge, got {type(entity)}." + "Expected a BioCypherNode / BioCypherEdge / " + f"BioCypherRelAsNode, got {type(entity)}." ) if isinstance(entity, BioCypherNode): seen = self.deduplicator.node_seen(entity) elif isinstance(entity, BioCypherEdge): seen = self.deduplicator.edge_seen(entity) + elif isinstance(entity, BioCypherRelAsNode): + seen = self.deduplicator.rel_as_node_seen(entity) if seen: continue - _type = entity.get_label() + if isinstance(entity, BioCypherRelAsNode): + node = entity.get_node() + source_edge = entity.get_source_edge() + target_edge = entity.get_target_edge() + + _type = node.get_type() + if not _type in lists: + lists[_type] = [] + lists[_type].append(node) + + _source_type = source_edge.get_type() + if not _source_type in lists: + lists[_source_type] = [] + lists[_source_type].append(source_edge) + + _target_type = target_edge.get_type() + if not _target_type in lists: + lists[_target_type] = [] + lists[_target_type].append(target_edge) + continue + + _type = entity.get_type() if not _type in lists: lists[_type] = [] lists[_type].append(entity) diff --git a/test/test_core.py b/test/test_core.py index 62dd45bf..c103d4f2 100644 --- a/test/test_core.py +++ b/test/test_core.py @@ -30,12 +30,11 @@ def test_log_duplicates(core, deduplicator, _get_nodes): @pytest.mark.parametrize("l", [4], scope="module") -def test_write_schema_info(core, _get_nodes, _get_edges): +def test_write_schema_info(core, _get_nodes, _get_edges, _get_rel_as_nodes): core.add(_get_nodes) core.add(_get_edges) + core.add(_get_rel_as_nodes) - # create rel as node situation - relasnodes = None assert core.write_schema_info() == None diff --git a/test/test_deduplicate.py b/test/test_deduplicate.py index 1efa122e..68b00c7a 100644 --- a/test/test_deduplicate.py +++ b/test/test_deduplicate.py @@ -24,8 +24,8 @@ def test_duplicate_nodes(_get_nodes): for node in nodes: dedup.node_seen(node) - assert "protein" in dedup.duplicate_node_types - assert "p1" in dedup.duplicate_node_ids + assert "protein" in dedup.duplicate_entity_types + assert "p1" in dedup.duplicate_entity_ids @pytest.mark.parametrize("l", [4], scope="module") @@ -78,8 +78,8 @@ def test_duplicate_edges(_get_edges): for edge in edges: dedup.edge_seen(edge) - assert "Is_Mutated_In" in dedup.duplicate_edge_types - assert ("mrel2") in dedup.duplicate_edge_ids + assert "Is_Mutated_In" in dedup.duplicate_relationship_types + assert ("mrel2") in dedup.duplicate_relationship_ids @pytest.mark.parametrize("l", [4], scope="module") diff --git a/test/test_pandas.py b/test/test_pandas.py index 9cd405d4..a99d0578 100644 --- a/test/test_pandas.py +++ b/test/test_pandas.py @@ -59,3 +59,18 @@ def edge_gen(): _pd.add_tables(edge_gen()) assert "PERTURBED_IN_DISEASE" in _pd.dfs.keys() + + +@pytest.mark.parametrize("l", [4], scope="module") +def test_rel_as_nodes(_pd, _get_rel_as_nodes): + _pd.add_tables(_get_rel_as_nodes) + assert "post translational interaction" in _pd.dfs.keys() + assert "directed" in _pd.dfs["post translational interaction"].columns + assert "effect" in _pd.dfs["post translational interaction"].columns + assert "i1" in _pd.dfs["post translational interaction"]["node_id"].values + assert "IS_SOURCE_OF" in _pd.dfs.keys() + assert "IS_TARGET_OF" in _pd.dfs.keys() + assert "source_id" in _pd.dfs["IS_SOURCE_OF"].columns + assert "i3" in _pd.dfs["IS_SOURCE_OF"]["source_id"].values + assert "target_id" in _pd.dfs["IS_TARGET_OF"].columns + assert "p2" in _pd.dfs["IS_TARGET_OF"]["target_id"].values From 600864065e88e9f196580890df079954b238d631 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 24 Aug 2023 16:37:33 +0200 Subject: [PATCH 080/343] rename node tuples --- biocypher/_translate.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/biocypher/_translate.py b/biocypher/_translate.py index 8438d54b..e9d9ee34 100644 --- a/biocypher/_translate.py +++ b/biocypher/_translate.py @@ -69,7 +69,7 @@ def __init__(self, ontology: "Ontology", strict_mode: bool = False): def translate_nodes( self, - id_type_prop_tuples: Iterable, + node_tuples: Iterable, ) -> Generator[BioCypherNode, None, None]: """ Translates input node representation to a representation that @@ -77,16 +77,16 @@ def translate_nodes( requires explicit statement of node type on pass. Args: - id_type_tuples (list of tuples): collection of tuples + node_tuples (list of tuples): collection of tuples representing individual nodes by their unique id and a type that is translated from the original database notation to the corresponding BioCypher notation. """ - self._log_begin_translate(id_type_prop_tuples, "nodes") + self._log_begin_translate(node_tuples, "nodes") - for _id, _type, _props in id_type_prop_tuples: + for _id, _type, _props in node_tuples: # check for strict mode requirements required_props = ["source", "licence", "version"] From 663cc14c4807923f079cdd5da3f314995000fab0 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 24 Aug 2023 16:50:22 +0200 Subject: [PATCH 081/343] move edge deduplication upstream into the .. `write_edges` function to account for RelAsNode relationships introduces a difference between `write_nodes` and `write_edges`, as the .. former still checks in the downstream write function. this is .. preferable because it allows to stay in generator mode for longer --- biocypher/_write.py | 48 +++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/biocypher/_write.py b/biocypher/_write.py index ed0e9a2f..c66965b6 100644 --- a/biocypher/_write.py +++ b/biocypher/_write.py @@ -345,34 +345,34 @@ def write_edges( bool: The return value. True for success, False otherwise. """ passed = False - # unwrap generator in one step edges = list(edges) # force evaluation to handle empty generator if edges: - z = zip( - *( - ( - e.get_node(), - [ - e.get_source_edge(), - e.get_target_edge(), - ], - ) - if isinstance(e, BioCypherRelAsNode) - else (None, [e]) - for e in edges - ) - ) - nod, edg = (list(a) for a in z) - nod = [n for n in nod if n] - edg = [val for sublist in edg for val in sublist] # flatten + nodes_flat = [] + edges_flat = [] + for edge in edges: + if isinstance(edge, BioCypherRelAsNode): + # check if relationship has already been written, if so skip + if self.deduplicator.rel_as_node_seen(edge): + continue + + nodes_flat.append(edge.get_node()) + edges_flat.append(edge.get_source_edge()) + edges_flat.append(edge.get_target_edge()) - if nod and edg: - passed = self.write_nodes(nod) and self._write_edge_data( - edg, + else: + # check if relationship has already been written, if so skip + if self.deduplicator.edge_seen(edge): + continue + + edges_flat.append(edge) + + if nodes_flat and edges_flat: + passed = self.write_nodes(nodes_flat) and self._write_edge_data( + edges_flat, batch_size, ) else: - passed = self._write_edge_data(edg, batch_size) + passed = self._write_edge_data(edges_flat, batch_size) else: # is this a problem? if the generator or list is empty, we @@ -679,10 +679,6 @@ def _write_edge_data(self, edges, batch_size): # for each label to check for consistency and their type # for now, relevant for `int` for edge in edges: - # check for duplicates - if self.deduplicator.edge_seen(edge): - continue - if not (edge.get_source_id() and edge.get_target_id()): logger.error( "Edge must have source and target node. " From b1a62119d6e752f3c6c0b8d0adfa519d28d337e0 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 24 Aug 2023 17:30:05 +0200 Subject: [PATCH 082/343] return and write an extended schema that contains .. - information about presence in the KG - information on the entity being a relationship --- biocypher/_core.py | 54 +++++++++++++++++++++++++++++++++++++++------- test/test_core.py | 48 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 93 insertions(+), 9 deletions(-) diff --git a/biocypher/_core.py b/biocypher/_core.py index 12cecd0e..8493b388 100644 --- a/biocypher/_core.py +++ b/biocypher/_core.py @@ -13,8 +13,10 @@ submodules. """ from typing import Optional +import os from more_itertools import peekable +import yaml import pandas as pd @@ -506,11 +508,12 @@ def write_schema_info(self) -> None: """ Write an extended schema info YAML file that extends the `schema_config.yaml` with run-time information of the built KG. For - instance, include information on whether something is a relationship - (which is important in the case of representing relationships as nodes) - and the actual sources and targets of edges. Since this file can be used - in place of the original `schema_config.yaml` file, it indicates that it - is the extended schema by setting `is_schema_info` to `true`. + instance, include information on whether something present in the actual + knowledge graph, whether it is a relationship (which is important in the + case of representing relationships as nodes) and the actual sources and + targets of edges. Since this file can be used in place of the original + `schema_config.yaml` file, it indicates that it is the extended schema + by setting `is_schema_info` to `true`. We start by using the `extended_schema` dictionary from the ontology class instance, which contains all expanded entities and relationships. @@ -529,9 +532,44 @@ class instance, which contains all expanded entities and relationships. schema["is_schema_info"] = True deduplicator = self._get_deduplicator() - for node in deduplicator.seen_nodes: - if node in schema["nodes"]: - schema["nodes"][node]["is_relationship"] = True + for node in deduplicator.entity_types: + if node in schema.keys(): + schema[node]["present_in_knowledge_graph"] = True + schema[node]["is_relationship"] = False + else: + logger.info( + f"Node {node} not present in extended schema. " + "Skipping schema info." + ) + + # find 'label_as_edge' cases in schema entries + changed_labels = {} + for k, v in schema.items(): + if not isinstance(v, dict): + continue + if "label_as_edge" in v.keys(): + if v["label_as_edge"] in deduplicator.seen_relationships.keys(): + changed_labels[v["label_as_edge"]] = k + + for edge in deduplicator.seen_relationships.keys(): + if edge in changed_labels.keys(): + edge = changed_labels[edge] + if edge in schema.keys(): + schema[edge]["present_in_knowledge_graph"] = True + schema[edge]["is_relationship"] = True + # TODO information about source and target nodes + else: + logger.info( + f"Edge {edge} not present in extended schema. " + "Skipping schema info." + ) + + # write to output directory as YAML file + path = os.path.join(self._output_directory, "schema_info.yaml") + with open(path, "w") as f: + f.write(yaml.dump(schema)) + + return schema # TRANSLATION METHODS ### diff --git a/test/test_core.py b/test/test_core.py index c103d4f2..6171fece 100644 --- a/test/test_core.py +++ b/test/test_core.py @@ -1,3 +1,6 @@ +import os + +import yaml import pytest @@ -35,7 +38,50 @@ def test_write_schema_info(core, _get_nodes, _get_edges, _get_rel_as_nodes): core.add(_get_edges) core.add(_get_rel_as_nodes) - assert core.write_schema_info() == None + schema = core.write_schema_info() + + assert schema.get("is_schema_info") == True + assert schema.get("protein").get("present_in_knowledge_graph") == True + assert schema.get("protein").get("is_relationship") == False + assert schema.get("microRNA").get("present_in_knowledge_graph") == True + assert schema.get("microRNA").get("is_relationship") == False + assert ( + schema.get("gene to disease association").get( + "present_in_knowledge_graph" + ) + == True + ) + assert ( + schema.get("gene to disease association").get("is_relationship") == True + ) + assert ( + schema.get("mutation to tissue association").get( + "present_in_knowledge_graph" + ) + == True + ) + assert ( + schema.get("mutation to tissue association").get("is_relationship") + == True + ) + assert ( + schema.get("post translational interaction").get( + "present_in_knowledge_graph" + ) + == True + ) + assert ( + schema.get("post translational interaction").get("is_relationship") + == True + ) + + path = os.path.join(core._output_directory, "schema_info.yaml") + assert os.path.exists(path) + + with open(path, "r") as f: + schema_loaded = yaml.safe_load(f) + + assert schema_loaded == schema # def test_access_translate(driver): From e80b34ce627a0990cc66e82830c5365b751954b8 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 24 Aug 2023 18:11:33 +0200 Subject: [PATCH 083/343] account for non-dict entities --- biocypher/_ontology.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/biocypher/_ontology.py b/biocypher/_ontology.py index bf98bce3..2f71c660 100644 --- a/biocypher/_ontology.py +++ b/biocypher/_ontology.py @@ -558,6 +558,8 @@ def show_ontology_structure(self, to_disk: str = None, full: bool = False): # add synonym information for node in self.mapping.extended_schema: + if not isinstance(self.mapping.extended_schema[node], dict): + continue if self.mapping.extended_schema[node].get("synonym_for"): tree.nodes[node].tag = ( f"{node} = " From 4462a8d046361e8c1b51818f234d90e13e1d9e3e Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 24 Aug 2023 18:12:03 +0200 Subject: [PATCH 084/343] change test tmp path handling and fixture scopes --- test/conftest.py | 109 ++++++++++++++++++++++++++-------------------- test/test_core.py | 9 ++-- 2 files changed, 67 insertions(+), 51 deletions(-) diff --git a/test/conftest.py b/test/conftest.py index 9091bbbe..c3748b39 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -1,5 +1,6 @@ import os import random +import shutil import string import tempfile import subprocess @@ -51,10 +52,34 @@ def pytest_addoption(parser): ) -# temporary output paths -def get_random_string(length): - letters = string.ascii_lowercase - return "".join(random.choice(letters) for _ in range(length)) +@pytest.fixture(scope="session") +def tmp_path_session(tmp_path_factory): + """ + Create a session-scoped temporary directory. + + Args: + tmp_path_factory: The built-in pytest fixture. + + Returns: + pathlib.Path: The path to the temporary directory. + """ + return tmp_path_factory.mktemp("data") + + +@pytest.fixture(scope="session", autouse=True) +def cleanup(request, tmp_path_session): + """ + Teardown function to delete the session-scoped temporary directory. + + Args: + request: The pytest request object. + tmp_path_session: The session-scoped temporary directory. + """ + + def remove_tmp_dir(): + shutil.rmtree(tmp_path_session) + + request.addfinalizer(remove_tmp_dir) # biocypher node generator @@ -228,11 +253,11 @@ def mondo_adapter(): # neo4j batch writer fixtures @pytest.fixture(scope="function") -def bw(translator, deduplicator, tmp_path): +def bw(translator, deduplicator, tmp_path_session): bw = _Neo4jBatchWriter( translator=translator, deduplicator=deduplicator, - output_directory=tmp_path, + output_directory=tmp_path_session, delimiter=";", array_delimiter="|", quote="'", @@ -241,18 +266,17 @@ def bw(translator, deduplicator, tmp_path): yield bw # teardown - for f in os.listdir(tmp_path): - os.remove(os.path.join(tmp_path, f)) - os.rmdir(tmp_path) + for f in os.listdir(tmp_path_session): + os.remove(os.path.join(tmp_path_session, f)) # neo4j batch writer fixtures @pytest.fixture(scope="function") -def bw_tab(translator, deduplicator, tmp_path): +def bw_tab(translator, deduplicator, tmp_path_session): bw_tab = _Neo4jBatchWriter( translator=translator, deduplicator=deduplicator, - output_directory=tmp_path, + output_directory=tmp_path_session, delimiter="\\t", array_delimiter="|", quote="'", @@ -261,17 +285,16 @@ def bw_tab(translator, deduplicator, tmp_path): yield bw_tab # teardown - for f in os.listdir(tmp_path): - os.remove(os.path.join(tmp_path, f)) - os.rmdir(tmp_path) + for f in os.listdir(tmp_path_session): + os.remove(os.path.join(tmp_path_session, f)) @pytest.fixture(scope="function") -def bw_strict(translator, deduplicator, tmp_path): +def bw_strict(translator, deduplicator, tmp_path_session): bw = _Neo4jBatchWriter( translator=translator, deduplicator=deduplicator, - output_directory=tmp_path, + output_directory=tmp_path_session, delimiter=";", array_delimiter="|", quote="'", @@ -281,14 +304,13 @@ def bw_strict(translator, deduplicator, tmp_path): yield bw # teardown - for f in os.listdir(tmp_path): - os.remove(os.path.join(tmp_path, f)) - os.rmdir(tmp_path) + for f in os.listdir(tmp_path_session): + os.remove(os.path.join(tmp_path_session, f)) # core instance fixture @pytest.fixture(name="core", scope="function") -def create_core(request, tmp_path): +def create_core(request, tmp_path_session): # TODO why does the integration test use a different path than this fixture? marker = request.node.get_closest_marker("inject_core_args") @@ -298,30 +320,20 @@ def create_core(request, tmp_path): if marker and hasattr(marker, "param"): marker_args = marker.param - if not marker_args and "CORE" in globals(): - c = globals()["CORE"] - else: core_args = { "schema_config_path": "biocypher/_config/test_schema_config.yaml", - "output_directory": tmp_path, + "output_directory": tmp_path_session, } core_args.update(marker_args) c = BioCypher(**core_args) - if not marker_args: - globals()["CORE"] = c - - c._deduplicator = Deduplicator() - # seems to reuse deduplicator from previous test, unsure why - yield c # teardown - for f in os.listdir(tmp_path): - os.remove(os.path.join(tmp_path, f)) - os.rmdir(tmp_path) + for f in os.listdir(tmp_path_session): + os.remove(os.path.join(tmp_path_session, f)) @pytest.fixture(scope="function") @@ -479,11 +491,13 @@ def skip_if_offline_postgresql(request, postgresql_param): @pytest.fixture(scope="function") -def bw_comma_postgresql(postgresql_param, translator, deduplicator, tmp_path): +def bw_comma_postgresql( + postgresql_param, translator, deduplicator, tmp_path_session +): bw_comma = _PostgreSQLBatchWriter( translator=translator, deduplicator=deduplicator, - output_directory=tmp_path, + output_directory=tmp_path_session, delimiter=",", **postgresql_param, ) @@ -491,17 +505,18 @@ def bw_comma_postgresql(postgresql_param, translator, deduplicator, tmp_path): yield bw_comma # teardown - for f in os.listdir(tmp_path): - os.remove(os.path.join(tmp_path, f)) - os.rmdir(tmp_path) + for f in os.listdir(tmp_path_session): + os.remove(os.path.join(tmp_path_session, f)) @pytest.fixture(scope="function") -def bw_tab_postgresql(postgresql_param, translator, deduplicator, tmp_path): +def bw_tab_postgresql( + postgresql_param, translator, deduplicator, tmp_path_session +): bw_tab = _PostgreSQLBatchWriter( translator=translator, deduplicator=deduplicator, - output_directory=tmp_path, + output_directory=tmp_path_session, delimiter="\\t", **postgresql_param, ) @@ -509,9 +524,8 @@ def bw_tab_postgresql(postgresql_param, translator, deduplicator, tmp_path): yield bw_tab # teardown - for f in os.listdir(tmp_path): - os.remove(os.path.join(tmp_path, f)) - os.rmdir(tmp_path) + for f in os.listdir(tmp_path_session): + os.remove(os.path.join(tmp_path_session, f)) @pytest.fixture(scope="session") @@ -537,17 +551,16 @@ def create_database_postgres(postgresql_param): @pytest.fixture(scope="function") -def bw_arango(translator, deduplicator, tmp_path): +def bw_arango(translator, deduplicator, tmp_path_session): bw_arango = _ArangoDBBatchWriter( translator=translator, deduplicator=deduplicator, - output_directory=tmp_path, + output_directory=tmp_path_session, delimiter=",", ) yield bw_arango # teardown - for f in os.listdir(tmp_path): - os.remove(os.path.join(tmp_path, f)) - os.rmdir(tmp_path) + for f in os.listdir(tmp_path_session): + os.remove(os.path.join(tmp_path_session, f)) diff --git a/test/test_core.py b/test/test_core.py index 6171fece..ea08b5b8 100644 --- a/test/test_core.py +++ b/test/test_core.py @@ -21,7 +21,7 @@ def test_log_missing_types(core, translator): assert mt.get("a") == 1 and mt.get("b") == 2 -@pytest.mark.parametrize("l", [4], scope="module") +@pytest.mark.parametrize("l", [4], scope="function") def test_log_duplicates(core, deduplicator, _get_nodes): core._deduplicator = deduplicator nodes = _get_nodes + _get_nodes @@ -29,10 +29,13 @@ def test_log_duplicates(core, deduplicator, _get_nodes): core.add(nodes) core.log_duplicates() - assert True + assert "protein" in core._deduplicator.duplicate_entity_types + assert "p1" in core._deduplicator.duplicate_entity_ids + assert "microRNA" in core._deduplicator.duplicate_entity_types + assert "m1" in core._deduplicator.duplicate_entity_ids -@pytest.mark.parametrize("l", [4], scope="module") +@pytest.mark.parametrize("l", [4], scope="function") def test_write_schema_info(core, _get_nodes, _get_edges, _get_rel_as_nodes): core.add(_get_nodes) core.add(_get_edges) From 276215d88996346f1392e2aee6f0c63cb70e79fb Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 24 Aug 2023 18:19:37 +0200 Subject: [PATCH 085/343] comment --- test/conftest.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/conftest.py b/test/conftest.py index c3748b39..475d4b27 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -311,8 +311,6 @@ def bw_strict(translator, deduplicator, tmp_path_session): # core instance fixture @pytest.fixture(name="core", scope="function") def create_core(request, tmp_path_session): - # TODO why does the integration test use a different path than this fixture? - marker = request.node.get_closest_marker("inject_core_args") marker_args = {} From 47140fecc938718d2d2c8aa5fd78dcea2e78e2f5 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 24 Aug 2023 18:19:41 +0200 Subject: [PATCH 086/343] =?UTF-8?q?Bump=20version:=200.5.19=20=E2=86=92=20?= =?UTF-8?q?0.5.20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- biocypher/_metadata.py | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index ad773ee7..c4987da1 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.5.19 +current_version = 0.5.20 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+) diff --git a/biocypher/_metadata.py b/biocypher/_metadata.py index 21852747..31b28ec1 100644 --- a/biocypher/_metadata.py +++ b/biocypher/_metadata.py @@ -19,7 +19,7 @@ import toml -_VERSION = "0.5.19" +_VERSION = "0.5.20" def get_metadata(): diff --git a/pyproject.toml b/pyproject.toml index 86a007fa..bf35f192 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "biocypher" -version = "0.5.19" +version = "0.5.20" description = "A unifying framework for biomedical research knowledge graphs" authors = [ "Sebastian Lobentanzer ", From a023d8aad0e0d541ce4a133587f3ed57ced380e8 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 24 Aug 2023 18:38:31 +0200 Subject: [PATCH 087/343] string formatting and unused imports --- test/conftest.py | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/test/conftest.py b/test/conftest.py index 475d4b27..4ef97f90 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -1,8 +1,5 @@ import os -import random import shutil -import string -import tempfile import subprocess from neo4j.exceptions import ServiceUnavailable @@ -35,7 +32,8 @@ def pytest_addoption(parser): # postgresl ( "database_name_postgresql", - 'The PostgreSQL database to be used for tests. Defaults to "postgresql-biocypher-test-TG2C7GsdNw".', + "The PostgreSQL database to be used for tests. Defaults to " + '"postgresql-biocypher-test-TG2C7GsdNw".', ), ("user_postgresql", "Tests access PostgreSQL as this user."), ("password_postgresql", "Password to access PostgreSQL."), @@ -455,8 +453,10 @@ def postgresql_param(request): request.config.getoption(f"--{key}") or param[key_short] ) - # hardcoded string for test-db name. test-db will be created for testing and droped after testing. - # Do not take db_name from config to avoid accidental testing on the production database + # hardcoded string for test-db name. test-db will be created for testing and + # droped after testing. Do not take db_name from config to avoid accidental + # testing on the production database + cli["db_name"] = ( request.config.getoption("--database_name_postgresql") or "postgresql-biocypher-test-TG2C7GsdNw" @@ -480,7 +480,10 @@ def skip_if_offline_postgresql(request, postgresql_param): ) # an empty command, just to test if connection is possible - command = f"PGPASSWORD={password} psql -c '' --host {host} --port {port} --user {user}" + command = ( + f"PGPASSWORD={password} psql -c '' --host {host} " + "--port {port} --user {user}" + ) process = subprocess.run(command, shell=True) # returncode is 0 when success @@ -538,13 +541,20 @@ def create_database_postgres(postgresql_param): ) # create the database - command = f"PGPASSWORD={password} psql -c 'CREATE DATABASE \"{dbname}\";' --host {host} --port {port} --user {user}" + command = ( + f"PGPASSWORD={password} psql -c 'CREATE DATABASE \"{dbname}\";' " + "--host {host} --port {port} --user {user}" + ) process = subprocess.run(command, shell=True) - yield dbname, user, host, port, password, process.returncode == 0 # 0 if success + # 0 if success + yield dbname, user, host, port, password, process.returncode == 0 # teardown - command = f"PGPASSWORD={password} psql -c 'DROP DATABASE \"{dbname}\";' --host {host} --port {port} --user {user}" + command = ( + f"PGPASSWORD={password} psql -c 'DROP DATABASE \"{dbname}\";' " + "--host {host} --port {port} --user {user}" + ) process = subprocess.run(command, shell=True) From 93dd2c62db13a593fb162f76fdada68b0374a14c Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 24 Aug 2023 18:40:25 +0200 Subject: [PATCH 088/343] drawio file to docs folder --- write_mode.drawio.svg => docs/write_mode.drawio.svg | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename write_mode.drawio.svg => docs/write_mode.drawio.svg (100%) diff --git a/write_mode.drawio.svg b/docs/write_mode.drawio.svg similarity index 100% rename from write_mode.drawio.svg rename to docs/write_mode.drawio.svg From a6721d34367d62bc90826a193af437093efbc9d3 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 24 Aug 2023 19:09:19 +0200 Subject: [PATCH 089/343] expand test and make all URLs lists (also .. single entries) --- biocypher/_get.py | 6 ++++-- test/test_get.py | 31 +++++++++++++++++++++++++------ 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/biocypher/_get.py b/biocypher/_get.py index 5ad6c136..88aadda7 100644 --- a/biocypher/_get.py +++ b/biocypher/_get.py @@ -26,6 +26,8 @@ import pooch +from ._misc import to_list + class Resource: def __init__( @@ -43,7 +45,7 @@ def __init__( Args: name (str): The name of the resource. - url (str): The URL of the resource. + url_s (str | list[str]): The URL or URLs of the resource. lifetime (int): The lifetime of the resource in days. If 0, the resource is considered to be permanent. @@ -273,7 +275,7 @@ def _update_cache_record(self, resource: Resource): resource (Resource): The resource to update the cache record of. """ cache_record = {} - cache_record["url"] = resource.url_s + cache_record["url"] = to_list(resource.url_s) cache_record["date_downloaded"] = datetime.now() cache_record["lifetime"] = resource.lifetime self.cache_dict[resource.name] = cache_record diff --git a/test/test_get.py b/test/test_get.py index 7b093631..8d86d319 100644 --- a/test/test_get.py +++ b/test/test_get.py @@ -52,18 +52,37 @@ def test_download_file(downloader): assert paths[0] is not None -def test_download_file_list(downloader): - resource = Resource( - "test_resource", - [ +def test_download_lists(downloader): + resource1 = Resource( + name="test_resource1", + url_s=[ "https://github.com/biocypher/biocypher/raw/main/biocypher/_config/test_config.yaml", "https://github.com/biocypher/biocypher/raw/main/biocypher/_config/test_schema_config_disconnected.yaml", ], ) - paths = downloader.download(resource) - assert len(paths) == 2 + resource2 = Resource( + "test_resource2", + "https://github.com/biocypher/biocypher/raw/get-module/test/test_CSVs.zip", + ) + paths = downloader.download(resource1, resource2) + assert len(paths) == 4 # 2 files from resource1, 2 files from resource2 zip assert os.path.exists(paths[0]) assert os.path.exists(paths[1]) + assert os.path.exists(paths[2]) + assert os.path.exists(paths[3]) + assert "test_config.yaml" in paths[0] + assert "test_schema_config_disconnected.yaml" in paths[1] + assert "file1.csv" in paths[2] + assert "file2.csv" in paths[3] + assert isinstance( + downloader.cache_dict["test_resource1"]["date_downloaded"], datetime + ) + assert isinstance(downloader.cache_dict["test_resource1"]["url"], list) + assert len(downloader.cache_dict["test_resource1"]["url"]) == 2 + assert downloader.cache_dict["test_resource1"]["lifetime"] == 0 + assert isinstance(downloader.cache_dict["test_resource2"]["url"], list) + assert len(downloader.cache_dict["test_resource2"]["url"]) == 1 + assert downloader.cache_dict["test_resource2"]["lifetime"] == 0 def test_download_directory(): From 6fb320cf3c9df8a640bacaccd66f1452056aad8d Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 24 Aug 2023 19:19:38 +0200 Subject: [PATCH 090/343] test expiration --- test/test_get.py | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/test/test_get.py b/test/test_get.py index 8d86d319..437774cd 100644 --- a/test/test_get.py +++ b/test/test_get.py @@ -85,7 +85,7 @@ def test_download_lists(downloader): assert downloader.cache_dict["test_resource2"]["lifetime"] == 0 -def test_download_directory(): +def test_download_directory_and_caching(): # use temp dir, no cache file present downloader = Downloader(cache_dir=None) assert os.path.exists(downloader.cache_dir) @@ -108,7 +108,7 @@ def test_download_directory(): assert paths[0] is None -def test_download_zip(): +def test_download_zip_and_expiration(): # use temp dir, no cache file present downloader = Downloader(cache_dir=None) assert os.path.exists(downloader.cache_dir) @@ -122,7 +122,7 @@ def test_download_zip(): with open(downloader.cache_file, "r") as f: cache = json.load(f) assert ( - cache["test_resource"]["url"] + cache["test_resource"]["url"][0] == "https://github.com/biocypher/biocypher/raw/get-module/test/test_CSVs.zip" ) assert cache["test_resource"]["lifetime"] == 7 @@ -130,19 +130,20 @@ def test_download_zip(): for path in paths: assert os.path.exists(path) - # use files downloaded here and manipulate cache file to test expiration? - + # use files downloaded here and manipulate cache file to test expiration + downloader.cache_dict["test_resource"][ + "date_downloaded" + ] = datetime.now() - timedelta(days=4) -def test_download_expired(): - # set up test file to be expired, monkeypatch? - { - "test_resource": { - "url": "https://github.com/biocypher/biocypher/raw/get-module/test/test_CSVs.zip", - "date_downloaded": "2022-08-04 20:41:09.375915", - "lifetime": 7, - } - } + paths = downloader.download(resource) + # should not download again + assert paths[0] is None + # minus 8 days from date_downloaded + downloader.cache_dict["test_resource"][ + "date_downloaded" + ] = datetime.now() - timedelta(days=8) -def test_download_resource_list(): - pass + paths = downloader.download(resource) + # should download again + assert paths[0] is not None From 43442aaf5650be24916293a0db58d087792ed523 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 24 Aug 2023 20:12:46 +0200 Subject: [PATCH 091/343] extend CI/CD to mac and windows closes #195 --- .github/workflows/ci_cd.yaml | 64 ++++++++++++++++++++++++++++++++++-- 1 file changed, 61 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index 90f150c8..032b1616 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -7,7 +7,7 @@ on: - main jobs: - build: + build-linux: runs-on: ubuntu-latest steps: @@ -45,5 +45,63 @@ jobs: env: REPO: self BRANCH: coverage - FOLDER: docs/coverage - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + build-macos: + runs-on: macos-latest + + steps: + - name: Checkout Repository + uses: actions/checkout@v2 + + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: '3.9' + + - name: Install Poetry + run: | + curl -sSL https://install.python-poetry.org | python - + poetry --version + poetry config virtualenvs.create false + + - name: Install Dependencies + run: poetry install + + - name: Start Neo4j Docker + run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise + + - name: Start Postgres Docker + run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest + + - name: Run Tests + run: pytest --password=your_password_here + + build-windows: + runs-on: windows-latest + + steps: + - name: Checkout Repository + uses: actions/checkout@v2 + + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: '3.9' + + - name: Install Poetry + run: | + (Invoke-WebRequest -Uri https://raw.githubusercontent.com/python-poetry/poetry/master/install-poetry.py -UseBasicParsing).Content | python - + poetry --version + poetry config virtualenvs.create false + + - name: Install Dependencies + run: poetry install + + - name: Start Neo4j Docker + run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise + + - name: Start Postgres Docker + run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest + + - name: Run Tests + run: pytest --password=your_password_here From 81f4fa9943aaf2a00d7a4de0b3028cf0d704c650 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 24 Aug 2023 20:13:21 +0200 Subject: [PATCH 092/343] don't prepend resource name, this is taken care .. of by the subdirectory --- biocypher/_get.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/biocypher/_get.py b/biocypher/_get.py index 88aadda7..2b3d67c8 100644 --- a/biocypher/_get.py +++ b/biocypher/_get.py @@ -125,7 +125,7 @@ def _download_or_cache(self, resource: Resource, cache: bool = True): elif isinstance(resource.url_s, list): paths = [] for url in resource.url_s: - fname = resource.name + "_" + url[url.rfind("/") + 1 :] + fname = url[url.rfind("/") + 1 :] paths.append( self._retrieve( url=url, From 8d0f0fea22974589e8a678325560bbe166fed2ff Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 24 Aug 2023 20:14:10 +0200 Subject: [PATCH 093/343] specify hypothesis strategy and account for .. path differences between operating systems --- test/test_get.py | 46 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 41 insertions(+), 5 deletions(-) diff --git a/test/test_get.py b/test/test_get.py index 437774cd..52d1e9ff 100644 --- a/test/test_get.py +++ b/test/test_get.py @@ -14,7 +14,15 @@ def downloader(): return Downloader(cache_dir=None) -@given(st.builds(Resource)) +@given( + st.builds( + Resource, + name=st.text(), + url_s=st.text(), + lifetime=st.integers(), + is_dir=st.booleans(), + ) +) def test_resource(resource): assert isinstance(resource.name, str) assert isinstance(resource.url_s, str) or isinstance(resource.url_s, list) @@ -70,10 +78,38 @@ def test_download_lists(downloader): assert os.path.exists(paths[1]) assert os.path.exists(paths[2]) assert os.path.exists(paths[3]) - assert "test_config.yaml" in paths[0] - assert "test_schema_config_disconnected.yaml" in paths[1] - assert "file1.csv" in paths[2] - assert "file2.csv" in paths[3] + expected_paths = [ + os.path.realpath( + os.path.join( + downloader.cache_dir, "test_resource1", "test_config.yaml" + ) + ), + os.path.realpath( + os.path.join( + downloader.cache_dir, + "test_resource1", + "test_schema_config_disconnected.yaml", + ) + ), + os.path.realpath( + os.path.join( + downloader.cache_dir, + "test_resource2", + "test_CSVs.zip.unzip", + "file1.csv", + ) + ), + os.path.realpath( + os.path.join( + downloader.cache_dir, + "test_resource2", + "test_CSVs.zip.unzip", + "file2.csv", + ) + ), + ] + for path in paths: + assert os.path.realpath(path) in expected_paths assert isinstance( downloader.cache_dict["test_resource1"]["date_downloaded"], datetime ) From d0f4aa81bb06d56e8dbdefbf30b73056f3b9a3ed Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 24 Aug 2023 20:30:22 +0200 Subject: [PATCH 094/343] use marketplace poetry install action --- .github/workflows/ci_cd.yaml | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index 032b1616..57e66b2a 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -19,11 +19,11 @@ jobs: with: python-version: '3.9' - - name: Install Poetry - run: | - curl -sSL https://install.python-poetry.org | python - - poetry --version - poetry config virtualenvs.create false + - name: Install and configure Poetry + uses: snok/install-poetry@v1 + with: + version: 1.5.1 + virtualenvs-create: false - name: Install Dependencies run: poetry install @@ -45,6 +45,8 @@ jobs: env: REPO: self BRANCH: coverage + FOLDER: docs/coverage + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} build-macos: runs-on: macos-latest @@ -58,11 +60,11 @@ jobs: with: python-version: '3.9' - - name: Install Poetry - run: | - curl -sSL https://install.python-poetry.org | python - - poetry --version - poetry config virtualenvs.create false + - name: Install and configure Poetry + uses: snok/install-poetry@v1 + with: + version: 1.5.1 + virtualenvs-create: false - name: Install Dependencies run: poetry install @@ -88,11 +90,11 @@ jobs: with: python-version: '3.9' - - name: Install Poetry - run: | - (Invoke-WebRequest -Uri https://raw.githubusercontent.com/python-poetry/poetry/master/install-poetry.py -UseBasicParsing).Content | python - - poetry --version - poetry config virtualenvs.create false + - name: Install and configure Poetry + uses: snok/install-poetry@v1 + with: + version: 1.5.1 + virtualenvs-create: false - name: Install Dependencies run: poetry install From f44c04a09bfd9ebb9022b147a64d3fccfae4d93a Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 24 Aug 2023 20:43:35 +0200 Subject: [PATCH 095/343] add docker for macos runner --- .github/workflows/ci_cd.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index 57e66b2a..6fcd7afa 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -69,6 +69,9 @@ jobs: - name: Install Dependencies run: poetry install + - name: Install Docker + uses: douglascamata/setup-docker-macos-action@v1-alpha + - name: Start Neo4j Docker run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise From 50e30a12c5d286bdccb5c6252e91cf69fd367f5d Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 24 Aug 2023 20:46:18 +0200 Subject: [PATCH 096/343] set windows runner shell to bash --- .github/workflows/ci_cd.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index 6fcd7afa..5046b816 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -84,6 +84,10 @@ jobs: build-windows: runs-on: windows-latest + defaults: + run: + shell: bash + steps: - name: Checkout Repository uses: actions/checkout@v2 From 0819fc95d9e573f842dbfb9b26a601bc10de2afd Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 24 Aug 2023 20:54:13 +0200 Subject: [PATCH 097/343] deactivate windows build for now --- .github/workflows/ci_cd.yaml | 50 ++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index 5046b816..6933b4b6 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -81,36 +81,36 @@ jobs: - name: Run Tests run: pytest --password=your_password_here - build-windows: - runs-on: windows-latest + # build-windows: + # runs-on: windows-latest - defaults: - run: - shell: bash + # defaults: + # run: + # shell: bash - steps: - - name: Checkout Repository - uses: actions/checkout@v2 + # steps: + # - name: Checkout Repository + # uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v2 - with: - python-version: '3.9' + # - name: Set up Python + # uses: actions/setup-python@v2 + # with: + # python-version: '3.9' - - name: Install and configure Poetry - uses: snok/install-poetry@v1 - with: - version: 1.5.1 - virtualenvs-create: false + # - name: Install and configure Poetry + # uses: snok/install-poetry@v1 + # with: + # version: 1.5.1 + # virtualenvs-create: false - - name: Install Dependencies - run: poetry install + # - name: Install Dependencies + # run: poetry install - - name: Start Neo4j Docker - run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise + # - name: Start Neo4j Docker + # run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise - - name: Start Postgres Docker - run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest + # - name: Start Postgres Docker + # run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest - - name: Run Tests - run: pytest --password=your_password_here + # - name: Run Tests + # run: pytest --password=your_password_here From 569384925b1e3dd9d5a1b03bb6993748bd37d3b3 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 24 Aug 2023 21:24:40 +0200 Subject: [PATCH 098/343] deactivate macos build as well; docker install .. does not complete after 10 min on the runner --- .github/workflows/ci_cd.yaml | 48 ++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index 6933b4b6..58345884 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -48,38 +48,38 @@ jobs: FOLDER: docs/coverage GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - build-macos: - runs-on: macos-latest + # build-macos: + # runs-on: macos-latest - steps: - - name: Checkout Repository - uses: actions/checkout@v2 + # steps: + # - name: Checkout Repository + # uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v2 - with: - python-version: '3.9' + # - name: Set up Python + # uses: actions/setup-python@v2 + # with: + # python-version: '3.9' - - name: Install and configure Poetry - uses: snok/install-poetry@v1 - with: - version: 1.5.1 - virtualenvs-create: false + # - name: Install and configure Poetry + # uses: snok/install-poetry@v1 + # with: + # version: 1.5.1 + # virtualenvs-create: false - - name: Install Dependencies - run: poetry install + # - name: Install Dependencies + # run: poetry install - - name: Install Docker - uses: douglascamata/setup-docker-macos-action@v1-alpha + # - name: Install Docker + # uses: douglascamata/setup-docker-macos-action@v1-alpha - - name: Start Neo4j Docker - run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise + # - name: Start Neo4j Docker + # run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise - - name: Start Postgres Docker - run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest + # - name: Start Postgres Docker + # run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest - - name: Run Tests - run: pytest --password=your_password_here + # - name: Run Tests + # run: pytest --password=your_password_here # build-windows: # runs-on: windows-latest From e254182c7c65723bdda13f45a8a7383a6a8ce82d Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Fri, 25 Aug 2023 00:13:04 +0200 Subject: [PATCH 099/343] correct driver API doc --- docs/api.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/api.rst b/docs/api.rst index a763794a..62c4375d 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -81,8 +81,8 @@ example: # given lists of nodes and edges bc = BioCypher() - bc.write_nodes(node_set_1) - bc.write_edges(edge_set_1) + bc.merge_nodes(node_set_1) + bc.merge_edges(edge_set_1) bc.merge_nodes(node_set_2) bc.merge_edges(edge_set_2) From af1d7a4b48b31f05e7841acad5ba975f6b22ec88 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Fri, 25 Aug 2023 00:17:37 +0200 Subject: [PATCH 100/343] add pandas API reference --- docs/api.rst | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/docs/api.rst b/docs/api.rst index 62c4375d..9741baf2 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -65,6 +65,35 @@ can be found below. _PostgreSQLBatchWriter _ArangoDBBatchWriter +.. api_pandas: + +In-memory Pandas knowledge graph +================================ + +BioCypher provides a wrapper around the :class:`pandas.DataFrame` class to +facilitate the creation of a knowledge graph in memory. This is useful for +testing, small datasets, and for workflows that should remain purely in Python. +Example usage: + +.. code-block:: python + + from biocypher import BioCypher + bc = BioCypher() + # given lists of nodes and edges + bc.add_nodes(node_list) + bc.add_edges(edge_list) + # show list of dataframes (one per node/edge type) + dfs = bc.to_df() + +Details about the :mod:`biocypher._pandas` module responsible for these methods +can be found below. + +.. module:: biocypher._pandas +.. autosummary:: + :toctree: modules + + Pandas + .. _api_connect: Database creation and manipulation by Driver @@ -79,8 +108,9 @@ example: .. code-block:: python - # given lists of nodes and edges + from biocypher import BioCypher bc = BioCypher() + # given lists of nodes and edges bc.merge_nodes(node_set_1) bc.merge_edges(edge_set_1) bc.merge_nodes(node_set_2) From 7126eca333a55e37c315bab000e6444b47f81cb8 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Fri, 25 Aug 2023 00:18:03 +0200 Subject: [PATCH 101/343] =?UTF-8?q?Bump=20version:=200.5.20=20=E2=86=92=20?= =?UTF-8?q?0.5.21?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- biocypher/_metadata.py | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index c4987da1..ea1d7c1a 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.5.20 +current_version = 0.5.21 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+) diff --git a/biocypher/_metadata.py b/biocypher/_metadata.py index 31b28ec1..35ebd334 100644 --- a/biocypher/_metadata.py +++ b/biocypher/_metadata.py @@ -19,7 +19,7 @@ import toml -_VERSION = "0.5.20" +_VERSION = "0.5.21" def get_metadata(): diff --git a/pyproject.toml b/pyproject.toml index 92334294..5dc7b727 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "biocypher" -version = "0.5.20" +version = "0.5.21" description = "A unifying framework for biomedical research knowledge graphs" authors = [ "Sebastian Lobentanzer ", From 0509f764660c80afc57e81b76bb849b9d7e4045c Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Fri, 25 Aug 2023 00:19:17 +0200 Subject: [PATCH 102/343] test file paths to `main` --- test/test_get.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/test_get.py b/test/test_get.py index 52d1e9ff..7d3b90d6 100644 --- a/test/test_get.py +++ b/test/test_get.py @@ -70,7 +70,7 @@ def test_download_lists(downloader): ) resource2 = Resource( "test_resource2", - "https://github.com/biocypher/biocypher/raw/get-module/test/test_CSVs.zip", + "https://github.com/biocypher/biocypher/raw/main/test/test_CSVs.zip", ) paths = downloader.download(resource1, resource2) assert len(paths) == 4 # 2 files from resource1, 2 files from resource2 zip @@ -151,7 +151,7 @@ def test_download_zip_and_expiration(): assert os.path.exists(downloader.cache_file) resource = Resource( "test_resource", - "https://github.com/biocypher/biocypher/raw/get-module/test/test_CSVs.zip", + "https://github.com/biocypher/biocypher/raw/main/test/test_CSVs.zip", lifetime=7, ) paths = downloader.download(resource) @@ -159,7 +159,7 @@ def test_download_zip_and_expiration(): cache = json.load(f) assert ( cache["test_resource"]["url"][0] - == "https://github.com/biocypher/biocypher/raw/get-module/test/test_CSVs.zip" + == "https://github.com/biocypher/biocypher/raw/main/test/test_CSVs.zip" ) assert cache["test_resource"]["lifetime"] == 7 assert cache["test_resource"]["date_downloaded"] From bcc88ce6b13f4e2e471ab55ffd2ea1a36c39a05e Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Fri, 25 Aug 2023 00:26:08 +0200 Subject: [PATCH 103/343] more pandas docs --- biocypher/_core.py | 32 +++++++++++++++++++++++++++++--- docs/api.rst | 4 ++-- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/biocypher/_core.py b/biocypher/_core.py index 91d43b74..6a928f3c 100644 --- a/biocypher/_core.py +++ b/biocypher/_core.py @@ -308,12 +308,20 @@ def to_df(self) -> list[pd.DataFrame]: return self._pd.dfs - def add(self, entities): + def add(self, entities) -> None: """ Function to add entities to the in-memory database. Accepts an iterable of tuples (if given, translates to ``BioCypherNode`` or ``BioCypherEdge`` objects) or an iterable of ``BioCypherNode`` or ``BioCypherEdge`` objects. + + Args: + entities (iterable): An iterable of entities to add to the database. + Can be 3-tuples (nodes) or 5-tuples (edges); also accepts + 4-tuples for edges (deprecated). + + Returns: + None """ if not self._pd: self._pd = Pandas( @@ -336,10 +344,28 @@ def add(self, entities): self._pd.add_tables(tentities) - def add_nodes(self, nodes): + def add_nodes(self, nodes) -> None: + """ + Wrapper for ``add()`` to add nodes to the in-memory database. + + Args: + nodes (iterable): An iterable of node tuples to add to the database. + + Returns: + None + """ self.add(nodes) - def add_edges(self, edges): + def add_edges(self, edges) -> None: + """ + Wrapper for ``add()`` to add edges to the in-memory database. + + Args: + edges (iterable): An iterable of edge tuples to add to the database. + + Returns: + None + """ self.add(edges) def merge_nodes(self, nodes) -> bool: diff --git a/docs/api.rst b/docs/api.rst index 9741baf2..3740c386 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -80,8 +80,8 @@ Example usage: from biocypher import BioCypher bc = BioCypher() # given lists of nodes and edges - bc.add_nodes(node_list) - bc.add_edges(edge_list) + bc.add(node_list) + bc.add(edge_list) # show list of dataframes (one per node/edge type) dfs = bc.to_df() From 3811a4bc2d302f83364d3ce8a55b53b7e9427784 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Fri, 25 Aug 2023 00:59:11 +0200 Subject: [PATCH 104/343] make download available from core, cache .. directory setting, get module documentation --- biocypher/__init__.py | 2 ++ biocypher/_config/biocypher_config.yaml | 4 +++ biocypher/_core.py | 12 +++++-- biocypher/_get.py | 9 +++-- docs/api.rst | 46 +++++++++++++++++++++++++ 5 files changed, 68 insertions(+), 5 deletions(-) diff --git a/biocypher/__init__.py b/biocypher/__init__.py index 6222ea76..3f65e664 100644 --- a/biocypher/__init__.py +++ b/biocypher/__init__.py @@ -21,8 +21,10 @@ "log", "Driver", "BioCypher", + "Resource", ] +from ._get import Resource from ._core import BioCypher from ._config import config, module_data from ._logger import log, logger, logfile diff --git a/biocypher/_config/biocypher_config.yaml b/biocypher/_config/biocypher_config.yaml index 81d737ee..b371060c 100644 --- a/biocypher/_config/biocypher_config.yaml +++ b/biocypher/_config/biocypher_config.yaml @@ -43,6 +43,10 @@ biocypher: # output_directory: biocypher-out + ## Set to change the cache directory + + # cache_directory: .cache + ## Optional tail ontologies # tail_ontologies: diff --git a/biocypher/_core.py b/biocypher/_core.py index 6a928f3c..bed9e778 100644 --- a/biocypher/_core.py +++ b/biocypher/_core.py @@ -91,6 +91,7 @@ def __init__( head_ontology: dict = None, tail_ontologies: dict = None, output_directory: str = None, + cache_directory: str = None, # legacy params db_name: str = None, ): @@ -144,6 +145,9 @@ def __init__( self._output_directory = output_directory or self.base_config.get( "output_directory" ) + self._cache_directory = cache_directory or self.base_config.get( + "cache_directory" + ) self._tail_ontologies = tail_ontologies or self.base_config.get( "tail_ontologies" ) @@ -158,6 +162,7 @@ def __init__( self._ontology_mapping = None self._deduplicator = None self._translator = None + self._downloader = None self._ontology = None self._writer = None self._pd = None @@ -418,21 +423,22 @@ def merge_edges(self, edges) -> bool: # DOWNLOAD AND CACHE MANAGEMENT METHODS ### - def _get_downloader(self): + def _get_downloader(self, cache_dir: Optional[str] = None): """ Create downloader if not exists. """ if not self._downloader: - self._downloader = Downloader() + self._downloader = Downloader(self._cache_directory) - def download(self, force: bool = False) -> None: + def download(self, *resources) -> None: """ Use the :class:`Downloader` class to download or load from cache the resources given by the adapter. """ self._get_downloader() + return self._downloader.download(*resources) # OVERVIEW AND CONVENIENCE METHODS ### diff --git a/biocypher/_get.py b/biocypher/_get.py index 2b3d67c8..de05a6b2 100644 --- a/biocypher/_get.py +++ b/biocypher/_get.py @@ -14,6 +14,8 @@ from __future__ import annotations +from typing import Optional + from ._logger import logger logger.debug(f"Loading module {__name__}.") @@ -57,7 +59,7 @@ def __init__( class Downloader: - def __init__(self, cache_dir: str): + def __init__(self, cache_dir: Optional[str] = None) -> None: """ A downloader is a collection of resources that can be downloaded and cached locally. It manages the lifetime of downloaded resources by @@ -66,6 +68,9 @@ def __init__(self, cache_dir: str): Args: cache_dir (str): The directory where the resources are cached. If not given, a temporary directory is created. + + Returns: + Downloader: The downloader object. """ self.cache_dir = cache_dir or TemporaryDirectory().name self.cache_file = os.path.join(self.cache_dir, "cache.json") @@ -115,7 +120,7 @@ def _download_or_cache(self, resource: Resource, cache: bool = True): # download resource if expired or not cache: - logger.info(f"Downloading resource {resource.name}.") + logger.info(f"Asking for download of {resource.name}.") if resource.is_dir: files = self._get_files(resource) diff --git a/docs/api.rst b/docs/api.rst index 3740c386..2474f681 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -127,6 +127,52 @@ can be found below. _Neo4jDriver +.. api_get: + +Download and cache functionality +================================ + +BioCypher provides a download and cache functionality for resources. resources +are defined via the ``Resource`` class, which have a name, a (set of) URL(s), +and a lifetime (in days, set to 0 for infinite). The ``Downloader`` can deal +with single and lists of files, compressed files, and directories. It uses +[Pooch](https://www.fatiando.org/pooch/latest/) under the hood to handle the +downloads. Example usage: + +.. code-block:: python + + from biocypher import BioCypher, Resource + bc = BioCypher() + + resource1 = Resource( + name="resource1", + urls=["https://example.com/resource1.txt"], + lifetime=1 + ) + resource2 = Resource( + name="resource2", + urls=["https://example.com/resource2.zip"], + lifetime=7 + ) + paths = bc.download(resource_list) + +The files will be stored in the cache directory, in subfolders according to the +names of the resources, and additionally determined by Pooch (e.g. extraction). +All paths of downloaded files are returned by the ``download`` method. The +``Downloader`` class can also be used directly, without the BioCypher instance. +You can set the cache directory in the configuration file; if not set, it will +use the ``TemporaryDirectory.name()`` method from the ``tempfile`` module. More +details about the ``Resource`` and ``Downloader`` classes can be found below. + +.. module:: biocypher._get +.. autosummary:: + :toctree: modules + + Resource + Downloader + + + Ontology ingestion, parsing, and manipulation ============================================= .. module:: biocypher._ontology From bb4a36e48a9eca0829bc97b6a52a6ef15c2d7d15 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Fri, 25 Aug 2023 01:01:57 +0200 Subject: [PATCH 105/343] typo --- docs/api.rst | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/api.rst b/docs/api.rst index 2474f681..cf106f81 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -132,7 +132,7 @@ can be found below. Download and cache functionality ================================ -BioCypher provides a download and cache functionality for resources. resources +BioCypher provides a download and cache functionality for resources. Resources are defined via the ``Resource`` class, which have a name, a (set of) URL(s), and a lifetime (in days, set to 0 for infinite). The ``Downloader`` can deal with single and lists of files, compressed files, and directories. It uses @@ -171,8 +171,6 @@ details about the ``Resource`` and ``Downloader`` classes can be found below. Resource Downloader - - Ontology ingestion, parsing, and manipulation ============================================= .. module:: biocypher._ontology From 4409c1b162b198bfdfc317a9a08d1ff45833747f Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Fri, 25 Aug 2023 01:02:43 +0200 Subject: [PATCH 106/343] rst link formatting --- docs/api.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api.rst b/docs/api.rst index cf106f81..795c285f 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -136,7 +136,7 @@ BioCypher provides a download and cache functionality for resources. Resources are defined via the ``Resource`` class, which have a name, a (set of) URL(s), and a lifetime (in days, set to 0 for infinite). The ``Downloader`` can deal with single and lists of files, compressed files, and directories. It uses -[Pooch](https://www.fatiando.org/pooch/latest/) under the hood to handle the +`Pooch `_ under the hood to handle the downloads. Example usage: .. code-block:: python From 507793ab79fdf60881b0ce5c2a70f7f424c6ddd5 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Fri, 25 Aug 2023 01:07:02 +0200 Subject: [PATCH 107/343] more get docs --- biocypher/_get.py | 2 ++ docs/api.rst | 22 ++++++++++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/biocypher/_get.py b/biocypher/_get.py index de05a6b2..29c1dc10 100644 --- a/biocypher/_get.py +++ b/biocypher/_get.py @@ -51,6 +51,8 @@ def __init__( lifetime (int): The lifetime of the resource in days. If 0, the resource is considered to be permanent. + + is_dir (bool): Whether the resource is a directory or not. """ self.name = name self.url_s = url_s diff --git a/docs/api.rst b/docs/api.rst index 795c285f..aa3260f0 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -135,8 +135,9 @@ Download and cache functionality BioCypher provides a download and cache functionality for resources. Resources are defined via the ``Resource`` class, which have a name, a (set of) URL(s), and a lifetime (in days, set to 0 for infinite). The ``Downloader`` can deal -with single and lists of files, compressed files, and directories. It uses -`Pooch `_ under the hood to handle the +with single and lists of files, compressed files, and directories (which needs +to be indicated using the ``is_dir`` parameter of the resource). It uses `Pooch +`_ under the hood to handle the downloads. Example usage: .. code-block:: python @@ -145,15 +146,24 @@ downloads. Example usage: bc = BioCypher() resource1 = Resource( - name="resource1", - urls=["https://example.com/resource1.txt"], + name="file_list_resource", + url_s=[ + "https://example.com/resource1.txt" + "https://example.com/resource2.txt" + ], lifetime=1 ) resource2 = Resource( - name="resource2", - urls=["https://example.com/resource2.zip"], + name="zipped_resource", + url_s="https://example.com/resource3.zip", lifetime=7 ) + resource3 = Resource( + name="directory_resource", + url_s="https://example.com/resource4/", + lifetime=7, + is_dir=True, + ) paths = bc.download(resource_list) The files will be stored in the cache directory, in subfolders according to the From a0b07de0f755037186bf876470dd66a459504fa9 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Fri, 25 Aug 2023 01:07:59 +0200 Subject: [PATCH 108/343] =?UTF-8?q?Bump=20version:=200.5.21=20=E2=86=92=20?= =?UTF-8?q?0.5.22?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- biocypher/_metadata.py | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index ea1d7c1a..10a6a11a 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.5.21 +current_version = 0.5.22 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+) diff --git a/biocypher/_metadata.py b/biocypher/_metadata.py index 35ebd334..2f918c33 100644 --- a/biocypher/_metadata.py +++ b/biocypher/_metadata.py @@ -19,7 +19,7 @@ import toml -_VERSION = "0.5.21" +_VERSION = "0.5.22" def get_metadata(): diff --git a/pyproject.toml b/pyproject.toml index 5dc7b727..b685a5ca 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "biocypher" -version = "0.5.21" +version = "0.5.22" description = "A unifying framework for biomedical research knowledge graphs" authors = [ "Sebastian Lobentanzer ", From 5df22fec871e55e1687ffa8f45760d2d310ffeff Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Tue, 29 Aug 2023 18:38:32 +0200 Subject: [PATCH 109/343] pin treelib version due to bug in `1.7` --- poetry.lock | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/poetry.lock b/poetry.lock index 3b984532..5b4b56a8 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1773,7 +1773,7 @@ testing = ["big-O", "flake8 (<5)", "jaraco.functools", "jaraco.itertools", "more [metadata] lock-version = "1.1" python-versions = "^3.9" -content-hash = "080913c088924c3ac7bd9bc8165a79228f26bd2804ab3a3e5a4f03275a885fdd" +content-hash = "779e998b2d52f944078197c035c3f9081df88b0c1c77d7b322ee95d622edb54c" [metadata.files] alabaster = [ diff --git a/pyproject.toml b/pyproject.toml index b685a5ca..533137c7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,7 @@ python = "^3.9" PyYAML = ">=5.0" more_itertools = "*" appdirs = "*" -treelib = "^1.6.1" +treelib = "1.6.4" rdflib = "^6.2.0" networkx = "^3.0" stringcase = "^1.2.0" From 774aa42202d3555895dafbfb9d33cec1285eba15 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Tue, 29 Aug 2023 18:38:56 +0200 Subject: [PATCH 110/343] =?UTF-8?q?Bump=20version:=200.5.22=20=E2=86=92=20?= =?UTF-8?q?0.5.23?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- biocypher/_metadata.py | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 10a6a11a..c2ec8277 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.5.22 +current_version = 0.5.23 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+) diff --git a/biocypher/_metadata.py b/biocypher/_metadata.py index 2f918c33..9fdc46bc 100644 --- a/biocypher/_metadata.py +++ b/biocypher/_metadata.py @@ -19,7 +19,7 @@ import toml -_VERSION = "0.5.22" +_VERSION = "0.5.23" def get_metadata(): diff --git a/pyproject.toml b/pyproject.toml index 533137c7..b5bce8c5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "biocypher" -version = "0.5.22" +version = "0.5.23" description = "A unifying framework for biomedical research knowledge graphs" authors = [ "Sebastian Lobentanzer ", From 5f9bb6324f47c61c7fe11643857f1811d9d769de Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Tue, 12 Sep 2023 09:43:52 +0200 Subject: [PATCH 111/343] fix Issue #250: format badges as table --- README.md | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 78c66c0e..976404f9 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,13 @@ # BioCypher -[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) -![Python](https://img.shields.io/badge/python-3.9-blue.svg) -![Python](https://img.shields.io/badge/python-3.10-blue.svg) -[![PyPI version](https://badge.fury.io/py/biocypher.svg)](https://badge.fury.io/py/biocypher) -[![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) -[![CI](https://github.com/biocypher/biocypher/actions/workflows/ci_cd.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/ci_cd.yaml) -![Coverage](https://raw.githubusercontent.com/biocypher/biocypher/coverage/coverage.svg) -[![Docs build](https://github.com/biocypher/biocypher/actions/workflows/sphinx_autodoc.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/sphinx_autodoc.yaml) -[![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) -[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit) -[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) -[![Powered by the Bioregistry](https://img.shields.io/static/v1?label=Powered%20by&message=Bioregistry&color=BA274A&style=flat&logo=image/png;base64,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)](https://github.com/biopragmatics/bioregistry) + +| __License__ | [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) | +| :--- | :--- | +| __Python__ | ![Python](https://img.shields.io/badge/python-3.9-blue.svg) ![Python](https://img.shields.io/badge/python-3.10-blue.svg) | +| __Package__ | [![PyPI version](https://badge.fury.io/py/biocypher.svg)](https://badge.fury.io/py/biocypher) [![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) [![Powered by the Bioregistry](https://img.shields.io/static/v1?label=Powered%20by&message=Bioregistry&color=BA274A&style=flat&logo=image/png;base64,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)](https://github.com/biopragmatics/bioregistry) | +| __Build status__ | [![CI](https://github.com/biocypher/biocypher/actions/workflows/ci_cd.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/ci_cd.yaml) [![Docs build](https://github.com/biocypher/biocypher/actions/workflows/sphinx_autodoc.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/sphinx_autodoc.yaml) | +| __Test coverage__ | ![Coverage](https://raw.githubusercontent.com/biocypher/biocypher/coverage/coverage.svg) | +| __Development__ | [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit) | +| __Contributions__ | [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) | ## ❓ Description Knowledge graphs (KGs) are an [approach to knowledge From d70dc117e56d3a5302c5eb54edfc39b5529fbf0a Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Tue, 12 Sep 2023 10:55:39 +0200 Subject: [PATCH 112/343] fix issue #249: clarify needed docstring format in DEVELOPER.md and some general improvements --- DEVELOPER.md | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/DEVELOPER.md b/DEVELOPER.md index eb30fd0e..964f67a9 100644 --- a/DEVELOPER.md +++ b/DEVELOPER.md @@ -4,21 +4,37 @@ Thank you for considering to contribute to the project! This guide will help you to get started with the development of the project. If you have any questions, please feel free to ask them in the issue tracker. -## Formal Requirements - -The project uses documentation format [Napoleon]( -https://sphinxcontrib-napoleon.readthedocs.io/en/latest/example_google.html -) with a [Sphinx](https://www.sphinx-doc.org/en/master/) autodoc GitHub -Actions workflow. If you add new code, please make sure that it is documented -accordingly and in a consistent manner with the existing code base. To check, -you can run the documentation build locally by running `make html` in the `docs` -directory. +## Dependency management We use [Poetry](https://python-poetry.org) for dependency management. Please make sure that you have set up the environment correctly before starting development. If you want to fix dependency issues, please do so in the Poetry framework. If Poetry does not work for you for some reason, please let us know. +Helpful commands: +- Install dependencies from lock file: `poetry install` +- Open shell with this environment: `poetry shell` +- Add new dependencies: `poetry add ` +- Update lock file (after adding new dependencies in pyproject.toml): `poetry lock` +- Update dependencies to newest version: `poetry update` + +## Code quality and formal requirements + +For ensuring code quality following tools are used: +- [isort](https://isort.readthedocs.io/en/latest/) for sorting imports +- [black](https://black.readthedocs.io/en/stable/) for automated code formatting +- [pre-commit-hooks](https://github.com/pre-commit/pre-commit-hooks) for ensuring some general rules +- [pep585-upgrade](https://github.com/snok/pep585-upgrade) for automatically upgrading type hints to the new native types defined in PEP 585 +- [pygrep-hooks](https://github.com/pre-commit/pygrep-hooks) for ensuring some general naming rules + +Pre-commit hooks are used to automatically run these tools before each commit. They are defined in [.pre-commit-config.yaml](./.pre-commit-config.yaml). To install the hooks run `poetry run pre-commit install`. The hooks are then executed before each commit. +For running the hook for all project files (not only the changed ones) run `poetry run pre-commit run --all-files`. + +The project uses [Sphinx](https://www.sphinx-doc.org/en/master/) autodoc GitHub +Actions workflow to generate the documentation. If you add new code, please make sure that it is documented +accordingly and in a consistent manner with the existing code base. +Especially the docstrings should follow the [Google style guide](https://sphinxcontrib-napoleon.readthedocs.io/en/latest/example_google.html). To check, you can run the documentation build locally by running `make html` in the `docs` directory. + ## Testing The project uses [pytest](https://docs.pytest.org/en/stable/) for testing. To From 737aca9fc1e4a76cb7c999d964f8d5e5e484c6f0 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Tue, 12 Sep 2023 10:57:07 +0200 Subject: [PATCH 113/343] fix issue #249: md formatting --- DEVELOPER.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPER.md b/DEVELOPER.md index 964f67a9..5fcaac91 100644 --- a/DEVELOPER.md +++ b/DEVELOPER.md @@ -32,7 +32,7 @@ For running the hook for all project files (not only the changed ones) run `poet The project uses [Sphinx](https://www.sphinx-doc.org/en/master/) autodoc GitHub Actions workflow to generate the documentation. If you add new code, please make sure that it is documented -accordingly and in a consistent manner with the existing code base. +accordingly and in a consistent manner with the existing code base. Especially the docstrings should follow the [Google style guide](https://sphinxcontrib-napoleon.readthedocs.io/en/latest/example_google.html). To check, you can run the documentation build locally by running `make html` in the `docs` directory. ## Testing From 35125354dc63e96de2018bd5adc0e6ff8790c003 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Tue, 12 Sep 2023 11:33:25 +0200 Subject: [PATCH 114/343] fix issue #248: include infos about dependency groups in DEVELOPER.md --- DEVELOPER.md | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/DEVELOPER.md b/DEVELOPER.md index 5fcaac91..e112b07e 100644 --- a/DEVELOPER.md +++ b/DEVELOPER.md @@ -7,16 +7,25 @@ please feel free to ask them in the issue tracker. ## Dependency management We use [Poetry](https://python-poetry.org) for dependency management. Please -make sure that you have set up the environment correctly before starting -development. If you want to fix dependency issues, please do so in the Poetry +make sure that you have installed Poetry and set up the environment correctly +before starting development. + +### Setup the environment + +- Install dependencies from the lock file: `poetry install` +- Use the environment: You can either run commands directly with `poetry run ` or open a shell with `poetry shell` and then run commands directly. + +### Updating the environment + +If you want to fix dependency issues, please do so in the Poetry framework. If Poetry does not work for you for some reason, please let us know. -Helpful commands: -- Install dependencies from lock file: `poetry install` -- Open shell with this environment: `poetry shell` -- Add new dependencies: `poetry add ` +The Poetry dependencies are organized in groups. +There are groups with dependencies needed for running BioCypher (`[tool.poetry.dependencies` with the group name `main`) and a group with dependencies needed for development (`[tool.poetry.group.dev.dependencies` with the group name `dev`). + +For adding new dependencies: +- Add new dependencies: `poetry add -- group ` - Update lock file (after adding new dependencies in pyproject.toml): `poetry lock` -- Update dependencies to newest version: `poetry update` ## Code quality and formal requirements From b3df89e2cb42185245d52df101ea2e5b0a032f7a Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Tue, 12 Sep 2023 11:52:59 +0200 Subject: [PATCH 115/343] fix issue #246: add CITATION.cff --- CITATION.cff | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 CITATION.cff diff --git a/CITATION.cff b/CITATION.cff new file mode 100644 index 00000000..c9d7978a --- /dev/null +++ b/CITATION.cff @@ -0,0 +1,29 @@ +cff-version: 1.2.0 +title: Democratizing knowledge representation with BioCypher +message: >- + If you use this software, please cite it using the + metadata from this file. +type: software +authors: + - given-names: Sebastian + family-names: Lobentanzer + email: sebastian.lobentanzer@uni-heidelberg.de + affiliation: >- + Heidelberg University Hospital: Institute for + Computational Biomedicine + orcid: 'https://orcid.org/0000-0003-3399-6695' + - given-names: Julio + family-names: Saez-Rodriguez + email: saez@uni-heidelberg.de + affiliation: >- + Heidelberg University Hospital: Institute for + Computational Biomedicine + orcid: 'https://orcid.org/0000-0002-8552-8976' +identifiers: + - type: doi + value: 10.1038/s41587-023-01848-y +repository-code: 'https://github.com/biocypher/biocypher' +url: 'https://biocypher.org/' +repository: 'https://github.com/biocypher' +repository-artifact: 'https://pypi.org/project/biocypher/' +license: MIT From 1318a7c2ec4633ab22fcb2cea87f9583ee59c1e9 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Tue, 12 Sep 2023 12:30:53 +0200 Subject: [PATCH 116/343] fix issue #258: update checkout and python-setup actions in CI pipeline --- .github/workflows/ci_cd.yaml | 12 ++++++------ .github/workflows/sphinx_autodoc.yaml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index 58345884..d10c4aa5 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -12,10 +12,10 @@ jobs: steps: - name: Checkout Repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: '3.9' @@ -53,10 +53,10 @@ jobs: # steps: # - name: Checkout Repository - # uses: actions/checkout@v2 + # uses: actions/checkout@v4 # - name: Set up Python - # uses: actions/setup-python@v2 + # uses: actions/setup-python@v4 # with: # python-version: '3.9' @@ -90,10 +90,10 @@ jobs: # steps: # - name: Checkout Repository - # uses: actions/checkout@v2 + # uses: actions/checkout@v4 # - name: Set up Python - # uses: actions/setup-python@v2 + # uses: actions/setup-python@v4 # with: # python-version: '3.9' diff --git a/.github/workflows/sphinx_autodoc.yaml b/.github/workflows/sphinx_autodoc.yaml index e00b1001..e8217a3d 100644 --- a/.github/workflows/sphinx_autodoc.yaml +++ b/.github/workflows/sphinx_autodoc.yaml @@ -11,7 +11,7 @@ jobs: - name: Check out main uses: actions/checkout@main - name: Setup Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: 3.10.5 - name: Load cached Poetry installation From 68f73a0afd0f33f257765da551d45213c42ed105 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Tue, 12 Sep 2023 17:33:12 +0200 Subject: [PATCH 117/343] start to fix issue #252: first code snippet in docs executed to identify outdated function calls --- docs/tutorial.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/tutorial.md b/docs/tutorial.md index befc2461..7c855912 100644 --- a/docs/tutorial.md +++ b/docs/tutorial.md @@ -88,8 +88,8 @@ simulated by calling the `Protein` class of our data generator 10 times. ```{code-block} python -from data_generator import Protein -proteins = [Protein() for _ in range(10)] +>>> from tutorial.data_generator import Protein +>>> proteins = [Protein() for _ in range(10)] ``` From 2038b91368155f708717049410f896f597b0f3d4 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Wed, 13 Sep 2023 12:34:25 +0200 Subject: [PATCH 118/343] fix issue #252: execute code snippets in documentation to identify outdated function calls --- DEVELOPER.md | 2 ++ docs/api.rst | 57 ++++++++++++++++++++++++++++++++++++++- docs/conf.py | 1 + docs/neo4j.md | 16 +++++++++++ docs/quickstart.md | 19 +++++++++++++ docs/tutorial-ontology.md | 18 ++++++++++++- docs/tutorial.md | 44 +++++++++++++++++------------- 7 files changed, 137 insertions(+), 20 deletions(-) diff --git a/DEVELOPER.md b/DEVELOPER.md index e112b07e..5749751d 100644 --- a/DEVELOPER.md +++ b/DEVELOPER.md @@ -44,6 +44,8 @@ Actions workflow to generate the documentation. If you add new code, please make accordingly and in a consistent manner with the existing code base. Especially the docstrings should follow the [Google style guide](https://sphinxcontrib-napoleon.readthedocs.io/en/latest/example_google.html). To check, you can run the documentation build locally by running `make html` in the `docs` directory. +When adding new code snippets to the documentation make sure, that they are automatically tested with [doctest](https://sphinx-tutorial.readthedocs.io/step-3/#testing-your-code) to ensure, that no ouutdated code snippets are part of the documentation. + ## Testing The project uses [pytest](https://docs.pytest.org/en/stable/) for testing. To diff --git a/docs/api.rst b/docs/api.rst index aa3260f0..11cb7a3c 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -11,7 +11,7 @@ The main BioCypher interface Create a BioCypher instance by running: -.. code-block:: python +.. testcode:: python from biocypher import BioCypher bc = BioCypher() @@ -36,6 +36,29 @@ methods, which accept collections of nodes and edges either as :ref:`tuples ` or as :class:`BioCypherNode` and :class:`BioCypherEdge` :ref:`objects `. For example: +.. testsetup:: python + + from biocypher import BioCypher + bc = BioCypher() + + def check_if_function_exists(module_name, function_name): + if hasattr(module_name, function_name): + print("Functions exists") + else: + print("Function does not exist") + +.. testcode:: python + :hide: + + check_if_function_exists(bc, 'write_nodes') + check_if_function_exists(bc, 'write_edges') + +.. testoutput:: python + :hide: + + Functions exists + Functions exists + .. code-block:: python # given lists of nodes and edges @@ -75,6 +98,18 @@ facilitate the creation of a knowledge graph in memory. This is useful for testing, small datasets, and for workflows that should remain purely in Python. Example usage: +.. testcode:: python + :hide: + + check_if_function_exists(bc, 'add') + check_if_function_exists(bc, 'to_df') + +.. testoutput:: python + :hide: + + Functions exists + Functions exists + .. code-block:: python from biocypher import BioCypher @@ -106,6 +141,16 @@ from scratch as in the :ref:`file-based workflow `. This includes merging (creation of entities only if they don't exist) and deletion. For example: +.. testcode:: python + :hide: + + check_if_function_exists(bc, 'merge_nodes') + +.. testoutput:: python + :hide: + + Functions exists + .. code-block:: python from biocypher import BioCypher @@ -140,6 +185,16 @@ to be indicated using the ``is_dir`` parameter of the resource). It uses `Pooch `_ under the hood to handle the downloads. Example usage: +.. testcode:: python + :hide: + + check_if_function_exists(bc, 'download') + +.. testoutput:: python + :hide: + + Functions exists + .. code-block:: python from biocypher import BioCypher, Resource diff --git a/docs/conf.py b/docs/conf.py index c9d2518d..baa039e8 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -49,6 +49,7 @@ "sphinx.ext.todo", # not for output but to remove warnings "sphinx.ext.autosummary", "sphinxext.opengraph", + "sphinx.ext.doctest", "myst_parser", # markdown support "sphinx_rtd_theme", "sphinx_design", diff --git a/docs/neo4j.md b/docs/neo4j.md index ede96f03..a90e5647 100644 --- a/docs/neo4j.md +++ b/docs/neo4j.md @@ -72,6 +72,22 @@ using the `neo4j-admin` command line tool. This is not necessary if the graph is created in online mode. For convenience, BioCypher provides the command line call required to import the data into Neo4j: +```{testcode} python +:hide: +from biocypher import BioCypher +bc = BioCypher() + +def check_if_function_exists(module_name, function_name): + if hasattr(module_name, function_name): + print("Functions exists") + else: + print("Function does not exist") +check_if_function_exists(bc, "write_import_call") +``` +```{testoutput} python +:hide: +Functions exists +``` ```{code-block} python bc.write_import_call() ``` diff --git a/docs/quickstart.md b/docs/quickstart.md index 53c897ac..fdf136f2 100644 --- a/docs/quickstart.md +++ b/docs/quickstart.md @@ -218,6 +218,25 @@ For on-line writing to a database or a Pandas dataframe, we use the functions with `add` instead of `write`. For instance, to add nodes and edges to a Pandas dataframe, we can use: +```{testcode} python +:hide: +from biocypher import BioCypher +bc = BioCypher() + +def check_if_function_exists(module_name, function_name): + if hasattr(module_name, function_name): + print("Functions exists") + else: + print("Function does not exist") +check_if_function_exists(bc, "add_nodes") +check_if_function_exists(bc, "add_edges") +``` +```{testoutput} python +:hide: +Functions exists +Functions exists +``` + ```{code-block} python bc.add_nodes(node_generator()) bc.add_edges(edge_generator()) diff --git a/docs/tutorial-ontology.md b/docs/tutorial-ontology.md index a63556a3..367eb8c4 100644 --- a/docs/tutorial-ontology.md +++ b/docs/tutorial-ontology.md @@ -83,9 +83,25 @@ parts are actually used in the knowledge graph to be created. To get an overview of the structure of our project, we can run the following command via the interface: +```{testcode} python +:hide: +from biocypher import BioCypher +bc = BioCypher() + +def check_if_function_exists(module_name, function_name): + if hasattr(module_name, function_name): + print("Functions exists") + else: + print("Function does not exist") +check_if_function_exists(bc, "show_ontology_structure") +``` +```{testoutput} python +:hide: +Functions exists +``` + ```{code-block} python :caption: Visualising the ontology hierarchy - from biocypher import BioCypher bc = BioCypher( offline=True, # no need to connect or to load data diff --git a/docs/tutorial.md b/docs/tutorial.md index 7c855912..181079bb 100644 --- a/docs/tutorial.md +++ b/docs/tutorial.md @@ -86,11 +86,9 @@ components: an input stream of data (which we call adapter) and a configuration for the resulting desired output (the schema configuration). The former will be simulated by calling the `Protein` class of our data generator 10 times. -```{code-block} python - ->>> from tutorial.data_generator import Protein ->>> proteins = [Protein() for _ in range(10)] - +```{testcode} python +from tutorial.data_generator import Protein +proteins = [Protein() for _ in range(10)] ``` Each protein in our simulated data has a UniProt ID, a label @@ -106,14 +104,14 @@ simulated input data and, for each entity, forms the corresponding tuple. The use of a generator allows for efficient streaming of larger datasets where required. -```{code-block} python +```{testcode} python def node_generator(): - for protein in proteins: - yield ( - protein.get_id(), - protein.get_label(), - protein.get_properties() - ) + for protein in proteins: + yield ( + protein.get_id(), + protein.get_label(), + protein.get_properties() + ) ``` The concept of an adapter can become arbitrarily complex and involve @@ -220,12 +218,17 @@ not require setting up a graph database instance. The following code will use the data stream and configuration set up above to write the files for knowledge graph creation: -```{code-block} python +```{testsetup} python +import os +os.chdir('../') +``` + +```{testcode} python from biocypher import BioCypher bc = BioCypher( - biocypher_config_path='tutorial/01_biocypher_config.yaml', - schema_config_path="tutorial/01_schema_config.yaml", -) + biocypher_config_path='tutorial/01_biocypher_config.yaml', + schema_config_path='tutorial/01_schema_config.yaml', + ) bc.write_nodes(node_generator()) ``` @@ -263,12 +266,17 @@ input data (for the level of granularity that was used for the import). We can also print the ontological hierarchy derived from the underlying model(s) according to the classes that were given in the schema configuration: -```{code-block} python -bc.log_missing_bl_types() # show input unaccounted for in the schema +```{testcode} python +bc.log_missing_input_labels() # show input unaccounted for in the schema bc.log_duplicates() # show duplicates in the input data bc.show_ontology_structure() # show ontological hierarchy ``` +```{testoutput} python +:hide: +... +``` + ## Section 2: Merging data (merging)= From eb6ffa8417d544e2babc5f8532df24f781f8158d Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Wed, 13 Sep 2023 14:21:59 +0200 Subject: [PATCH 119/343] issue #259: run tests and code quality check on every commit --- .github/workflows/ci_cd.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index d10c4aa5..2b54cea6 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -4,7 +4,7 @@ on: pull_request: push: branches: - - main + - '*' jobs: build-linux: @@ -40,6 +40,9 @@ jobs: - name: Generate coverage badge run: coverage-badge -f -o docs/coverage/coverage.svg + - name: Check code quality + uses: pre-commit/action@v3.0.0 + - name: Commit changes uses: s0/git-publish-subdir-action@develop env: From 1a76aaf7ce8c9b504fd5761d7bff406b5740872a Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Wed, 13 Sep 2023 15:02:52 +0200 Subject: [PATCH 120/343] issue #259 first draft of release cicd pipeline --- .github/workflows/ci_cd.yaml | 2 +- .../{sphinx_autodoc.yaml => release.yaml} | 35 +++++++++++++++++-- 2 files changed, 33 insertions(+), 4 deletions(-) rename .github/workflows/{sphinx_autodoc.yaml => release.yaml} (72%) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index 2b54cea6..c7ad4b6c 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -1,4 +1,4 @@ -name: Tests +name: Tests and code quality on: pull_request: diff --git a/.github/workflows/sphinx_autodoc.yaml b/.github/workflows/release.yaml similarity index 72% rename from .github/workflows/sphinx_autodoc.yaml rename to .github/workflows/release.yaml index e8217a3d..30bd2a79 100644 --- a/.github/workflows/sphinx_autodoc.yaml +++ b/.github/workflows/release.yaml @@ -1,9 +1,15 @@ -name: Docs build +name: Release + on: -- push + push: + branches: + - '*' + #- main + #tags: + #- '*' jobs: - build: + build_and_deploy_docs: runs-on: ubuntu-latest if: github.ref == 'refs/heads/main' permissions: write-all @@ -38,6 +44,8 @@ jobs: run: poetry install --no-interaction - name: Install pandoc run: sudo apt-get -y install pandoc + - name: Test code snippets in documentation + run: poetry run make doctest --directory docs/ - name: Build documentation run: poetry run make html --directory docs/ - name: Commit files @@ -56,3 +64,24 @@ jobs: BRANCH: gh-pages FOLDER: docs/_build/html GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + +jobs: + build_and_deploy_artifact: + steps: + - name: Checkout Repository + uses: actions/checkout@v4 + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: '3.9' + - name: Install and configure Poetry + uses: snok/install-poetry@v1 + with: + version: 1.5.1 + virtualenvs-create: false + - name: Install Dependencies + run: poetry install + - name: Build artifact + run: poetry build + #- name: Deploy artifact to PyPi + # run: poetry publish --username __token__ --password ${{ secrets.PYPI_TOKEN }} From 0234239c7dca0644f987a354e51578e5b0ac68d8 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Wed, 13 Sep 2023 15:05:50 +0200 Subject: [PATCH 121/343] issue #259 fix yaml structure --- .github/workflows/release.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 30bd2a79..687e7ffe 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -65,7 +65,6 @@ jobs: FOLDER: docs/_build/html GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -jobs: build_and_deploy_artifact: steps: - name: Checkout Repository From 3bb1bf2f771f4858dc3bc39c7bded7b53a348cf4 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Wed, 13 Sep 2023 15:08:58 +0200 Subject: [PATCH 122/343] issue #259 fix yaml structure 2 --- .github/workflows/release.yaml | 36 +++++++++++++++++----------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 687e7ffe..6d2839da 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -66,21 +66,21 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} build_and_deploy_artifact: - steps: - - name: Checkout Repository - uses: actions/checkout@v4 - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: '3.9' - - name: Install and configure Poetry - uses: snok/install-poetry@v1 - with: - version: 1.5.1 - virtualenvs-create: false - - name: Install Dependencies - run: poetry install - - name: Build artifact - run: poetry build - #- name: Deploy artifact to PyPi - # run: poetry publish --username __token__ --password ${{ secrets.PYPI_TOKEN }} + steps: + - name: Checkout Repository + uses: actions/checkout@v4 + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: '3.9' + - name: Install and configure Poetry + uses: snok/install-poetry@v1 + with: + version: 1.5.1 + virtualenvs-create: false + - name: Install Dependencies + run: poetry install + - name: Build artifact + run: poetry build + #- name: Deploy artifact to PyPi + # run: poetry publish --username __token__ --password ${{ secrets.PYPI_TOKEN }} From ad7b08789e62558ef0d8312a03754d1b35f004a4 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Wed, 13 Sep 2023 15:09:59 +0200 Subject: [PATCH 123/343] issue #259 add runner config --- .github/workflows/release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 6d2839da..8bf4d8d9 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -66,6 +66,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} build_and_deploy_artifact: + runs-on: ubuntu-latest steps: - name: Checkout Repository uses: actions/checkout@v4 From 9c39b1692fce0a9df421f1e1df75b0df2c0c4ef9 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Fri, 22 Sep 2023 15:56:53 +0200 Subject: [PATCH 124/343] issue #195: test mac os build --- .github/workflows/ci_cd.yaml | 56 ++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 32 deletions(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index c7ad4b6c..bc7f8c56 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -51,38 +51,30 @@ jobs: FOLDER: docs/coverage GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # build-macos: - # runs-on: macos-latest - - # steps: - # - name: Checkout Repository - # uses: actions/checkout@v4 - - # - name: Set up Python - # uses: actions/setup-python@v4 - # with: - # python-version: '3.9' - - # - name: Install and configure Poetry - # uses: snok/install-poetry@v1 - # with: - # version: 1.5.1 - # virtualenvs-create: false - - # - name: Install Dependencies - # run: poetry install - - # - name: Install Docker - # uses: douglascamata/setup-docker-macos-action@v1-alpha - - # - name: Start Neo4j Docker - # run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise - - # - name: Start Postgres Docker - # run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest - - # - name: Run Tests - # run: pytest --password=your_password_here + build-macos: + runs-on: macos-latest + steps: + - name: Checkout Repository + uses: actions/checkout@v4 + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: '3.9' + - name: Install and configure Poetry + uses: snok/install-poetry@v1 + with: + version: 1.5.1 + virtualenvs-create: false + - name: Install Dependencies + run: poetry install + - name: Install Docker + uses: douglascamata/setup-docker-macos-action@v1-alpha + - name: Start Neo4j Docker + run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise + - name: Start Postgres Docker + run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest + - name: Run Tests + run: pytest --password=your_password_here # build-windows: # runs-on: windows-latest From 944af275e48efdb1f711fa9095ffceb28af8a25d Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Fri, 22 Sep 2023 16:04:53 +0200 Subject: [PATCH 125/343] issue #195: test windows build --- .github/workflows/ci_cd.yaml | 66 ++++++++++++++---------------------- 1 file changed, 26 insertions(+), 40 deletions(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index bc7f8c56..793f8062 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -13,36 +13,27 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v4 - - name: Set up Python uses: actions/setup-python@v4 with: python-version: '3.9' - - name: Install and configure Poetry uses: snok/install-poetry@v1 with: version: 1.5.1 virtualenvs-create: false - - name: Install Dependencies run: poetry install - - name: Start Neo4j Docker run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise - - name: Start Postgres Docker run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest - - name: Run Tests run: coverage run -m pytest --password=your_password_here - - name: Generate coverage badge run: coverage-badge -f -o docs/coverage/coverage.svg - - name: Check code quality uses: pre-commit/action@v3.0.0 - - name: Commit changes uses: s0/git-publish-subdir-action@develop env: @@ -53,6 +44,7 @@ jobs: build-macos: runs-on: macos-latest + steps: - name: Checkout Repository uses: actions/checkout@v4 @@ -76,36 +68,30 @@ jobs: - name: Run Tests run: pytest --password=your_password_here - # build-windows: - # runs-on: windows-latest - - # defaults: - # run: - # shell: bash - - # steps: - # - name: Checkout Repository - # uses: actions/checkout@v4 - - # - name: Set up Python - # uses: actions/setup-python@v4 - # with: - # python-version: '3.9' - - # - name: Install and configure Poetry - # uses: snok/install-poetry@v1 - # with: - # version: 1.5.1 - # virtualenvs-create: false + build-windows: + runs-on: windows-latest - # - name: Install Dependencies - # run: poetry install + defaults: + run: + shell: bash - # - name: Start Neo4j Docker - # run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise - - # - name: Start Postgres Docker - # run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest - - # - name: Run Tests - # run: pytest --password=your_password_here + steps: + - name: Checkout Repository + uses: actions/checkout@v4 + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: '3.9' + - name: Install and configure Poetry + uses: snok/install-poetry@v1 + with: + version: 1.5.1 + virtualenvs-create: false + - name: Install Dependencies + run: poetry install + - name: Start Neo4j Docker + run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise + - name: Start Postgres Docker + run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest + - name: Run Tests + run: pytest --password=your_password_here From 84bfe0d8d0aa4df74d85ef343230559e075a8957 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Fri, 22 Sep 2023 16:30:15 +0200 Subject: [PATCH 126/343] issue #195: try to fix windows build --- .github/workflows/ci_cd.yaml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index 793f8062..55b229ef 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -82,13 +82,19 @@ jobs: uses: actions/setup-python@v4 with: python-version: '3.9' - - name: Install and configure Poetry + - name: Install Poetry uses: snok/install-poetry@v1 with: - version: 1.5.1 - virtualenvs-create: false + virtualenvs-create: true + virtualenvs-in-project: true + - name: Load cached venv + id: cached-pip-wheels + uses: actions/cache@v3 + with: + path: ~/.cache + key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }} - name: Install Dependencies - run: poetry install + run: poetry install --no-interaction --no-root - name: Start Neo4j Docker run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise - name: Start Postgres Docker From e1471cc4b714c7b9754871d374ef64c36ff6549f Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Fri, 22 Sep 2023 16:49:46 +0200 Subject: [PATCH 127/343] issue #195: windows build, use other neo4j docker image --- .github/workflows/ci_cd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index 55b229ef..115202fb 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -96,7 +96,7 @@ jobs: - name: Install Dependencies run: poetry install --no-interaction --no-root - name: Start Neo4j Docker - run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise + run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4 - name: Start Postgres Docker run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest - name: Run Tests From 1974717f5813b65b789814c3262b68f773d5cf58 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Fri, 22 Sep 2023 17:14:33 +0200 Subject: [PATCH 128/343] issue #195: windows build, another try to use other neo4j docker image --- .github/workflows/ci_cd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index 115202fb..2d802d68 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -96,7 +96,7 @@ jobs: - name: Install Dependencies run: poetry install --no-interaction --no-root - name: Start Neo4j Docker - run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4 + run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j - name: Start Postgres Docker run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest - name: Run Tests From 862e552ac40c8055b24a697b53791c2a85fb03f4 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Mon, 25 Sep 2023 15:01:05 +0200 Subject: [PATCH 129/343] issue #195: fix windows build by removing neo4j Docker setup on Windows --- .github/workflows/ci_cd.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index 2d802d68..817653b3 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -95,8 +95,9 @@ jobs: key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }} - name: Install Dependencies run: poetry install --no-interaction --no-root - - name: Start Neo4j Docker - run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j + # - name: Start Neo4j Docker + # No official Neo4j Docker image available for Windows + # -> setup currently missing and tests which need this are skipped on Windows - name: Start Postgres Docker run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest - name: Run Tests From d220a7d34559245a81618a7647db7d34e09c6489 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Mon, 25 Sep 2023 15:07:05 +0200 Subject: [PATCH 130/343] issue #195: fix windows build by removing postgres Docker setup on Windows --- .github/workflows/ci_cd.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index 817653b3..11c8caf8 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -98,7 +98,8 @@ jobs: # - name: Start Neo4j Docker # No official Neo4j Docker image available for Windows # -> setup currently missing and tests which need this are skipped on Windows - - name: Start Postgres Docker - run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest + # and the same for Postgres + # - name: Start Postgres Docker + # run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest - name: Run Tests run: pytest --password=your_password_here From 3574d4c7a11fa7f19d13c1aef2266f89d942b3db Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Mon, 25 Sep 2023 15:13:21 +0200 Subject: [PATCH 131/343] issue #195: fix windows build by correct pytest command --- .github/workflows/ci_cd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index 11c8caf8..0682fea7 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -102,4 +102,4 @@ jobs: # - name: Start Postgres Docker # run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest - name: Run Tests - run: pytest --password=your_password_here + run: poetry run pytest --password=your_password_here From cb9594d3261159cf3435fea3d369997fab125d58 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Mon, 25 Sep 2023 15:32:38 +0200 Subject: [PATCH 132/343] issue #259: run release only on tags; test all supported python versions --- .github/workflows/ci_cd.yaml | 83 +++++++++++++++++----------------- .github/workflows/release.yaml | 2 +- 2 files changed, 42 insertions(+), 43 deletions(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index 0682fea7..a13920e1 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -1,22 +1,21 @@ name: Tests and code quality -on: - pull_request: - push: - branches: - - '*' +on: [push, pull_request] jobs: build-linux: runs-on: ubuntu-latest + strategy: + matrix: + python-version: ["3.9", "3.10"] steps: - name: Checkout Repository uses: actions/checkout@v4 - - name: Set up Python + - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: - python-version: '3.9' + python-version: ${{ matrix.python-version }} - name: Install and configure Poetry uses: snok/install-poetry@v1 with: @@ -68,38 +67,38 @@ jobs: - name: Run Tests run: pytest --password=your_password_here - build-windows: - runs-on: windows-latest - - defaults: - run: - shell: bash - - steps: - - name: Checkout Repository - uses: actions/checkout@v4 - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: '3.9' - - name: Install Poetry - uses: snok/install-poetry@v1 - with: - virtualenvs-create: true - virtualenvs-in-project: true - - name: Load cached venv - id: cached-pip-wheels - uses: actions/cache@v3 - with: - path: ~/.cache - key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }} - - name: Install Dependencies - run: poetry install --no-interaction --no-root - # - name: Start Neo4j Docker - # No official Neo4j Docker image available for Windows - # -> setup currently missing and tests which need this are skipped on Windows - # and the same for Postgres - # - name: Start Postgres Docker - # run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest - - name: Run Tests - run: poetry run pytest --password=your_password_here + #build-windows: + # runs-on: windows-latest +# + # defaults: + # run: + # shell: bash +# + # steps: + # - name: Checkout Repository + # uses: actions/checkout@v4 + # - name: Set up Python + # uses: actions/setup-python@v4 + # with: + # python-version: '3.9' + # - name: Install Poetry + # uses: snok/install-poetry@v1 + # with: + # virtualenvs-create: true + # virtualenvs-in-project: true + # - name: Load cached venv + # id: cached-pip-wheels + # uses: actions/cache@v3 + # with: + # path: ~/.cache + # key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }} + # - name: Install Dependencies + # run: poetry install --no-interaction --no-root + # # - name: Start Neo4j Docker + # # No official Neo4j Docker image available for Windows + # # -> setup currently missing and tests which need this are skipped on Windows + # # and the same for Postgres + # # - name: Start Postgres Docker + # # run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest + # - name: Run Tests + # run: poetry run pytest --password=your_password_here diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8bf4d8d9..c645e110 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -11,7 +11,7 @@ on: jobs: build_and_deploy_docs: runs-on: ubuntu-latest - if: github.ref == 'refs/heads/main' + if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') permissions: write-all steps: - name: Check out main From f1144b1d9f8f2d1b02728eafb564cc769edb590a Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Mon, 25 Sep 2023 16:19:02 +0200 Subject: [PATCH 133/343] issue #259: use matrix config to test different os and python versions --- .github/workflows/ci_cd.yaml | 67 +++++++++++++++++++--------------- .github/workflows/release.yaml | 8 +--- 2 files changed, 39 insertions(+), 36 deletions(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index a13920e1..62176197 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -3,11 +3,13 @@ name: Tests and code quality on: [push, pull_request] jobs: - build-linux: - runs-on: ubuntu-latest + test: strategy: matrix: + fail-fast: true + os: ["ubuntu-latest", "macos-latest"] python-version: ["3.9", "3.10"] + runs-on: ${{ matrix.os }} steps: - name: Checkout Repository @@ -16,6 +18,7 @@ jobs: uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} + cache: 'poetry' - name: Install and configure Poetry uses: snok/install-poetry@v1 with: @@ -28,44 +31,50 @@ jobs: - name: Start Postgres Docker run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest - name: Run Tests + run: pytest --password=your_password_here + - name: Check code quality + uses: pre-commit/action@v3.0.0 + + - name: Generate coverage report run: coverage run -m pytest --password=your_password_here + if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest' }} - name: Generate coverage badge run: coverage-badge -f -o docs/coverage/coverage.svg - - name: Check code quality - uses: pre-commit/action@v3.0.0 + if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest' }} - name: Commit changes uses: s0/git-publish-subdir-action@develop + if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest' }} env: REPO: self BRANCH: coverage FOLDER: docs/coverage GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - build-macos: - runs-on: macos-latest - - steps: - - name: Checkout Repository - uses: actions/checkout@v4 - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: '3.9' - - name: Install and configure Poetry - uses: snok/install-poetry@v1 - with: - version: 1.5.1 - virtualenvs-create: false - - name: Install Dependencies - run: poetry install - - name: Install Docker - uses: douglascamata/setup-docker-macos-action@v1-alpha - - name: Start Neo4j Docker - run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise - - name: Start Postgres Docker - run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest - - name: Run Tests - run: pytest --password=your_password_here + #build-macos: + # runs-on: macos-latest +# + # steps: + # - name: Checkout Repository + # uses: actions/checkout@v4 + # - name: Set up Python + # uses: actions/setup-python@v4 + # with: + # python-version: '3.9' + # - name: Install and configure Poetry + # uses: snok/install-poetry@v1 + # with: + # version: 1.5.1 + # virtualenvs-create: false + # - name: Install Dependencies + # run: poetry install + # - name: Install Docker + # uses: douglascamata/setup-docker-macos-action@v1-alpha + # - name: Start Neo4j Docker + # run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise + # - name: Start Postgres Docker + # run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest + # - name: Run Tests + # run: pytest --password=your_password_here #build-windows: # runs-on: windows-latest diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index c645e110..457bace0 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,12 +1,6 @@ name: Release -on: - push: - branches: - - '*' - #- main - #tags: - #- '*' +on: [push] jobs: build_and_deploy_docs: From 7855bbd4dfe0e7cc41a238d24ee80ba7948ab3be Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Mon, 25 Sep 2023 16:21:50 +0200 Subject: [PATCH 134/343] issue #259: correct yaml syntax --- .github/workflows/ci_cd.yaml | 2 +- .github/workflows/release.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index 62176197..a49e75f3 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -5,8 +5,8 @@ on: [push, pull_request] jobs: test: strategy: + fail-fast: true matrix: - fail-fast: true os: ["ubuntu-latest", "macos-latest"] python-version: ["3.9", "3.10"] runs-on: ${{ matrix.os }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 457bace0..6dc1603e 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -61,6 +61,7 @@ jobs: build_and_deploy_artifact: runs-on: ubuntu-latest + if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') steps: - name: Checkout Repository uses: actions/checkout@v4 From 9934d1f79e32e8ea3107262b11c3a87d16ca7829 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Mon, 25 Sep 2023 16:32:04 +0200 Subject: [PATCH 135/343] issue #259: make caching of poetry dependencies possible to speed up execution --- .github/workflows/ci_cd.yaml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index a49e75f3..ed59282f 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -14,16 +14,18 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v4 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - cache: 'poetry' - name: Install and configure Poetry uses: snok/install-poetry@v1 with: version: 1.5.1 virtualenvs-create: false + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + cache: 'poetry' + - name: Set Poetry Python version + run: poetry env use ${{ matrix.python-version }} - name: Install Dependencies run: poetry install - name: Start Neo4j Docker From 6ab6f2c257709c8df7ae319601f3da45f933abd0 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Mon, 25 Sep 2023 16:35:01 +0200 Subject: [PATCH 136/343] issue #259: create virtualenvs for chaching --- .github/workflows/ci_cd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index ed59282f..5fdb5a85 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -18,7 +18,7 @@ jobs: uses: snok/install-poetry@v1 with: version: 1.5.1 - virtualenvs-create: false + virtualenvs-create: true - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: From 7f78a181f63afe56ff92959be538003b142b09f9 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Mon, 25 Sep 2023 16:37:11 +0200 Subject: [PATCH 137/343] issue #259: prefix commands with poetry run --- .github/workflows/ci_cd.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index 5fdb5a85..a855409c 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -33,15 +33,15 @@ jobs: - name: Start Postgres Docker run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest - name: Run Tests - run: pytest --password=your_password_here + run: poetry run pytest --password=your_password_here - name: Check code quality uses: pre-commit/action@v3.0.0 - name: Generate coverage report - run: coverage run -m pytest --password=your_password_here + run: poetry run coverage run -m pytest --password=your_password_here if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest' }} - name: Generate coverage badge - run: coverage-badge -f -o docs/coverage/coverage.svg + run: poetry run coverage-badge -f -o docs/coverage/coverage.svg if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest' }} - name: Commit changes uses: s0/git-publish-subdir-action@develop From 9df66e1ae141833d21bc086f754cd83219c2c276 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Mon, 25 Sep 2023 17:05:57 +0200 Subject: [PATCH 138/343] issue #259: set concurrency to 1, due to neo4j/postgres databases --- .github/workflows/ci_cd.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index a855409c..bf5ea42c 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -2,13 +2,17 @@ name: Tests and code quality on: [push, pull_request] +# TODO: matrix only on pull requests +# TODO: tests and code quality on all commits + jobs: test: strategy: + max-parallel: 1 fail-fast: true matrix: os: ["ubuntu-latest", "macos-latest"] - python-version: ["3.9", "3.10"] + python-version: ["3.9", "3.10", "3.11"] runs-on: ${{ matrix.os }} steps: From 933d8a5c62b807124b878877730a85395b027e16 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Mon, 25 Sep 2023 17:25:53 +0200 Subject: [PATCH 139/343] issue #259: fix macos docker setup; different push and pull request configs --- .github/workflows/ci_cd.yaml | 48 +++++++++++++++++++++++++++++++----- 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index bf5ea42c..cb860251 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -1,14 +1,47 @@ name: Tests and code quality -on: [push, pull_request] - -# TODO: matrix only on pull requests -# TODO: tests and code quality on all commits +on: + pull_request: + branches: + - main + push: + branches: + - main jobs: - test: + push_job: + if: github.event_name == 'push' + runs-on: ubuntu-latest + # TODO: fix duplicate code + steps: + - name: Checkout Repository + uses: actions/checkout@v4 + - name: Install and configure Poetry + uses: snok/install-poetry@v1 + with: + version: 1.5.1 + virtualenvs-create: true + - name: Set up Python 3.9 + uses: actions/setup-python@v4 + with: + python-version: 3.9 + cache: 'poetry' + - name: Set Poetry Python version + run: poetry env use 3.9 + - name: Install Dependencies + run: poetry install + - name: Start Neo4j Docker + run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise + - name: Start Postgres Docker + run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest + - name: Run Tests + run: poetry run pytest --password=your_password_here + - name: Check code quality + uses: pre-commit/action@v3.0.0 + + pull_request_job: strategy: - max-parallel: 1 + # max-parallel: 1 fail-fast: true matrix: os: ["ubuntu-latest", "macos-latest"] @@ -32,6 +65,9 @@ jobs: run: poetry env use ${{ matrix.python-version }} - name: Install Dependencies run: poetry install + - name: Install Docker + uses: douglascamata/setup-docker-macos-action@v1-alpha + if: ${{ matrix.os == 'macos-latest' }} - name: Start Neo4j Docker run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise - name: Start Postgres Docker From a1bbe359b20467e585185612d3c5bfe93127938c Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Mon, 25 Sep 2023 17:29:28 +0200 Subject: [PATCH 140/343] issue #259: fix syntax --- .github/workflows/ci_cd.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index cb860251..8f49b2c0 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -10,7 +10,7 @@ on: jobs: push_job: - if: github.event_name == 'push' + if: ${{ github.event_name == 'push' }} runs-on: ubuntu-latest # TODO: fix duplicate code steps: @@ -40,6 +40,7 @@ jobs: uses: pre-commit/action@v3.0.0 pull_request_job: + if: ${{ github.event_name == 'pull_request' }} strategy: # max-parallel: 1 fail-fast: true From 48fcdffec61e00c043b6c330e6ae85250d9ba321 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Mon, 25 Sep 2023 17:38:57 +0200 Subject: [PATCH 141/343] issue #259: fix syntax --- .github/workflows/ci_cd.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index 8f49b2c0..eba5ba31 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -10,10 +10,10 @@ on: jobs: push_job: - if: ${{ github.event_name == 'push' }} - runs-on: ubuntu-latest - # TODO: fix duplicate code - steps: + if: ${{ github.event_name == 'push' }} + runs-on: ubuntu-latest + # TODO: fix duplicate code + steps: - name: Checkout Repository uses: actions/checkout@v4 - name: Install and configure Poetry From 1513c108fde696352ec884c6c87d5cad639ecc12 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Mon, 25 Sep 2023 17:40:06 +0200 Subject: [PATCH 142/343] issue #259: fix run conditions --- .github/workflows/ci_cd.yaml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index eba5ba31..37626452 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -1,12 +1,6 @@ name: Tests and code quality -on: - pull_request: - branches: - - main - push: - branches: - - main +on: [push, pull_request] jobs: push_job: From 26e180a8b4cc3e2b040bb03c36f36e59d6c34353 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Mon, 25 Sep 2023 17:52:34 +0200 Subject: [PATCH 143/343] issue #259: test all different os --- .github/workflows/ci_cd.yaml | 42 +++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index 37626452..8f789c92 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -6,7 +6,6 @@ jobs: push_job: if: ${{ github.event_name == 'push' }} runs-on: ubuntu-latest - # TODO: fix duplicate code steps: - name: Checkout Repository uses: actions/checkout@v4 @@ -34,9 +33,8 @@ jobs: uses: pre-commit/action@v3.0.0 pull_request_job: - if: ${{ github.event_name == 'pull_request' }} + # if: ${{ github.event_name == 'pull_request' }} strategy: - # max-parallel: 1 fail-fast: true matrix: os: ["ubuntu-latest", "macos-latest"] @@ -148,3 +146,41 @@ jobs: # # run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest # - name: Run Tests # run: poetry run pytest --password=your_password_here + + build-windows: + runs-on: windows-latest + + defaults: + run: + shell: bash + + steps: + - name: Checkout Repository + uses: actions/checkout@v4 + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: '3.9' + - name: Install Poetry + uses: snok/install-poetry@v1 + with: + virtualenvs-create: true + virtualenvs-in-project: true + - name: Load cached venv + id: cached-pip-wheels + uses: actions/cache@v3 + with: + path: ~/.cache + key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }} + - name: Install Dependencies + run: poetry install --no-interaction --no-root + # - name: Start Neo4j Docker + # No official Neo4j Docker image available for Windows + # -> setup currently missing and tests which need this are skipped on Windows + # and the same for Postgres + # - name: Start Postgres Docker + # run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest + - name: Run Tests + run: | + source $VENV + pytest --password=your_password_here From eb966c4110d0ecf2174ef8a452252fbfa7cb1aa8 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Mon, 25 Sep 2023 17:58:16 +0200 Subject: [PATCH 144/343] issue #259: another try to fix windows build --- .github/workflows/ci_cd.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index 8f789c92..fc3430b6 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -172,8 +172,10 @@ jobs: with: path: ~/.cache key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }} - - name: Install Dependencies + - name: Install dependencies run: poetry install --no-interaction --no-root + - name: Install library + run: poetry install --no-interaction # - name: Start Neo4j Docker # No official Neo4j Docker image available for Windows # -> setup currently missing and tests which need this are skipped on Windows From 4b1b3bef3d06a7a1f82f23404a7109ec614aac84 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Thu, 28 Sep 2023 12:34:59 +0200 Subject: [PATCH 145/343] issue #259: adapt tests to handle different path separators for windows and linux correctly --- .github/workflows/ci_cd.yaml | 172 +++++++++++------------------------ test/test_write_neo4j.py | 8 +- 2 files changed, 59 insertions(+), 121 deletions(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index fc3430b6..ae86c3c4 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -3,149 +3,87 @@ name: Tests and code quality on: [push, pull_request] jobs: - push_job: - if: ${{ github.event_name == 'push' }} - runs-on: ubuntu-latest - steps: - - name: Checkout Repository - uses: actions/checkout@v4 - - name: Install and configure Poetry - uses: snok/install-poetry@v1 - with: - version: 1.5.1 - virtualenvs-create: true - - name: Set up Python 3.9 - uses: actions/setup-python@v4 - with: - python-version: 3.9 - cache: 'poetry' - - name: Set Poetry Python version - run: poetry env use 3.9 - - name: Install Dependencies - run: poetry install - - name: Start Neo4j Docker - run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise - - name: Start Postgres Docker - run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest - - name: Run Tests - run: poetry run pytest --password=your_password_here - - name: Check code quality - uses: pre-commit/action@v3.0.0 - - pull_request_job: - # if: ${{ github.event_name == 'pull_request' }} - strategy: - fail-fast: true - matrix: - os: ["ubuntu-latest", "macos-latest"] - python-version: ["3.9", "3.10", "3.11"] - runs-on: ${{ matrix.os }} - - steps: - - name: Checkout Repository - uses: actions/checkout@v4 - - name: Install and configure Poetry - uses: snok/install-poetry@v1 - with: - version: 1.5.1 - virtualenvs-create: true - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - cache: 'poetry' - - name: Set Poetry Python version - run: poetry env use ${{ matrix.python-version }} - - name: Install Dependencies - run: poetry install - - name: Install Docker - uses: douglascamata/setup-docker-macos-action@v1-alpha - if: ${{ matrix.os == 'macos-latest' }} - - name: Start Neo4j Docker - run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise - - name: Start Postgres Docker - run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest - - name: Run Tests - run: poetry run pytest --password=your_password_here - - name: Check code quality - uses: pre-commit/action@v3.0.0 - - - name: Generate coverage report - run: poetry run coverage run -m pytest --password=your_password_here - if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest' }} - - name: Generate coverage badge - run: poetry run coverage-badge -f -o docs/coverage/coverage.svg - if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest' }} - - name: Commit changes - uses: s0/git-publish-subdir-action@develop - if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest' }} - env: - REPO: self - BRANCH: coverage - FOLDER: docs/coverage - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - #build-macos: - # runs-on: macos-latest -# + #push_job: + # if: ${{ github.event_name == 'push' }} + # runs-on: ubuntu-latest # steps: # - name: Checkout Repository # uses: actions/checkout@v4 - # - name: Set up Python - # uses: actions/setup-python@v4 - # with: - # python-version: '3.9' # - name: Install and configure Poetry # uses: snok/install-poetry@v1 # with: # version: 1.5.1 - # virtualenvs-create: false + # virtualenvs-create: true + # - name: Set up Python 3.9 + # uses: actions/setup-python@v4 + # with: + # python-version: 3.9 + # cache: 'poetry' + # - name: Set Poetry Python version + # run: poetry env use 3.9 # - name: Install Dependencies # run: poetry install - # - name: Install Docker - # uses: douglascamata/setup-docker-macos-action@v1-alpha # - name: Start Neo4j Docker # run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise # - name: Start Postgres Docker # run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest # - name: Run Tests - # run: pytest --password=your_password_here - - #build-windows: - # runs-on: windows-latest + # run: poetry run pytest --password=your_password_here + # - name: Check code quality + # uses: pre-commit/action@v3.0.0 # - # defaults: - # run: - # shell: bash + #pull_request_job: + # # if: ${{ github.event_name == 'pull_request' }} + # strategy: + # fail-fast: true + # matrix: + # os: ["ubuntu-latest", "macos-latest"] + # python-version: ["3.9", "3.10", "3.11"] + # runs-on: ${{ matrix.os }} # # steps: # - name: Checkout Repository # uses: actions/checkout@v4 - # - name: Set up Python - # uses: actions/setup-python@v4 - # with: - # python-version: '3.9' - # - name: Install Poetry + # - name: Install and configure Poetry # uses: snok/install-poetry@v1 # with: + # version: 1.5.1 # virtualenvs-create: true - # virtualenvs-in-project: true - # - name: Load cached venv - # id: cached-pip-wheels - # uses: actions/cache@v3 + # - name: Set up Python ${{ matrix.python-version }} + # uses: actions/setup-python@v4 # with: - # path: ~/.cache - # key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }} + # python-version: ${{ matrix.python-version }} + # cache: 'poetry' + # - name: Set Poetry Python version + # run: poetry env use ${{ matrix.python-version }} # - name: Install Dependencies - # run: poetry install --no-interaction --no-root - # # - name: Start Neo4j Docker - # # No official Neo4j Docker image available for Windows - # # -> setup currently missing and tests which need this are skipped on Windows - # # and the same for Postgres - # # - name: Start Postgres Docker - # # run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest + # run: poetry install + # - name: Install Docker + # uses: douglascamata/setup-docker-macos-action@v1-alpha + # if: ${{ matrix.os == 'macos-latest' }} + # - name: Start Neo4j Docker + # run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise + # - name: Start Postgres Docker + # run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest # - name: Run Tests # run: poetry run pytest --password=your_password_here + # - name: Check code quality + # uses: pre-commit/action@v3.0.0 +# + # - name: Generate coverage report + # run: poetry run coverage run -m pytest --password=your_password_here + # if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest' }} + # - name: Generate coverage badge + # run: poetry run coverage-badge -f -o docs/coverage/coverage.svg + # if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest' }} + # - name: Commit changes + # uses: s0/git-publish-subdir-action@develop + # if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest' }} + # env: + # REPO: self + # BRANCH: coverage + # FOLDER: docs/coverage + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} build-windows: runs-on: windows-latest diff --git a/test/test_write_neo4j.py b/test/test_write_neo4j.py index 4b5aa816..6269d7bc 100644 --- a/test/test_write_neo4j.py +++ b/test/test_write_neo4j.py @@ -57,19 +57,19 @@ def gen(lis): assert 'bin/neo4j-admin import --database=neo4j --delimiter=";" ' in call assert '--array-delimiter="|" --quote="\'" --force=true ' in call assert ( - f'--nodes="{tmp_path}/PostTranslationalInteraction-header.csv,{tmp_path}/PostTranslationalInteraction-part.*" ' + f'--nodes="{tmp_path}{os.sep}PostTranslationalInteraction-header.csv,{tmp_path}{os.sep}PostTranslationalInteraction-part.*" ' in call ) assert ( - f'--relationships="{tmp_path}/IS_SOURCE_OF-header.csv,{tmp_path}/IS_SOURCE_OF-part.*" ' + f'--relationships="{tmp_path}{os.sep}IS_SOURCE_OF-header.csv,{tmp_path}{os.sep}IS_SOURCE_OF-part.*" ' in call ) assert ( - f'--relationships="{tmp_path}/IS_TARGET_OF-header.csv,{tmp_path}/IS_TARGET_OF-part.*" ' + f'--relationships="{tmp_path}{os.sep}IS_TARGET_OF-header.csv,{tmp_path}{os.sep}IS_TARGET_OF-part.*" ' in call ) assert ( - f'--relationships="{tmp_path}/PERTURBED_IN_DISEASE-header.csv,{tmp_path}/PERTURBED_IN_DISEASE-part.*" ' + f'--relationships="{tmp_path}{os.sep}PERTURBED_IN_DISEASE-header.csv,{tmp_path}{os.sep}PERTURBED_IN_DISEASE-part.*" ' in call ) From 65e705b5145bd4bf8b73a689707d26a3f40886bc Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Thu, 28 Sep 2023 13:13:45 +0200 Subject: [PATCH 146/343] issue #259: adapt release workflow to upload to test PyPi --- .github/workflows/ci_cd.yaml | 164 ++++++++++++++++----------------- .github/workflows/release.yaml | 11 ++- 2 files changed, 90 insertions(+), 85 deletions(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index ae86c3c4..6117972a 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -3,91 +3,91 @@ name: Tests and code quality on: [push, pull_request] jobs: - #push_job: - # if: ${{ github.event_name == 'push' }} - # runs-on: ubuntu-latest - # steps: - # - name: Checkout Repository - # uses: actions/checkout@v4 - # - name: Install and configure Poetry - # uses: snok/install-poetry@v1 - # with: - # version: 1.5.1 - # virtualenvs-create: true - # - name: Set up Python 3.9 - # uses: actions/setup-python@v4 - # with: - # python-version: 3.9 - # cache: 'poetry' - # - name: Set Poetry Python version - # run: poetry env use 3.9 - # - name: Install Dependencies - # run: poetry install - # - name: Start Neo4j Docker - # run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise - # - name: Start Postgres Docker - # run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest - # - name: Run Tests - # run: poetry run pytest --password=your_password_here - # - name: Check code quality - # uses: pre-commit/action@v3.0.0 -# - #pull_request_job: - # # if: ${{ github.event_name == 'pull_request' }} - # strategy: - # fail-fast: true - # matrix: - # os: ["ubuntu-latest", "macos-latest"] - # python-version: ["3.9", "3.10", "3.11"] - # runs-on: ${{ matrix.os }} -# - # steps: - # - name: Checkout Repository - # uses: actions/checkout@v4 - # - name: Install and configure Poetry - # uses: snok/install-poetry@v1 - # with: - # version: 1.5.1 - # virtualenvs-create: true - # - name: Set up Python ${{ matrix.python-version }} - # uses: actions/setup-python@v4 - # with: - # python-version: ${{ matrix.python-version }} - # cache: 'poetry' - # - name: Set Poetry Python version - # run: poetry env use ${{ matrix.python-version }} - # - name: Install Dependencies - # run: poetry install - # - name: Install Docker - # uses: douglascamata/setup-docker-macos-action@v1-alpha - # if: ${{ matrix.os == 'macos-latest' }} - # - name: Start Neo4j Docker - # run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise - # - name: Start Postgres Docker - # run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest - # - name: Run Tests - # run: poetry run pytest --password=your_password_here - # - name: Check code quality - # uses: pre-commit/action@v3.0.0 -# - # - name: Generate coverage report - # run: poetry run coverage run -m pytest --password=your_password_here - # if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest' }} - # - name: Generate coverage badge - # run: poetry run coverage-badge -f -o docs/coverage/coverage.svg - # if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest' }} - # - name: Commit changes - # uses: s0/git-publish-subdir-action@develop - # if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest' }} - # env: - # REPO: self - # BRANCH: coverage - # FOLDER: docs/coverage - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + push_job: + if: ${{ github.event_name == 'push' }} + runs-on: ubuntu-latest + steps: + - name: Checkout Repository + uses: actions/checkout@v4 + - name: Install and configure Poetry + uses: snok/install-poetry@v1 + with: + version: 1.5.1 + virtualenvs-create: true + - name: Set up Python 3.9 + uses: actions/setup-python@v4 + with: + python-version: 3.9 + cache: 'poetry' + - name: Set Poetry Python version + run: poetry env use 3.9 + - name: Install Dependencies + run: poetry install + - name: Start Neo4j Docker + run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise + - name: Start Postgres Docker + run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest + - name: Run Tests + run: poetry run pytest --password=your_password_here + - name: Check code quality + uses: pre-commit/action@v3.0.0 + + pull_request_job: + if: ${{ github.event_name == 'pull_request' }} + strategy: + fail-fast: true + matrix: + os: ["ubuntu-latest", "macos-latest"] + python-version: ["3.9", "3.10", "3.11"] + runs-on: ${{ matrix.os }} + + steps: + - name: Checkout Repository + uses: actions/checkout@v4 + - name: Install and configure Poetry + uses: snok/install-poetry@v1 + with: + version: 1.5.1 + virtualenvs-create: true + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + cache: 'poetry' + - name: Set Poetry Python version + run: poetry env use ${{ matrix.python-version }} + - name: Install Dependencies + run: poetry install + - name: Install Docker + uses: douglascamata/setup-docker-macos-action@v1-alpha + if: ${{ matrix.os == 'macos-latest' }} + - name: Start Neo4j Docker + run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise + - name: Start Postgres Docker + run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest + - name: Run Tests + run: poetry run pytest --password=your_password_here + - name: Check code quality + uses: pre-commit/action@v3.0.0 + + - name: Generate coverage report + run: poetry run coverage run -m pytest --password=your_password_here + if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest' }} + - name: Generate coverage badge + run: poetry run coverage-badge -f -o docs/coverage/coverage.svg + if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest' }} + - name: Commit changes + uses: s0/git-publish-subdir-action@develop + if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest' }} + env: + REPO: self + BRANCH: coverage + FOLDER: docs/coverage + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} build-windows: + if: ${{ github.event_name == 'pull_request' }} runs-on: windows-latest - defaults: run: shell: bash diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 6dc1603e..72680fa3 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -60,8 +60,13 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} build_and_deploy_artifact: - runs-on: ubuntu-latest if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') + runs-on: ubuntu-latest + environment: + name: pypi + url: https://test.pypi.org/project/biocypher/ + permissions: + id-token: write steps: - name: Checkout Repository uses: actions/checkout@v4 @@ -78,5 +83,5 @@ jobs: run: poetry install - name: Build artifact run: poetry build - #- name: Deploy artifact to PyPi - # run: poetry publish --username __token__ --password ${{ secrets.PYPI_TOKEN }} + - name: Publish artifact to PyPI + uses: pypa/gh-action-pypi-publish@release/v1 From 8240d6dc5aaff205be1564af18b42520110efc09 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Thu, 28 Sep 2023 13:36:40 +0200 Subject: [PATCH 147/343] issue #259: comment release part (not yet testable, because developed in forked repo) --- .github/workflows/release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 72680fa3..deeabe45 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -83,5 +83,5 @@ jobs: run: poetry install - name: Build artifact run: poetry build - - name: Publish artifact to PyPI - uses: pypa/gh-action-pypi-publish@release/v1 + #- name: Publish artifact to PyPI + # uses: pypa/gh-action-pypi-publish@release/v1 From 5c52c97c8ca027add9ab5b8e25dda4ebd534670e Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 28 Sep 2023 16:39:00 +0200 Subject: [PATCH 148/343] test commit --- test/test_get.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/test_get.py b/test/test_get.py index 7d3b90d6..7bc4f2ab 100644 --- a/test/test_get.py +++ b/test/test_get.py @@ -183,3 +183,7 @@ def test_download_zip_and_expiration(): paths = downloader.download(resource) # should download again assert paths[0] is not None + + +def test_cache_api_request(): + pass From 5c5d89eb974fe59e6cebfd9cbfff5191190fcb8c Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Thu, 28 Sep 2023 19:07:20 +0200 Subject: [PATCH 149/343] issue #259: try to set write permissions --- .github/workflows/ci_cd.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index 6117972a..aec112ee 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -40,6 +40,8 @@ jobs: os: ["ubuntu-latest", "macos-latest"] python-version: ["3.9", "3.10", "3.11"] runs-on: ${{ matrix.os }} + permissions: + contents: write steps: - name: Checkout Repository From 9b9c14a3eb60a1f5500f16a50a00dc5fde82b8c8 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Mon, 2 Oct 2023 16:17:50 +0200 Subject: [PATCH 150/343] issue #259: remove test coverage badge update from cicd workflow --- .github/workflows/ci_cd.yaml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index aec112ee..737aafa1 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -75,17 +75,17 @@ jobs: - name: Generate coverage report run: poetry run coverage run -m pytest --password=your_password_here if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest' }} - - name: Generate coverage badge - run: poetry run coverage-badge -f -o docs/coverage/coverage.svg - if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest' }} - - name: Commit changes - uses: s0/git-publish-subdir-action@develop - if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest' }} - env: - REPO: self - BRANCH: coverage - FOLDER: docs/coverage - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + #- name: Generate coverage badge + # run: poetry run coverage-badge -f -o docs/coverage/coverage.svg + # if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest' }} + #- name: Commit changes + # uses: s0/git-publish-subdir-action@develop + # if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest' }} + # env: + # REPO: self + # BRANCH: coverage + # FOLDER: docs/coverage + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} build-windows: if: ${{ github.event_name == 'pull_request' }} From b6a29f75934698477324520b64cd87b6ccc11b6f Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Mon, 2 Oct 2023 17:09:50 +0200 Subject: [PATCH 151/343] issue #195: include windws in the matrix --- .github/workflows/ci_cd.yaml | 103 ++++++++++++++++++++++------------- 1 file changed, 65 insertions(+), 38 deletions(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index 737aafa1..53a31d4b 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -37,13 +37,17 @@ jobs: strategy: fail-fast: true matrix: - os: ["ubuntu-latest", "macos-latest"] + os: ["ubuntu-latest", "macos-latest", "windows-latest"] python-version: ["3.9", "3.10", "3.11"] runs-on: ${{ matrix.os }} - permissions: - contents: write + defaults: + run: + shell: bash steps: + #---------------------------------------------- + # check-out repo and set-up python and poetry + #---------------------------------------------- - name: Checkout Repository uses: actions/checkout@v4 - name: Install and configure Poetry @@ -51,6 +55,7 @@ jobs: with: version: 1.5.1 virtualenvs-create: true + virtualenvs-in-project: true - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: @@ -58,8 +63,24 @@ jobs: cache: 'poetry' - name: Set Poetry Python version run: poetry env use ${{ matrix.python-version }} - - name: Install Dependencies - run: poetry install + - name: Load cached venv + if: ${{ matrix.os == 'windows-latest' }} + id: cached-pip-wheels + uses: actions/cache@v3 + with: + path: ~/.cache + key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }} + #---------------------------------------------- + # install dependencies + #---------------------------------------------- + - name: Install dependencies + run: poetry install --no-interaction --no-root + - name: Install library + run: poetry install --no-interaction + #---------------------------------------------- + # setup docker containers for testing + #---------------------------------------------- + # currently only available for ubuntu and macos - name: Install Docker uses: douglascamata/setup-docker-macos-action@v1-alpha if: ${{ matrix.os == 'macos-latest' }} @@ -67,8 +88,14 @@ jobs: run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise - name: Start Postgres Docker run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest + #---------------------------------------------- + # run tests and code quality checks + #---------------------------------------------- - name: Run Tests - run: poetry run pytest --password=your_password_here + run: | + source $VENV + pytest --password=your_password_here + # run: poetry run pytest --password=your_password_here - name: Check code quality uses: pre-commit/action@v3.0.0 @@ -87,42 +114,42 @@ jobs: # FOLDER: docs/coverage # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - build-windows: - if: ${{ github.event_name == 'pull_request' }} - runs-on: windows-latest - defaults: - run: - shell: bash + #build-windows: + # if: ${{ github.event_name == 'pull_request' }} + # runs-on: windows-latest + # defaults: + # run: + # shell: bash - steps: - - name: Checkout Repository - uses: actions/checkout@v4 - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: '3.9' - - name: Install Poetry - uses: snok/install-poetry@v1 - with: - virtualenvs-create: true - virtualenvs-in-project: true - - name: Load cached venv - id: cached-pip-wheels - uses: actions/cache@v3 - with: - path: ~/.cache - key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }} - - name: Install dependencies - run: poetry install --no-interaction --no-root - - name: Install library - run: poetry install --no-interaction + #steps: + #- name: Checkout Repository + # uses: actions/checkout@v4 + #- name: Set up Python + # uses: actions/setup-python@v4 + # with: + # python-version: '3.9' + #- name: Install Poetry + # uses: snok/install-poetry@v1 + # with: + # virtualenvs-create: true + # virtualenvs-in-project: true + #- name: Load cached venv + # id: cached-pip-wheels + # uses: actions/cache@v3 + # with: + # path: ~/.cache + # key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }} + #- name: Install dependencies + # run: poetry install --no-interaction --no-root + #- name: Install library + # run: poetry install --no-interaction # - name: Start Neo4j Docker # No official Neo4j Docker image available for Windows # -> setup currently missing and tests which need this are skipped on Windows # and the same for Postgres # - name: Start Postgres Docker # run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest - - name: Run Tests - run: | - source $VENV - pytest --password=your_password_here + #- name: Run Tests + # run: | + # source $VENV + # pytest --password=your_password_here From 699db473befbbc0e8f43426772d4276b18fe4000 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Mon, 2 Oct 2023 17:22:04 +0200 Subject: [PATCH 152/343] issue #195: adapt setup section for usage with windows --- .github/workflows/ci_cd.yaml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index 53a31d4b..78532069 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -50,21 +50,19 @@ jobs: #---------------------------------------------- - name: Checkout Repository uses: actions/checkout@v4 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} - name: Install and configure Poetry uses: snok/install-poetry@v1 with: version: 1.5.1 virtualenvs-create: true virtualenvs-in-project: true - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - cache: 'poetry' - - name: Set Poetry Python version - run: poetry env use ${{ matrix.python-version }} + #- name: Set Poetry Python version + # run: poetry env use ${{ matrix.python-version }} - name: Load cached venv - if: ${{ matrix.os == 'windows-latest' }} id: cached-pip-wheels uses: actions/cache@v3 with: From fd27978d37d52136b4015329dc02c8bba67267f0 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Mon, 2 Oct 2023 17:28:06 +0200 Subject: [PATCH 153/343] issue #195: do not run docker section on windows --- .github/workflows/ci_cd.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index 78532069..061b3873 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -84,8 +84,10 @@ jobs: if: ${{ matrix.os == 'macos-latest' }} - name: Start Neo4j Docker run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise + if: ${{ matrix.os != 'windows-latest' }} - name: Start Postgres Docker run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest + if: ${{ matrix.os != 'windows-latest' }} #---------------------------------------------- # run tests and code quality checks #---------------------------------------------- From 2f30aac1a02400a8fb78b7394abda31dca2eae3a Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Mon, 2 Oct 2023 21:17:42 +0200 Subject: [PATCH 154/343] issue #195: refactoring and clean up; issue #257 set postgres version in cicd pipeline and not depend on latest tag --- .github/workflows/ci_cd.yaml | 73 +++++++++++------------------------- README.md | 2 +- 2 files changed, 23 insertions(+), 52 deletions(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index 061b3873..a7ef85f4 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -6,27 +6,40 @@ jobs: push_job: if: ${{ github.event_name == 'push' }} runs-on: ubuntu-latest + env: + PYTHON_VERSION: 3.9 + steps: + #---------------------------------------------- + # check-out repo and set-up python and poetry + #---------------------------------------------- - name: Checkout Repository uses: actions/checkout@v4 + - name: Set up Python $PYTHON_VERSION + uses: actions/setup-python@v4 + with: + python-version: $PYTHON_VERSION - name: Install and configure Poetry uses: snok/install-poetry@v1 with: version: 1.5.1 virtualenvs-create: true - - name: Set up Python 3.9 - uses: actions/setup-python@v4 - with: - python-version: 3.9 - cache: 'poetry' - - name: Set Poetry Python version - run: poetry env use 3.9 + virtualenvs-in-project: true + #---------------------------------------------- + # install dependencies + #---------------------------------------------- - name: Install Dependencies run: poetry install + #---------------------------------------------- + # setup docker containers for testing + #---------------------------------------------- - name: Start Neo4j Docker run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise - name: Start Postgres Docker - run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest + run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:11.21-bullseye + #---------------------------------------------- + # run tests and code quality checks + #---------------------------------------------- - name: Run Tests run: poetry run pytest --password=your_password_here - name: Check code quality @@ -86,7 +99,7 @@ jobs: run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise if: ${{ matrix.os != 'windows-latest' }} - name: Start Postgres Docker - run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest + run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:11.21-bullseye if: ${{ matrix.os != 'windows-latest' }} #---------------------------------------------- # run tests and code quality checks @@ -95,10 +108,8 @@ jobs: run: | source $VENV pytest --password=your_password_here - # run: poetry run pytest --password=your_password_here - name: Check code quality uses: pre-commit/action@v3.0.0 - - name: Generate coverage report run: poetry run coverage run -m pytest --password=your_password_here if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest' }} @@ -113,43 +124,3 @@ jobs: # BRANCH: coverage # FOLDER: docs/coverage # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - #build-windows: - # if: ${{ github.event_name == 'pull_request' }} - # runs-on: windows-latest - # defaults: - # run: - # shell: bash - - #steps: - #- name: Checkout Repository - # uses: actions/checkout@v4 - #- name: Set up Python - # uses: actions/setup-python@v4 - # with: - # python-version: '3.9' - #- name: Install Poetry - # uses: snok/install-poetry@v1 - # with: - # virtualenvs-create: true - # virtualenvs-in-project: true - #- name: Load cached venv - # id: cached-pip-wheels - # uses: actions/cache@v3 - # with: - # path: ~/.cache - # key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }} - #- name: Install dependencies - # run: poetry install --no-interaction --no-root - #- name: Install library - # run: poetry install --no-interaction - # - name: Start Neo4j Docker - # No official Neo4j Docker image available for Windows - # -> setup currently missing and tests which need this are skipped on Windows - # and the same for Postgres - # - name: Start Postgres Docker - # run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:latest - #- name: Run Tests - # run: | - # source $VENV - # pytest --password=your_password_here diff --git a/README.md b/README.md index 976404f9..3275b7ac 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ | __License__ | [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) | | :--- | :--- | -| __Python__ | ![Python](https://img.shields.io/badge/python-3.9-blue.svg) ![Python](https://img.shields.io/badge/python-3.10-blue.svg) | +| __Python__ | ![Python](https://img.shields.io/badge/python-3.9-blue.svg) ![Python](https://img.shields.io/badge/python-3.10-blue.svg) ![Python](https://img.shields.io/badge/python-3.11-blue.svg) | | __Package__ | [![PyPI version](https://badge.fury.io/py/biocypher.svg)](https://badge.fury.io/py/biocypher) [![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) [![Powered by the Bioregistry](https://img.shields.io/static/v1?label=Powered%20by&message=Bioregistry&color=BA274A&style=flat&logo=image/png;base64,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)](https://github.com/biopragmatics/bioregistry) | | __Build status__ | [![CI](https://github.com/biocypher/biocypher/actions/workflows/ci_cd.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/ci_cd.yaml) [![Docs build](https://github.com/biocypher/biocypher/actions/workflows/sphinx_autodoc.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/sphinx_autodoc.yaml) | | __Test coverage__ | ![Coverage](https://raw.githubusercontent.com/biocypher/biocypher/coverage/coverage.svg) | From c9f4b70dd21ba2aba8193005769ec52751ca2ad8 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Mon, 2 Oct 2023 21:21:41 +0200 Subject: [PATCH 155/343] issue #195: fix python version env variable syntax --- .github/workflows/ci_cd.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index a7ef85f4..a5eefff1 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -15,10 +15,10 @@ jobs: #---------------------------------------------- - name: Checkout Repository uses: actions/checkout@v4 - - name: Set up Python $PYTHON_VERSION + - name: Set up Python ${{env.PYTHON_VERSION}} uses: actions/setup-python@v4 with: - python-version: $PYTHON_VERSION + python-version: ${{env.PYTHON_VERSION}} - name: Install and configure Poetry uses: snok/install-poetry@v1 with: From f7d4e813832a147b24bdb59e61a9dfef432db215 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Mon, 2 Oct 2023 23:00:53 +0200 Subject: [PATCH 156/343] issue #259: separate docs and release workflows; build docs on every commit --- .github/workflows/docs.yaml | 116 +++++++++++++++++++++++++++++++ .github/workflows/release.yaml | 122 +++++++++++---------------------- 2 files changed, 156 insertions(+), 82 deletions(-) create mode 100644 .github/workflows/docs.yaml diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml new file mode 100644 index 00000000..e5394827 --- /dev/null +++ b/.github/workflows/docs.yaml @@ -0,0 +1,116 @@ +name: Docs + +on: [push] + +jobs: + build_docs: + runs-on: ubuntu-latest + env: + PYTHON_VERSION: 3.10.5 + permissions: write-all + steps: + #---------------------------------------------- + # check-out repo and set-up python and poetry + #---------------------------------------------- + - name: Check out main + uses: actions/checkout@main + - name: Setup Python + uses: actions/setup-python@v4 + with: + python-version: ${{env.PYTHON_VERSION}} + - name: Load cached Poetry installation + uses: actions/cache@v2 + with: + path: ~/.local + key: poetry-0 + - name: Install Poetry + uses: snok/install-poetry@v1 + with: + virtualenvs-create: true + virtualenvs-in-project: true + installer-parallel: true + #---------------------------------------------- + # install dependencies + #---------------------------------------------- + - name: Install dependencies + run: poetry install --no-interaction --no-root + - name: Install library + run: poetry install --no-interaction + - name: Install pandoc + run: sudo apt-get -y install pandoc + #---------------------------------------------- + # build docs + #---------------------------------------------- + - name: Test code snippets in documentation + run: poetry run make doctest --directory docs/ + - name: Build documentation + run: poetry run make html --directory docs/ + + build_and_deploy_docs: + if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') + runs-on: ubuntu-latest + env: + PYTHON_VERSION: 3.10.5 + permissions: write-all + steps: + #---------------------------------------------- + # check-out repo and set-up python and poetry + #---------------------------------------------- + - name: Check out main + uses: actions/checkout@main + - name: Setup Python + uses: actions/setup-python@v4 + with: + python-version: ${{env.PYTHON_VERSION}} + - name: Load cached Poetry installation + uses: actions/cache@v2 + with: + path: ~/.local + key: poetry-0 + - name: Install Poetry + uses: snok/install-poetry@v1 + with: + virtualenvs-create: true + virtualenvs-in-project: true + installer-parallel: true + # - name: Load cached venv + # id: cached-poetry-dependencies + # uses: actions/cache@v2 + # with: + # path: .venv + # key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }} + #---------------------------------------------- + # install dependencies + #---------------------------------------------- + - name: Install dependencies + # if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' + run: poetry install --no-interaction --no-root + - name: Install library + run: poetry install --no-interaction + - name: Install pandoc + run: sudo apt-get -y install pandoc + #---------------------------------------------- + # build docs + #---------------------------------------------- + - name: Test code snippets in documentation + run: poetry run make doctest --directory docs/ + - name: Build documentation + run: poetry run make html --directory docs/ + - name: Commit files + run: | + git config --local user.email "action@github.com" + git config --local user.name "GitHub Action" + touch docs/_build/html/.nojekyll + echo 'biocypher.org' > docs/_build/html/CNAME + git add -f docs/_build/ + git commit -m "Update autodoc" -a + #---------------------------------------------- + # deploy docs + #---------------------------------------------- + - name: Deploy + uses: s0/git-publish-subdir-action@develop + env: + REPO: self + BRANCH: gh-pages + FOLDER: docs/_build/html + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index deeabe45..e0554ad3 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -3,85 +3,43 @@ name: Release on: [push] jobs: - build_and_deploy_docs: - runs-on: ubuntu-latest - if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') - permissions: write-all - steps: - - name: Check out main - uses: actions/checkout@main - - name: Setup Python - uses: actions/setup-python@v4 - with: - python-version: 3.10.5 - - name: Load cached Poetry installation - uses: actions/cache@v2 - with: - path: ~/.local - key: poetry-0 - - name: Install Poetry - uses: snok/install-poetry@v1 - with: - virtualenvs-create: true - virtualenvs-in-project: true - installer-parallel: true - # - name: Load cached venv - # id: cached-poetry-dependencies - # uses: actions/cache@v2 - # with: - # path: .venv - # key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }} - - name: Install dependencies - # if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' - run: poetry install --no-interaction --no-root - - name: Install library - run: poetry install --no-interaction - - name: Install pandoc - run: sudo apt-get -y install pandoc - - name: Test code snippets in documentation - run: poetry run make doctest --directory docs/ - - name: Build documentation - run: poetry run make html --directory docs/ - - name: Commit files - run: | - git config --local user.email "action@github.com" - git config --local user.name "GitHub Action" - touch docs/_build/html/.nojekyll - echo 'biocypher.org' > docs/_build/html/CNAME - git add -f docs/_build/ - git commit -m "Update autodoc" -a - # using https://github.com/marketplace/actions/push-git-subdirectory-as-branch - - name: Deploy - uses: s0/git-publish-subdir-action@develop - env: - REPO: self - BRANCH: gh-pages - FOLDER: docs/_build/html - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - build_and_deploy_artifact: - if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') - runs-on: ubuntu-latest - environment: - name: pypi - url: https://test.pypi.org/project/biocypher/ - permissions: - id-token: write - steps: - - name: Checkout Repository - uses: actions/checkout@v4 - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: '3.9' - - name: Install and configure Poetry - uses: snok/install-poetry@v1 - with: - version: 1.5.1 - virtualenvs-create: false - - name: Install Dependencies - run: poetry install - - name: Build artifact - run: poetry build - #- name: Publish artifact to PyPI - # uses: pypa/gh-action-pypi-publish@release/v1 + build_and_deploy_artifact: + if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') + runs-on: ubuntu-latest + env: + PYTHON_VERSION: 3.9 + environment: + name: pypi + url: https://test.pypi.org/project/biocypher/ + permissions: + id-token: write + steps: + #---------------------------------------------- + # check-out repo and set-up python and poetry + #---------------------------------------------- + - name: Checkout Repository + uses: actions/checkout@v4 + - name: Set up Python + uses: actions/setup-python@v4 + with: + python-version: ${{env.PYTHON_VERSION}} + - name: Install and configure Poetry + uses: snok/install-poetry@v1 + with: + version: 1.5.1 + virtualenvs-create: false + #---------------------------------------------- + # install dependencies + #---------------------------------------------- + - name: Install Dependencies + run: poetry install + #---------------------------------------------- + # build artifact + #---------------------------------------------- + - name: Build artifact + run: poetry build + #---------------------------------------------- + # upload to PyPi + #---------------------------------------------- + #- name: Publish artifact to PyPI + # uses: pypa/gh-action-pypi-publish@release/v1 From 5aed1138fce7c3a11ff3e1665641a5d3e11d5115 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Mon, 2 Oct 2023 23:19:08 +0200 Subject: [PATCH 157/343] issue #259: only update test coverage badge on main branch --- .github/workflows/ci_cd.yaml | 22 +++++++++++----------- .github/workflows/docs.yaml | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index a5eefff1..90a9a571 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -113,14 +113,14 @@ jobs: - name: Generate coverage report run: poetry run coverage run -m pytest --password=your_password_here if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest' }} - #- name: Generate coverage badge - # run: poetry run coverage-badge -f -o docs/coverage/coverage.svg - # if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest' }} - #- name: Commit changes - # uses: s0/git-publish-subdir-action@develop - # if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest' }} - # env: - # REPO: self - # BRANCH: coverage - # FOLDER: docs/coverage - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Generate coverage badge + run: poetry run coverage-badge -f -o docs/coverage/coverage.svg + if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest' && github.ref == 'refs/heads/main' }} + - name: Commit changes + uses: s0/git-publish-subdir-action@develop + if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest' && github.ref == 'refs/heads/main' }} + env: + REPO: self + BRANCH: coverage + FOLDER: docs/coverage + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index e5394827..0a4e7b2a 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -1,6 +1,6 @@ name: Docs -on: [push] +on: [push, pull_request] jobs: build_docs: From a3d0a7f122177edf01d465c8a49ee32ef0181020 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Tue, 10 Oct 2023 11:08:25 +0200 Subject: [PATCH 158/343] issue #259: make autopublish testable: configure publish workflow to publish to staging (test PyPi); update test coverage to be testable on pyopensci branch --- .github/workflows/ci_cd.yaml | 5 +++-- .github/workflows/{release.yaml => publish.yaml} | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) rename .github/workflows/{release.yaml => publish.yaml} (91%) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index 90a9a571..934be99d 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -115,10 +115,11 @@ jobs: if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest' }} - name: Generate coverage badge run: poetry run coverage-badge -f -o docs/coverage/coverage.svg - if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest' && github.ref == 'refs/heads/main' }} + # TODO: set to pyopensci branch to test it -> set it back to main branch after test + if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest' && github.ref == 'refs/heads/pyopensci' }} # main - name: Commit changes uses: s0/git-publish-subdir-action@develop - if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest' && github.ref == 'refs/heads/main' }} + if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest' && github.ref == 'refs/heads/pyopensci' }} # main env: REPO: self BRANCH: coverage diff --git a/.github/workflows/release.yaml b/.github/workflows/publish.yaml similarity index 91% rename from .github/workflows/release.yaml rename to .github/workflows/publish.yaml index e0554ad3..478aff19 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/publish.yaml @@ -1,4 +1,4 @@ -name: Release +name: Publish on: [push] @@ -9,7 +9,7 @@ jobs: env: PYTHON_VERSION: 3.9 environment: - name: pypi + name: staging url: https://test.pypi.org/project/biocypher/ permissions: id-token: write @@ -41,5 +41,5 @@ jobs: #---------------------------------------------- # upload to PyPi #---------------------------------------------- - #- name: Publish artifact to PyPI - # uses: pypa/gh-action-pypi-publish@release/v1 + - name: Publish artifact to PyPI + uses: pypa/gh-action-pypi-publish@release/v1 From 7039bd00f54bf09c0968e8e94a2dc4b63004fcc9 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Tue, 10 Oct 2023 11:21:52 +0200 Subject: [PATCH 159/343] issue #259: rerun cicd to fix windows fault --- .github/workflows/publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 478aff19..c35a3732 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -9,7 +9,7 @@ jobs: env: PYTHON_VERSION: 3.9 environment: - name: staging + name: staging # uploads to test.pypi.org url: https://test.pypi.org/project/biocypher/ permissions: id-token: write From 79e280b7f12afb4e6364d9c75855fbe82b0dc792 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Wed, 11 Oct 2023 11:19:26 +0200 Subject: [PATCH 160/343] issue #254: replace single-letter variables in tests --- .gitignore | 1 + poetry.lock | 3427 +++++++++++++++++++---------------- pyproject.toml | 1 + test/test_core.py | 4 +- test/test_deduplicate.py | 12 +- test/test_driver.py | 222 +-- test/test_integration.py | 23 +- test/test_misc.py | 4 +- test/test_ontology.py | 4 +- test/test_translate.py | 222 +-- test/test_write_arango.py | 120 +- test/test_write_neo4j.py | 626 ++++--- test/test_write_postgres.py | 68 +- 13 files changed, 2575 insertions(+), 2159 deletions(-) diff --git a/.gitignore b/.gitignore index b30db48a..236c4d64 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ dist/* .empty .pytest_cache *.graphml +.idea/* diff --git a/poetry.lock b/poetry.lock index 5b4b56a8..f997ec0c 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,3 +1,5 @@ +# This file is automatically @generated by Poetry and should not be changed by hand. + [[package]] name = "alabaster" version = "0.7.13" @@ -5,6 +7,10 @@ description = "A configurable sidebar-enabled Sphinx theme" category = "dev" optional = false python-versions = ">=3.6" +files = [ + {file = "alabaster-0.7.13-py3-none-any.whl", hash = "sha256:1ee19aca801bbabb5ba3f5f258e4422dfa86f82f3e9cefb0859b283cdd7f62a3"}, + {file = "alabaster-0.7.13.tar.gz", hash = "sha256:a27a4a084d5e690e16e01e03ad2b2e552c61a65469419b907243193de1a84ae2"}, +] [[package]] name = "appdirs" @@ -13,6 +19,10 @@ description = "A small Python module for determining appropriate platform-specif category = "main" optional = false python-versions = "*" +files = [ + {file = "appdirs-1.4.4-py2.py3-none-any.whl", hash = "sha256:a841dacd6b99318a741b166adb07e19ee71a274450e68237b4650ca1055ab128"}, + {file = "appdirs-1.4.4.tar.gz", hash = "sha256:7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41"}, +] [[package]] name = "appnope" @@ -21,43 +31,62 @@ description = "Disable App Nap on macOS >= 10.9" category = "dev" optional = false python-versions = "*" +files = [ + {file = "appnope-0.1.3-py2.py3-none-any.whl", hash = "sha256:265a455292d0bd8a72453494fa24df5a11eb18373a60c7c0430889f22548605e"}, + {file = "appnope-0.1.3.tar.gz", hash = "sha256:02bd91c4de869fbb1e1c50aafc4098827a7a54ab2f39d9dcba6c9547ed920e24"}, +] [[package]] name = "asttokens" -version = "2.2.1" +version = "2.4.0" description = "Annotate AST trees with source code positions" category = "dev" optional = false python-versions = "*" +files = [ + {file = "asttokens-2.4.0-py2.py3-none-any.whl", hash = "sha256:cf8fc9e61a86461aa9fb161a14a0841a03c405fa829ac6b202670b3495d2ce69"}, + {file = "asttokens-2.4.0.tar.gz", hash = "sha256:2e0171b991b2c959acc6c49318049236844a5da1d65ba2672c4880c1c894834e"}, +] [package.dependencies] -six = "*" +six = ">=1.12.0" [package.extras] test = ["astroid", "pytest"] [[package]] name = "attrs" -version = "22.2.0" +version = "23.1.0" description = "Classes Without Boilerplate" category = "dev" optional = false -python-versions = ">=3.6" +python-versions = ">=3.7" +files = [ + {file = "attrs-23.1.0-py3-none-any.whl", hash = "sha256:1f28b4522cdc2fb4256ac1a020c78acf9cba2c6b461ccd2c126f3aa8e8335d04"}, + {file = "attrs-23.1.0.tar.gz", hash = "sha256:6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015"}, +] [package.extras] -cov = ["attrs[tests]", "coverage-enable-subprocess", "coverage[toml] (>=5.3)"] -dev = ["attrs[docs,tests]"] -docs = ["furo", "myst-parser", "sphinx", "sphinx-notfound-page", "sphinxcontrib-towncrier", "towncrier", "zope.interface"] -tests = ["attrs[tests-no-zope]", "zope.interface"] -tests-no-zope = ["cloudpickle", "cloudpickle", "hypothesis", "hypothesis", "mypy (>=0.971,<0.990)", "mypy (>=0.971,<0.990)", "pympler", "pympler", "pytest (>=4.3.0)", "pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-mypy-plugins", "pytest-xdist[psutil]", "pytest-xdist[psutil]"] +cov = ["attrs[tests]", "coverage[toml] (>=5.3)"] +dev = ["attrs[docs,tests]", "pre-commit"] +docs = ["furo", "myst-parser", "sphinx", "sphinx-notfound-page", "sphinxcontrib-towncrier", "towncrier", "zope-interface"] +tests = ["attrs[tests-no-zope]", "zope-interface"] +tests-no-zope = ["cloudpickle", "hypothesis", "mypy (>=1.1.1)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-xdist[psutil]"] [[package]] name = "babel" -version = "2.12.1" +version = "2.13.0" description = "Internationalization utilities" category = "dev" optional = false python-versions = ">=3.7" +files = [ + {file = "Babel-2.13.0-py3-none-any.whl", hash = "sha256:fbfcae1575ff78e26c7449136f1abbefc3c13ce542eeb13d43d50d8b047216ec"}, + {file = "Babel-2.13.0.tar.gz", hash = "sha256:04c3e2d28d2b7681644508f836be388ae49e0cfe91465095340395b60d00f210"}, +] + +[package.extras] +dev = ["freezegun (>=1.0,<2.0)", "pytest (>=6.0)", "pytest-cov"] [[package]] name = "backcall" @@ -66,6 +95,10 @@ description = "Specifications for callback functions passed in to an API" category = "dev" optional = false python-versions = "*" +files = [ + {file = "backcall-0.2.0-py2.py3-none-any.whl", hash = "sha256:fbbce6a29f263178a1f7915c1940bde0ec2b2a967566fe1c65c1dfb7422bd255"}, + {file = "backcall-0.2.0.tar.gz", hash = "sha256:5cbdbf27be5e7cfadb448baf0aa95508f91f2bbc6c6437cd9cd06e2a4c215e1e"}, +] [[package]] name = "beautifulsoup4" @@ -74,6 +107,10 @@ description = "Screen-scraping library" category = "dev" optional = false python-versions = ">=3.6.0" +files = [ + {file = "beautifulsoup4-4.12.2-py3-none-any.whl", hash = "sha256:bd2520ca0d9d7d12694a53d44ac482d181b4ec1888909b035a3dbf40d0f57d4a"}, + {file = "beautifulsoup4-4.12.2.tar.gz", hash = "sha256:492bbc69dca35d12daac71c4db1bfff0c876c00ef4a2ffacce226d4638eb72da"}, +] [package.dependencies] soupsieve = ">1.2" @@ -82,20 +119,71 @@ soupsieve = ">1.2" html5lib = ["html5lib"] lxml = ["lxml"] +[[package]] +name = "black" +version = "23.9.1" +description = "The uncompromising code formatter." +category = "dev" +optional = false +python-versions = ">=3.8" +files = [ + {file = "black-23.9.1-cp310-cp310-macosx_10_16_arm64.whl", hash = "sha256:d6bc09188020c9ac2555a498949401ab35bb6bf76d4e0f8ee251694664df6301"}, + {file = "black-23.9.1-cp310-cp310-macosx_10_16_universal2.whl", hash = "sha256:13ef033794029b85dfea8032c9d3b92b42b526f1ff4bf13b2182ce4e917f5100"}, + {file = "black-23.9.1-cp310-cp310-macosx_10_16_x86_64.whl", hash = "sha256:75a2dc41b183d4872d3a500d2b9c9016e67ed95738a3624f4751a0cb4818fe71"}, + {file = "black-23.9.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:13a2e4a93bb8ca74a749b6974925c27219bb3df4d42fc45e948a5d9feb5122b7"}, + {file = "black-23.9.1-cp310-cp310-win_amd64.whl", hash = "sha256:adc3e4442eef57f99b5590b245a328aad19c99552e0bdc7f0b04db6656debd80"}, + {file = "black-23.9.1-cp311-cp311-macosx_10_16_arm64.whl", hash = "sha256:8431445bf62d2a914b541da7ab3e2b4f3bc052d2ccbf157ebad18ea126efb91f"}, + {file = "black-23.9.1-cp311-cp311-macosx_10_16_universal2.whl", hash = "sha256:8fc1ddcf83f996247505db6b715294eba56ea9372e107fd54963c7553f2b6dfe"}, + {file = "black-23.9.1-cp311-cp311-macosx_10_16_x86_64.whl", hash = "sha256:7d30ec46de88091e4316b17ae58bbbfc12b2de05e069030f6b747dfc649ad186"}, + {file = "black-23.9.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:031e8c69f3d3b09e1aa471a926a1eeb0b9071f80b17689a655f7885ac9325a6f"}, + {file = "black-23.9.1-cp311-cp311-win_amd64.whl", hash = "sha256:538efb451cd50f43aba394e9ec7ad55a37598faae3348d723b59ea8e91616300"}, + {file = "black-23.9.1-cp38-cp38-macosx_10_16_arm64.whl", hash = "sha256:638619a559280de0c2aa4d76f504891c9860bb8fa214267358f0a20f27c12948"}, + {file = "black-23.9.1-cp38-cp38-macosx_10_16_universal2.whl", hash = "sha256:a732b82747235e0542c03bf352c126052c0fbc458d8a239a94701175b17d4855"}, + {file = "black-23.9.1-cp38-cp38-macosx_10_16_x86_64.whl", hash = "sha256:cf3a4d00e4cdb6734b64bf23cd4341421e8953615cba6b3670453737a72ec204"}, + {file = "black-23.9.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cf99f3de8b3273a8317681d8194ea222f10e0133a24a7548c73ce44ea1679377"}, + {file = "black-23.9.1-cp38-cp38-win_amd64.whl", hash = "sha256:14f04c990259576acd093871e7e9b14918eb28f1866f91968ff5524293f9c573"}, + {file = "black-23.9.1-cp39-cp39-macosx_10_16_arm64.whl", hash = "sha256:c619f063c2d68f19b2d7270f4cf3192cb81c9ec5bc5ba02df91471d0b88c4c5c"}, + {file = "black-23.9.1-cp39-cp39-macosx_10_16_universal2.whl", hash = "sha256:6a3b50e4b93f43b34a9d3ef00d9b6728b4a722c997c99ab09102fd5efdb88325"}, + {file = "black-23.9.1-cp39-cp39-macosx_10_16_x86_64.whl", hash = "sha256:c46767e8df1b7beefb0899c4a95fb43058fa8500b6db144f4ff3ca38eb2f6393"}, + {file = "black-23.9.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:50254ebfa56aa46a9fdd5d651f9637485068a1adf42270148cd101cdf56e0ad9"}, + {file = "black-23.9.1-cp39-cp39-win_amd64.whl", hash = "sha256:403397c033adbc45c2bd41747da1f7fc7eaa44efbee256b53842470d4ac5a70f"}, + {file = "black-23.9.1-py3-none-any.whl", hash = "sha256:6ccd59584cc834b6d127628713e4b6b968e5f79572da66284532525a042549f9"}, + {file = "black-23.9.1.tar.gz", hash = "sha256:24b6b3ff5c6d9ea08a8888f6977eae858e1f340d7260cf56d70a49823236b62d"}, +] + +[package.dependencies] +click = ">=8.0.0" +mypy-extensions = ">=0.4.3" +packaging = ">=22.0" +pathspec = ">=0.9.0" +platformdirs = ">=2" +tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} +typing-extensions = {version = ">=4.0.1", markers = "python_version < \"3.11\""} + +[package.extras] +colorama = ["colorama (>=0.4.3)"] +d = ["aiohttp (>=3.7.4)"] +jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"] +uvloop = ["uvloop (>=0.15.2)"] + [[package]] name = "bleach" -version = "6.0.0" +version = "6.1.0" description = "An easy safelist-based HTML-sanitizing tool." category = "dev" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" +files = [ + {file = "bleach-6.1.0-py3-none-any.whl", hash = "sha256:3225f354cfc436b9789c66c4ee030194bee0568fbf9cbdad3bc8b5c26c5f12b6"}, + {file = "bleach-6.1.0.tar.gz", hash = "sha256:0a31f1837963c41d46bbf1331b8778e1308ea0791db03cc4e7357b97cf42a8fe"}, +] [package.dependencies] six = ">=1.9.0" webencodings = "*" [package.extras] -css = ["tinycss2 (>=1.1.0,<1.2)"] +css = ["tinycss2 (>=1.1.0,<1.3)"] [[package]] name = "bump2version" @@ -104,57 +192,238 @@ description = "Version-bump your software with a single command!" category = "dev" optional = false python-versions = ">=3.5" +files = [ + {file = "bump2version-1.0.1-py2.py3-none-any.whl", hash = "sha256:37f927ea17cde7ae2d7baf832f8e80ce3777624554a653006c9144f8017fe410"}, + {file = "bump2version-1.0.1.tar.gz", hash = "sha256:762cb2bfad61f4ec8e2bdf452c7c267416f8c70dd9ecb1653fd0bbb01fa936e6"}, +] [[package]] name = "cachetools" -version = "5.3.0" +version = "5.3.1" description = "Extensible memoizing collections and decorators" category = "dev" optional = false -python-versions = "~=3.7" +python-versions = ">=3.7" +files = [ + {file = "cachetools-5.3.1-py3-none-any.whl", hash = "sha256:95ef631eeaea14ba2e36f06437f36463aac3a096799e876ee55e5cdccb102590"}, + {file = "cachetools-5.3.1.tar.gz", hash = "sha256:dce83f2d9b4e1f732a8cd44af8e8fab2dbe46201467fc98b3ef8f269092bf62b"}, +] [[package]] name = "certifi" -version = "2022.12.7" +version = "2023.7.22" description = "Python package for providing Mozilla's CA Bundle." category = "main" optional = false python-versions = ">=3.6" +files = [ + {file = "certifi-2023.7.22-py3-none-any.whl", hash = "sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9"}, + {file = "certifi-2023.7.22.tar.gz", hash = "sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082"}, +] [[package]] name = "cffi" -version = "1.15.1" +version = "1.16.0" description = "Foreign Function Interface for Python calling C code." category = "dev" optional = false -python-versions = "*" +python-versions = ">=3.8" +files = [ + {file = "cffi-1.16.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:6b3d6606d369fc1da4fd8c357d026317fbb9c9b75d36dc16e90e84c26854b088"}, + {file = "cffi-1.16.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ac0f5edd2360eea2f1daa9e26a41db02dd4b0451b48f7c318e217ee092a213e9"}, + {file = "cffi-1.16.0-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7e61e3e4fa664a8588aa25c883eab612a188c725755afff6289454d6362b9673"}, + {file = "cffi-1.16.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a72e8961a86d19bdb45851d8f1f08b041ea37d2bd8d4fd19903bc3083d80c896"}, + {file = "cffi-1.16.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5b50bf3f55561dac5438f8e70bfcdfd74543fd60df5fa5f62d94e5867deca684"}, + {file = "cffi-1.16.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7651c50c8c5ef7bdb41108b7b8c5a83013bfaa8a935590c5d74627c047a583c7"}, + {file = "cffi-1.16.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e4108df7fe9b707191e55f33efbcb2d81928e10cea45527879a4749cbe472614"}, + {file = "cffi-1.16.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:32c68ef735dbe5857c810328cb2481e24722a59a2003018885514d4c09af9743"}, + {file = "cffi-1.16.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:673739cb539f8cdaa07d92d02efa93c9ccf87e345b9a0b556e3ecc666718468d"}, + {file = "cffi-1.16.0-cp310-cp310-win32.whl", hash = "sha256:9f90389693731ff1f659e55c7d1640e2ec43ff725cc61b04b2f9c6d8d017df6a"}, + {file = "cffi-1.16.0-cp310-cp310-win_amd64.whl", hash = "sha256:e6024675e67af929088fda399b2094574609396b1decb609c55fa58b028a32a1"}, + {file = "cffi-1.16.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:b84834d0cf97e7d27dd5b7f3aca7b6e9263c56308ab9dc8aae9784abb774d404"}, + {file = "cffi-1.16.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:1b8ebc27c014c59692bb2664c7d13ce7a6e9a629be20e54e7271fa696ff2b417"}, + {file = "cffi-1.16.0-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ee07e47c12890ef248766a6e55bd38ebfb2bb8edd4142d56db91b21ea68b7627"}, + {file = "cffi-1.16.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d8a9d3ebe49f084ad71f9269834ceccbf398253c9fac910c4fd7053ff1386936"}, + {file = "cffi-1.16.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e70f54f1796669ef691ca07d046cd81a29cb4deb1e5f942003f401c0c4a2695d"}, + {file = "cffi-1.16.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5bf44d66cdf9e893637896c7faa22298baebcd18d1ddb6d2626a6e39793a1d56"}, + {file = "cffi-1.16.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7b78010e7b97fef4bee1e896df8a4bbb6712b7f05b7ef630f9d1da00f6444d2e"}, + {file = "cffi-1.16.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:c6a164aa47843fb1b01e941d385aab7215563bb8816d80ff3a363a9f8448a8dc"}, + {file = "cffi-1.16.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e09f3ff613345df5e8c3667da1d918f9149bd623cd9070c983c013792a9a62eb"}, + {file = "cffi-1.16.0-cp311-cp311-win32.whl", hash = "sha256:2c56b361916f390cd758a57f2e16233eb4f64bcbeee88a4881ea90fca14dc6ab"}, + {file = "cffi-1.16.0-cp311-cp311-win_amd64.whl", hash = "sha256:db8e577c19c0fda0beb7e0d4e09e0ba74b1e4c092e0e40bfa12fe05b6f6d75ba"}, + {file = "cffi-1.16.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:fa3a0128b152627161ce47201262d3140edb5a5c3da88d73a1b790a959126956"}, + {file = "cffi-1.16.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:68e7c44931cc171c54ccb702482e9fc723192e88d25a0e133edd7aff8fcd1f6e"}, + {file = "cffi-1.16.0-cp312-cp312-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:abd808f9c129ba2beda4cfc53bde801e5bcf9d6e0f22f095e45327c038bfe68e"}, + {file = "cffi-1.16.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:88e2b3c14bdb32e440be531ade29d3c50a1a59cd4e51b1dd8b0865c54ea5d2e2"}, + {file = "cffi-1.16.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:fcc8eb6d5902bb1cf6dc4f187ee3ea80a1eba0a89aba40a5cb20a5087d961357"}, + {file = "cffi-1.16.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b7be2d771cdba2942e13215c4e340bfd76398e9227ad10402a8767ab1865d2e6"}, + {file = "cffi-1.16.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e715596e683d2ce000574bae5d07bd522c781a822866c20495e52520564f0969"}, + {file = "cffi-1.16.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:2d92b25dbf6cae33f65005baf472d2c245c050b1ce709cc4588cdcdd5495b520"}, + {file = "cffi-1.16.0-cp312-cp312-win32.whl", hash = "sha256:b2ca4e77f9f47c55c194982e10f058db063937845bb2b7a86c84a6cfe0aefa8b"}, + {file = "cffi-1.16.0-cp312-cp312-win_amd64.whl", hash = "sha256:68678abf380b42ce21a5f2abde8efee05c114c2fdb2e9eef2efdb0257fba1235"}, + {file = "cffi-1.16.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0c9ef6ff37e974b73c25eecc13952c55bceed9112be2d9d938ded8e856138bcc"}, + {file = "cffi-1.16.0-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a09582f178759ee8128d9270cd1344154fd473bb77d94ce0aeb2a93ebf0feaf0"}, + {file = "cffi-1.16.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e760191dd42581e023a68b758769e2da259b5d52e3103c6060ddc02c9edb8d7b"}, + {file = "cffi-1.16.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:80876338e19c951fdfed6198e70bc88f1c9758b94578d5a7c4c91a87af3cf31c"}, + {file = "cffi-1.16.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a6a14b17d7e17fa0d207ac08642c8820f84f25ce17a442fd15e27ea18d67c59b"}, + {file = "cffi-1.16.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6602bc8dc6f3a9e02b6c22c4fc1e47aa50f8f8e6d3f78a5e16ac33ef5fefa324"}, + {file = "cffi-1.16.0-cp38-cp38-win32.whl", hash = "sha256:131fd094d1065b19540c3d72594260f118b231090295d8c34e19a7bbcf2e860a"}, + {file = "cffi-1.16.0-cp38-cp38-win_amd64.whl", hash = "sha256:31d13b0f99e0836b7ff893d37af07366ebc90b678b6664c955b54561fc36ef36"}, + {file = "cffi-1.16.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:582215a0e9adbe0e379761260553ba11c58943e4bbe9c36430c4ca6ac74b15ed"}, + {file = "cffi-1.16.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:b29ebffcf550f9da55bec9e02ad430c992a87e5f512cd63388abb76f1036d8d2"}, + {file = "cffi-1.16.0-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:dc9b18bf40cc75f66f40a7379f6a9513244fe33c0e8aa72e2d56b0196a7ef872"}, + {file = "cffi-1.16.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9cb4a35b3642fc5c005a6755a5d17c6c8b6bcb6981baf81cea8bfbc8903e8ba8"}, + {file = "cffi-1.16.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b86851a328eedc692acf81fb05444bdf1891747c25af7529e39ddafaf68a4f3f"}, + {file = "cffi-1.16.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c0f31130ebc2d37cdd8e44605fb5fa7ad59049298b3f745c74fa74c62fbfcfc4"}, + {file = "cffi-1.16.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8f8e709127c6c77446a8c0a8c8bf3c8ee706a06cd44b1e827c3e6a2ee6b8c098"}, + {file = "cffi-1.16.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:748dcd1e3d3d7cd5443ef03ce8685043294ad6bd7c02a38d1bd367cfd968e000"}, + {file = "cffi-1.16.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8895613bcc094d4a1b2dbe179d88d7fb4a15cee43c052e8885783fac397d91fe"}, + {file = "cffi-1.16.0-cp39-cp39-win32.whl", hash = "sha256:ed86a35631f7bfbb28e108dd96773b9d5a6ce4811cf6ea468bb6a359b256b1e4"}, + {file = "cffi-1.16.0-cp39-cp39-win_amd64.whl", hash = "sha256:3686dffb02459559c74dd3d81748269ffb0eb027c39a6fc99502de37d501faa8"}, + {file = "cffi-1.16.0.tar.gz", hash = "sha256:bcb3ef43e58665bbda2fb198698fcae6776483e0c4a631aa5647806c25e02cc0"}, +] [package.dependencies] pycparser = "*" [[package]] name = "cfgv" -version = "3.3.1" +version = "3.4.0" description = "Validate configuration and produce human readable error messages." category = "dev" optional = false -python-versions = ">=3.6.1" +python-versions = ">=3.8" +files = [ + {file = "cfgv-3.4.0-py2.py3-none-any.whl", hash = "sha256:b7265b1f29fd3316bfcd2b330d63d024f2bfd8bcb8b0272f8e19a504856c48f9"}, + {file = "cfgv-3.4.0.tar.gz", hash = "sha256:e52591d4c5f5dead8e0f673fb16db7949d2cfb3f7da4582893288f0ded8fe560"}, +] [[package]] name = "chardet" -version = "5.1.0" +version = "5.2.0" description = "Universal encoding detector for Python 3" category = "dev" optional = false python-versions = ">=3.7" +files = [ + {file = "chardet-5.2.0-py3-none-any.whl", hash = "sha256:e1cf59446890a00105fe7b7912492ea04b6e6f06d4b742b2c788469e34c82970"}, + {file = "chardet-5.2.0.tar.gz", hash = "sha256:1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7"}, +] [[package]] name = "charset-normalizer" -version = "3.1.0" +version = "3.3.0" description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." category = "main" optional = false python-versions = ">=3.7.0" +files = [ + {file = "charset-normalizer-3.3.0.tar.gz", hash = "sha256:63563193aec44bce707e0c5ca64ff69fa72ed7cf34ce6e11d5127555756fd2f6"}, + {file = "charset_normalizer-3.3.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:effe5406c9bd748a871dbcaf3ac69167c38d72db8c9baf3ff954c344f31c4cbe"}, + {file = "charset_normalizer-3.3.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:4162918ef3098851fcd8a628bf9b6a98d10c380725df9e04caf5ca6dd48c847a"}, + {file = "charset_normalizer-3.3.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:0570d21da019941634a531444364f2482e8db0b3425fcd5ac0c36565a64142c8"}, + {file = "charset_normalizer-3.3.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5707a746c6083a3a74b46b3a631d78d129edab06195a92a8ece755aac25a3f3d"}, + {file = "charset_normalizer-3.3.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:278c296c6f96fa686d74eb449ea1697f3c03dc28b75f873b65b5201806346a69"}, + {file = "charset_normalizer-3.3.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a4b71f4d1765639372a3b32d2638197f5cd5221b19531f9245fcc9ee62d38f56"}, + {file = "charset_normalizer-3.3.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f5969baeaea61c97efa706b9b107dcba02784b1601c74ac84f2a532ea079403e"}, + {file = "charset_normalizer-3.3.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a3f93dab657839dfa61025056606600a11d0b696d79386f974e459a3fbc568ec"}, + {file = "charset_normalizer-3.3.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:db756e48f9c5c607b5e33dd36b1d5872d0422e960145b08ab0ec7fd420e9d649"}, + {file = "charset_normalizer-3.3.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:232ac332403e37e4a03d209a3f92ed9071f7d3dbda70e2a5e9cff1c4ba9f0678"}, + {file = "charset_normalizer-3.3.0-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:e5c1502d4ace69a179305abb3f0bb6141cbe4714bc9b31d427329a95acfc8bdd"}, + {file = "charset_normalizer-3.3.0-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:2502dd2a736c879c0f0d3e2161e74d9907231e25d35794584b1ca5284e43f596"}, + {file = "charset_normalizer-3.3.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:23e8565ab7ff33218530bc817922fae827420f143479b753104ab801145b1d5b"}, + {file = "charset_normalizer-3.3.0-cp310-cp310-win32.whl", hash = "sha256:1872d01ac8c618a8da634e232f24793883d6e456a66593135aeafe3784b0848d"}, + {file = "charset_normalizer-3.3.0-cp310-cp310-win_amd64.whl", hash = "sha256:557b21a44ceac6c6b9773bc65aa1b4cc3e248a5ad2f5b914b91579a32e22204d"}, + {file = "charset_normalizer-3.3.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:d7eff0f27edc5afa9e405f7165f85a6d782d308f3b6b9d96016c010597958e63"}, + {file = "charset_normalizer-3.3.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6a685067d05e46641d5d1623d7c7fdf15a357546cbb2f71b0ebde91b175ffc3e"}, + {file = "charset_normalizer-3.3.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:0d3d5b7db9ed8a2b11a774db2bbea7ba1884430a205dbd54a32d61d7c2a190fa"}, + {file = "charset_normalizer-3.3.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2935ffc78db9645cb2086c2f8f4cfd23d9b73cc0dc80334bc30aac6f03f68f8c"}, + {file = "charset_normalizer-3.3.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9fe359b2e3a7729010060fbca442ca225280c16e923b37db0e955ac2a2b72a05"}, + {file = "charset_normalizer-3.3.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:380c4bde80bce25c6e4f77b19386f5ec9db230df9f2f2ac1e5ad7af2caa70459"}, + {file = "charset_normalizer-3.3.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f0d1e3732768fecb052d90d62b220af62ead5748ac51ef61e7b32c266cac9293"}, + {file = "charset_normalizer-3.3.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1b2919306936ac6efb3aed1fbf81039f7087ddadb3160882a57ee2ff74fd2382"}, + {file = "charset_normalizer-3.3.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:f8888e31e3a85943743f8fc15e71536bda1c81d5aa36d014a3c0c44481d7db6e"}, + {file = "charset_normalizer-3.3.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:82eb849f085624f6a607538ee7b83a6d8126df6d2f7d3b319cb837b289123078"}, + {file = "charset_normalizer-3.3.0-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:7b8b8bf1189b3ba9b8de5c8db4d541b406611a71a955bbbd7385bbc45fcb786c"}, + {file = "charset_normalizer-3.3.0-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:5adf257bd58c1b8632046bbe43ee38c04e1038e9d37de9c57a94d6bd6ce5da34"}, + {file = "charset_normalizer-3.3.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:c350354efb159b8767a6244c166f66e67506e06c8924ed74669b2c70bc8735b1"}, + {file = "charset_normalizer-3.3.0-cp311-cp311-win32.whl", hash = "sha256:02af06682e3590ab952599fbadac535ede5d60d78848e555aa58d0c0abbde786"}, + {file = "charset_normalizer-3.3.0-cp311-cp311-win_amd64.whl", hash = "sha256:86d1f65ac145e2c9ed71d8ffb1905e9bba3a91ae29ba55b4c46ae6fc31d7c0d4"}, + {file = "charset_normalizer-3.3.0-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:3b447982ad46348c02cb90d230b75ac34e9886273df3a93eec0539308a6296d7"}, + {file = "charset_normalizer-3.3.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:abf0d9f45ea5fb95051c8bfe43cb40cda383772f7e5023a83cc481ca2604d74e"}, + {file = "charset_normalizer-3.3.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:b09719a17a2301178fac4470d54b1680b18a5048b481cb8890e1ef820cb80455"}, + {file = "charset_normalizer-3.3.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b3d9b48ee6e3967b7901c052b670c7dda6deb812c309439adaffdec55c6d7b78"}, + {file = "charset_normalizer-3.3.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:edfe077ab09442d4ef3c52cb1f9dab89bff02f4524afc0acf2d46be17dc479f5"}, + {file = "charset_normalizer-3.3.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3debd1150027933210c2fc321527c2299118aa929c2f5a0a80ab6953e3bd1908"}, + {file = "charset_normalizer-3.3.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:86f63face3a527284f7bb8a9d4f78988e3c06823f7bea2bd6f0e0e9298ca0403"}, + {file = "charset_normalizer-3.3.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:24817cb02cbef7cd499f7c9a2735286b4782bd47a5b3516a0e84c50eab44b98e"}, + {file = "charset_normalizer-3.3.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:c71f16da1ed8949774ef79f4a0260d28b83b3a50c6576f8f4f0288d109777989"}, + {file = "charset_normalizer-3.3.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:9cf3126b85822c4e53aa28c7ec9869b924d6fcfb76e77a45c44b83d91afd74f9"}, + {file = "charset_normalizer-3.3.0-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:b3b2316b25644b23b54a6f6401074cebcecd1244c0b8e80111c9a3f1c8e83d65"}, + {file = "charset_normalizer-3.3.0-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:03680bb39035fbcffe828eae9c3f8afc0428c91d38e7d61aa992ef7a59fb120e"}, + {file = "charset_normalizer-3.3.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:4cc152c5dd831641e995764f9f0b6589519f6f5123258ccaca8c6d34572fefa8"}, + {file = "charset_normalizer-3.3.0-cp312-cp312-win32.whl", hash = "sha256:b8f3307af845803fb0b060ab76cf6dd3a13adc15b6b451f54281d25911eb92df"}, + {file = "charset_normalizer-3.3.0-cp312-cp312-win_amd64.whl", hash = "sha256:8eaf82f0eccd1505cf39a45a6bd0a8cf1c70dcfc30dba338207a969d91b965c0"}, + {file = "charset_normalizer-3.3.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:dc45229747b67ffc441b3de2f3ae5e62877a282ea828a5bdb67883c4ee4a8810"}, + {file = "charset_normalizer-3.3.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2f4a0033ce9a76e391542c182f0d48d084855b5fcba5010f707c8e8c34663d77"}, + {file = "charset_normalizer-3.3.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ada214c6fa40f8d800e575de6b91a40d0548139e5dc457d2ebb61470abf50186"}, + {file = "charset_normalizer-3.3.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b1121de0e9d6e6ca08289583d7491e7fcb18a439305b34a30b20d8215922d43c"}, + {file = "charset_normalizer-3.3.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1063da2c85b95f2d1a430f1c33b55c9c17ffaf5e612e10aeaad641c55a9e2b9d"}, + {file = "charset_normalizer-3.3.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:70f1d09c0d7748b73290b29219e854b3207aea922f839437870d8cc2168e31cc"}, + {file = "charset_normalizer-3.3.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:250c9eb0f4600361dd80d46112213dff2286231d92d3e52af1e5a6083d10cad9"}, + {file = "charset_normalizer-3.3.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:750b446b2ffce1739e8578576092179160f6d26bd5e23eb1789c4d64d5af7dc7"}, + {file = "charset_normalizer-3.3.0-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:fc52b79d83a3fe3a360902d3f5d79073a993597d48114c29485e9431092905d8"}, + {file = "charset_normalizer-3.3.0-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:588245972aca710b5b68802c8cad9edaa98589b1b42ad2b53accd6910dad3545"}, + {file = "charset_normalizer-3.3.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:e39c7eb31e3f5b1f88caff88bcff1b7f8334975b46f6ac6e9fc725d829bc35d4"}, + {file = "charset_normalizer-3.3.0-cp37-cp37m-win32.whl", hash = "sha256:abecce40dfebbfa6abf8e324e1860092eeca6f7375c8c4e655a8afb61af58f2c"}, + {file = "charset_normalizer-3.3.0-cp37-cp37m-win_amd64.whl", hash = "sha256:24a91a981f185721542a0b7c92e9054b7ab4fea0508a795846bc5b0abf8118d4"}, + {file = "charset_normalizer-3.3.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:67b8cc9574bb518ec76dc8e705d4c39ae78bb96237cb533edac149352c1f39fe"}, + {file = "charset_normalizer-3.3.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ac71b2977fb90c35d41c9453116e283fac47bb9096ad917b8819ca8b943abecd"}, + {file = "charset_normalizer-3.3.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:3ae38d325b512f63f8da31f826e6cb6c367336f95e418137286ba362925c877e"}, + {file = "charset_normalizer-3.3.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:542da1178c1c6af8873e143910e2269add130a299c9106eef2594e15dae5e482"}, + {file = "charset_normalizer-3.3.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:30a85aed0b864ac88309b7d94be09f6046c834ef60762a8833b660139cfbad13"}, + {file = "charset_normalizer-3.3.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:aae32c93e0f64469f74ccc730a7cb21c7610af3a775157e50bbd38f816536b38"}, + {file = "charset_normalizer-3.3.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:15b26ddf78d57f1d143bdf32e820fd8935d36abe8a25eb9ec0b5a71c82eb3895"}, + {file = "charset_normalizer-3.3.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7f5d10bae5d78e4551b7be7a9b29643a95aded9d0f602aa2ba584f0388e7a557"}, + {file = "charset_normalizer-3.3.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:249c6470a2b60935bafd1d1d13cd613f8cd8388d53461c67397ee6a0f5dce741"}, + {file = "charset_normalizer-3.3.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:c5a74c359b2d47d26cdbbc7845e9662d6b08a1e915eb015d044729e92e7050b7"}, + {file = "charset_normalizer-3.3.0-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:b5bcf60a228acae568e9911f410f9d9e0d43197d030ae5799e20dca8df588287"}, + {file = "charset_normalizer-3.3.0-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:187d18082694a29005ba2944c882344b6748d5be69e3a89bf3cc9d878e548d5a"}, + {file = "charset_normalizer-3.3.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:81bf654678e575403736b85ba3a7867e31c2c30a69bc57fe88e3ace52fb17b89"}, + {file = "charset_normalizer-3.3.0-cp38-cp38-win32.whl", hash = "sha256:85a32721ddde63c9df9ebb0d2045b9691d9750cb139c161c80e500d210f5e26e"}, + {file = "charset_normalizer-3.3.0-cp38-cp38-win_amd64.whl", hash = "sha256:468d2a840567b13a590e67dd276c570f8de00ed767ecc611994c301d0f8c014f"}, + {file = "charset_normalizer-3.3.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:e0fc42822278451bc13a2e8626cf2218ba570f27856b536e00cfa53099724828"}, + {file = "charset_normalizer-3.3.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:09c77f964f351a7369cc343911e0df63e762e42bac24cd7d18525961c81754f4"}, + {file = "charset_normalizer-3.3.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:12ebea541c44fdc88ccb794a13fe861cc5e35d64ed689513a5c03d05b53b7c82"}, + {file = "charset_normalizer-3.3.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:805dfea4ca10411a5296bcc75638017215a93ffb584c9e344731eef0dcfb026a"}, + {file = "charset_normalizer-3.3.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:96c2b49eb6a72c0e4991d62406e365d87067ca14c1a729a870d22354e6f68115"}, + {file = "charset_normalizer-3.3.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:aaf7b34c5bc56b38c931a54f7952f1ff0ae77a2e82496583b247f7c969eb1479"}, + {file = "charset_normalizer-3.3.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:619d1c96099be5823db34fe89e2582b336b5b074a7f47f819d6b3a57ff7bdb86"}, + {file = "charset_normalizer-3.3.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a0ac5e7015a5920cfce654c06618ec40c33e12801711da6b4258af59a8eff00a"}, + {file = "charset_normalizer-3.3.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:93aa7eef6ee71c629b51ef873991d6911b906d7312c6e8e99790c0f33c576f89"}, + {file = "charset_normalizer-3.3.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:7966951325782121e67c81299a031f4c115615e68046f79b85856b86ebffc4cd"}, + {file = "charset_normalizer-3.3.0-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:02673e456dc5ab13659f85196c534dc596d4ef260e4d86e856c3b2773ce09843"}, + {file = "charset_normalizer-3.3.0-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:c2af80fb58f0f24b3f3adcb9148e6203fa67dd3f61c4af146ecad033024dde43"}, + {file = "charset_normalizer-3.3.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:153e7b6e724761741e0974fc4dcd406d35ba70b92bfe3fedcb497226c93b9da7"}, + {file = "charset_normalizer-3.3.0-cp39-cp39-win32.whl", hash = "sha256:d47ecf253780c90ee181d4d871cd655a789da937454045b17b5798da9393901a"}, + {file = "charset_normalizer-3.3.0-cp39-cp39-win_amd64.whl", hash = "sha256:d97d85fa63f315a8bdaba2af9a6a686e0eceab77b3089af45133252618e70884"}, + {file = "charset_normalizer-3.3.0-py3-none-any.whl", hash = "sha256:e46cd37076971c1040fc8c41273a8b3e2c624ce4f2be3f5dfcb7a430c1d3acc2"}, +] + +[[package]] +name = "click" +version = "8.1.7" +description = "Composable command line interface toolkit" +category = "dev" +optional = false +python-versions = ">=3.7" +files = [ + {file = "click-8.1.7-py3-none-any.whl", hash = "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28"}, + {file = "click-8.1.7.tar.gz", hash = "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de"}, +] + +[package.dependencies] +colorama = {version = "*", markers = "platform_system == \"Windows\""} [[package]] name = "colorama" @@ -163,6 +432,10 @@ description = "Cross-platform colored terminal text." category = "main" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7" +files = [ + {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"}, + {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"}, +] [[package]] name = "colorlog" @@ -171,6 +444,10 @@ description = "Add colours to the output of Python's logging module." category = "main" optional = false python-versions = ">=3.6" +files = [ + {file = "colorlog-6.7.0-py2.py3-none-any.whl", hash = "sha256:0d33ca236784a1ba3ff9c532d4964126d8a2c44f1f0cb1d2b0728196f512f662"}, + {file = "colorlog-6.7.0.tar.gz", hash = "sha256:bd94bd21c1e13fac7bd3153f4bc3a7dc0eb0974b8bc2fdf1a989e474f6e582e5"}, +] [package.dependencies] colorama = {version = "*", markers = "sys_platform == \"win32\""} @@ -180,14 +457,18 @@ development = ["black", "flake8", "mypy", "pytest", "types-colorama"] [[package]] name = "comm" -version = "0.1.3" +version = "0.1.4" description = "Jupyter Python Comm implementation, for usage in ipykernel, xeus-python etc." category = "dev" optional = false python-versions = ">=3.6" +files = [ + {file = "comm-0.1.4-py3-none-any.whl", hash = "sha256:6d52794cba11b36ed9860999cd10fd02d6b2eac177068fdd585e1e2f8a96e67a"}, + {file = "comm-0.1.4.tar.gz", hash = "sha256:354e40a59c9dd6db50c5cc6b4acc887d82e9603787f83b68c01a80a923984d15"}, +] [package.dependencies] -traitlets = ">=5.3" +traitlets = ">=4" [package.extras] lint = ["black (>=22.6.0)", "mdformat (>0.7)", "mdformat-gfm (>=0.3.5)", "ruff (>=0.0.156)"] @@ -201,6 +482,51 @@ description = "Python library for calculating contours of 2D quadrilateral grids category = "dev" optional = false python-versions = ">=3.8" +files = [ + {file = "contourpy-1.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:89f06eff3ce2f4b3eb24c1055a26981bffe4e7264acd86f15b97e40530b794bc"}, + {file = "contourpy-1.1.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:dffcc2ddec1782dd2f2ce1ef16f070861af4fb78c69862ce0aab801495dda6a3"}, + {file = "contourpy-1.1.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:25ae46595e22f93592d39a7eac3d638cda552c3e1160255258b695f7b58e5655"}, + {file = "contourpy-1.1.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:17cfaf5ec9862bc93af1ec1f302457371c34e688fbd381f4035a06cd47324f48"}, + {file = "contourpy-1.1.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:18a64814ae7bce73925131381603fff0116e2df25230dfc80d6d690aa6e20b37"}, + {file = "contourpy-1.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:90c81f22b4f572f8a2110b0b741bb64e5a6427e0a198b2cdc1fbaf85f352a3aa"}, + {file = "contourpy-1.1.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:53cc3a40635abedbec7f1bde60f8c189c49e84ac180c665f2cd7c162cc454baa"}, + {file = "contourpy-1.1.0-cp310-cp310-win32.whl", hash = "sha256:9b2dd2ca3ac561aceef4c7c13ba654aaa404cf885b187427760d7f7d4c57cff8"}, + {file = "contourpy-1.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:1f795597073b09d631782e7245016a4323cf1cf0b4e06eef7ea6627e06a37ff2"}, + {file = "contourpy-1.1.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:0b7b04ed0961647691cfe5d82115dd072af7ce8846d31a5fac6c142dcce8b882"}, + {file = "contourpy-1.1.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:27bc79200c742f9746d7dd51a734ee326a292d77e7d94c8af6e08d1e6c15d545"}, + {file = "contourpy-1.1.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:052cc634bf903c604ef1a00a5aa093c54f81a2612faedaa43295809ffdde885e"}, + {file = "contourpy-1.1.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9382a1c0bc46230fb881c36229bfa23d8c303b889b788b939365578d762b5c18"}, + {file = "contourpy-1.1.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e5cec36c5090e75a9ac9dbd0ff4a8cf7cecd60f1b6dc23a374c7d980a1cd710e"}, + {file = "contourpy-1.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1f0cbd657e9bde94cd0e33aa7df94fb73c1ab7799378d3b3f902eb8eb2e04a3a"}, + {file = "contourpy-1.1.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:181cbace49874f4358e2929aaf7ba84006acb76694102e88dd15af861996c16e"}, + {file = "contourpy-1.1.0-cp311-cp311-win32.whl", hash = "sha256:edb989d31065b1acef3828a3688f88b2abb799a7db891c9e282df5ec7e46221b"}, + {file = "contourpy-1.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:fb3b7d9e6243bfa1efb93ccfe64ec610d85cfe5aec2c25f97fbbd2e58b531256"}, + {file = "contourpy-1.1.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:bcb41692aa09aeb19c7c213411854402f29f6613845ad2453d30bf421fe68fed"}, + {file = "contourpy-1.1.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:5d123a5bc63cd34c27ff9c7ac1cd978909e9c71da12e05be0231c608048bb2ae"}, + {file = "contourpy-1.1.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:62013a2cf68abc80dadfd2307299bfa8f5aa0dcaec5b2954caeb5fa094171103"}, + {file = "contourpy-1.1.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0b6616375d7de55797d7a66ee7d087efe27f03d336c27cf1f32c02b8c1a5ac70"}, + {file = "contourpy-1.1.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:317267d915490d1e84577924bd61ba71bf8681a30e0d6c545f577363157e5e94"}, + {file = "contourpy-1.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d551f3a442655f3dcc1285723f9acd646ca5858834efeab4598d706206b09c9f"}, + {file = "contourpy-1.1.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:e7a117ce7df5a938fe035cad481b0189049e8d92433b4b33aa7fc609344aafa1"}, + {file = "contourpy-1.1.0-cp38-cp38-win32.whl", hash = "sha256:108dfb5b3e731046a96c60bdc46a1a0ebee0760418951abecbe0fc07b5b93b27"}, + {file = "contourpy-1.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:d4f26b25b4f86087e7d75e63212756c38546e70f2a92d2be44f80114826e1cd4"}, + {file = "contourpy-1.1.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:bc00bb4225d57bff7ebb634646c0ee2a1298402ec10a5fe7af79df9a51c1bfd9"}, + {file = "contourpy-1.1.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:189ceb1525eb0655ab8487a9a9c41f42a73ba52d6789754788d1883fb06b2d8a"}, + {file = "contourpy-1.1.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9f2931ed4741f98f74b410b16e5213f71dcccee67518970c42f64153ea9313b9"}, + {file = "contourpy-1.1.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:30f511c05fab7f12e0b1b7730ebdc2ec8deedcfb505bc27eb570ff47c51a8f15"}, + {file = "contourpy-1.1.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:143dde50520a9f90e4a2703f367cf8ec96a73042b72e68fcd184e1279962eb6f"}, + {file = "contourpy-1.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e94bef2580e25b5fdb183bf98a2faa2adc5b638736b2c0a4da98691da641316a"}, + {file = "contourpy-1.1.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:ed614aea8462735e7d70141374bd7650afd1c3f3cb0c2dbbcbe44e14331bf002"}, + {file = "contourpy-1.1.0-cp39-cp39-win32.whl", hash = "sha256:71551f9520f008b2950bef5f16b0e3587506ef4f23c734b71ffb7b89f8721999"}, + {file = "contourpy-1.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:438ba416d02f82b692e371858143970ed2eb6337d9cdbbede0d8ad9f3d7dd17d"}, + {file = "contourpy-1.1.0-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:a698c6a7a432789e587168573a864a7ea374c6be8d4f31f9d87c001d5a843493"}, + {file = "contourpy-1.1.0-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:397b0ac8a12880412da3551a8cb5a187d3298a72802b45a3bd1805e204ad8439"}, + {file = "contourpy-1.1.0-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:a67259c2b493b00e5a4d0f7bfae51fb4b3371395e47d079a4446e9b0f4d70e76"}, + {file = "contourpy-1.1.0-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:2b836d22bd2c7bb2700348e4521b25e077255ebb6ab68e351ab5aa91ca27e027"}, + {file = "contourpy-1.1.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:084eaa568400cfaf7179b847ac871582199b1b44d5699198e9602ecbbb5f6104"}, + {file = "contourpy-1.1.0-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:911ff4fd53e26b019f898f32db0d4956c9d227d51338fb3b03ec72ff0084ee5f"}, + {file = "contourpy-1.1.0.tar.gz", hash = "sha256:e53046c3863828d21d531cc3b53786e6580eb1ba02477e8681009b6aa0870b21"}, +] [package.dependencies] numpy = ">=1.16" @@ -212,13 +538,139 @@ mypy = ["contourpy[bokeh,docs]", "docutils-stubs", "mypy (==1.2.0)", "types-Pill test = ["Pillow", "contourpy[test-no-images]", "matplotlib"] test-no-images = ["pytest", "pytest-cov", "wurlitzer"] +[[package]] +name = "contourpy" +version = "1.1.1" +description = "Python library for calculating contours of 2D quadrilateral grids" +category = "dev" +optional = false +python-versions = ">=3.8" +files = [ + {file = "contourpy-1.1.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:46e24f5412c948d81736509377e255f6040e94216bf1a9b5ea1eaa9d29f6ec1b"}, + {file = "contourpy-1.1.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:0e48694d6a9c5a26ee85b10130c77a011a4fedf50a7279fa0bdaf44bafb4299d"}, + {file = "contourpy-1.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a66045af6cf00e19d02191ab578a50cb93b2028c3eefed999793698e9ea768ae"}, + {file = "contourpy-1.1.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4ebf42695f75ee1a952f98ce9775c873e4971732a87334b099dde90b6af6a916"}, + {file = "contourpy-1.1.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f6aec19457617ef468ff091669cca01fa7ea557b12b59a7908b9474bb9674cf0"}, + {file = "contourpy-1.1.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:462c59914dc6d81e0b11f37e560b8a7c2dbab6aca4f38be31519d442d6cde1a1"}, + {file = "contourpy-1.1.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:6d0a8efc258659edc5299f9ef32d8d81de8b53b45d67bf4bfa3067f31366764d"}, + {file = "contourpy-1.1.1-cp310-cp310-win32.whl", hash = "sha256:d6ab42f223e58b7dac1bb0af32194a7b9311065583cc75ff59dcf301afd8a431"}, + {file = "contourpy-1.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:549174b0713d49871c6dee90a4b499d3f12f5e5f69641cd23c50a4542e2ca1eb"}, + {file = "contourpy-1.1.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:407d864db716a067cc696d61fa1ef6637fedf03606e8417fe2aeed20a061e6b2"}, + {file = "contourpy-1.1.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:dfe80c017973e6a4c367e037cb31601044dd55e6bfacd57370674867d15a899b"}, + {file = "contourpy-1.1.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e30aaf2b8a2bac57eb7e1650df1b3a4130e8d0c66fc2f861039d507a11760e1b"}, + {file = "contourpy-1.1.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3de23ca4f381c3770dee6d10ead6fff524d540c0f662e763ad1530bde5112532"}, + {file = "contourpy-1.1.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:566f0e41df06dfef2431defcfaa155f0acfa1ca4acbf8fd80895b1e7e2ada40e"}, + {file = "contourpy-1.1.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b04c2f0adaf255bf756cf08ebef1be132d3c7a06fe6f9877d55640c5e60c72c5"}, + {file = "contourpy-1.1.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:d0c188ae66b772d9d61d43c6030500344c13e3f73a00d1dc241da896f379bb62"}, + {file = "contourpy-1.1.1-cp311-cp311-win32.whl", hash = "sha256:0683e1ae20dc038075d92e0e0148f09ffcefab120e57f6b4c9c0f477ec171f33"}, + {file = "contourpy-1.1.1-cp311-cp311-win_amd64.whl", hash = "sha256:8636cd2fc5da0fb102a2504fa2c4bea3cbc149533b345d72cdf0e7a924decc45"}, + {file = "contourpy-1.1.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:560f1d68a33e89c62da5da4077ba98137a5e4d3a271b29f2f195d0fba2adcb6a"}, + {file = "contourpy-1.1.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:24216552104ae8f3b34120ef84825400b16eb6133af2e27a190fdc13529f023e"}, + {file = "contourpy-1.1.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:56de98a2fb23025882a18b60c7f0ea2d2d70bbbcfcf878f9067234b1c4818442"}, + {file = "contourpy-1.1.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:07d6f11dfaf80a84c97f1a5ba50d129d9303c5b4206f776e94037332e298dda8"}, + {file = "contourpy-1.1.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f1eaac5257a8f8a047248d60e8f9315c6cff58f7803971170d952555ef6344a7"}, + {file = "contourpy-1.1.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:19557fa407e70f20bfaba7d55b4d97b14f9480856c4fb65812e8a05fe1c6f9bf"}, + {file = "contourpy-1.1.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:081f3c0880712e40effc5f4c3b08feca6d064cb8cfbb372ca548105b86fd6c3d"}, + {file = "contourpy-1.1.1-cp312-cp312-win32.whl", hash = "sha256:059c3d2a94b930f4dafe8105bcdc1b21de99b30b51b5bce74c753686de858cb6"}, + {file = "contourpy-1.1.1-cp312-cp312-win_amd64.whl", hash = "sha256:f44d78b61740e4e8c71db1cf1fd56d9050a4747681c59ec1094750a658ceb970"}, + {file = "contourpy-1.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:70e5a10f8093d228bb2b552beeb318b8928b8a94763ef03b858ef3612b29395d"}, + {file = "contourpy-1.1.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:8394e652925a18ef0091115e3cc191fef350ab6dc3cc417f06da66bf98071ae9"}, + {file = "contourpy-1.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c5bd5680f844c3ff0008523a71949a3ff5e4953eb7701b28760805bc9bcff217"}, + {file = "contourpy-1.1.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:66544f853bfa85c0d07a68f6c648b2ec81dafd30f272565c37ab47a33b220684"}, + {file = "contourpy-1.1.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e0c02b75acfea5cab07585d25069207e478d12309557f90a61b5a3b4f77f46ce"}, + {file = "contourpy-1.1.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:41339b24471c58dc1499e56783fedc1afa4bb018bcd035cfb0ee2ad2a7501ef8"}, + {file = "contourpy-1.1.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:f29fb0b3f1217dfe9362ec55440d0743fe868497359f2cf93293f4b2701b8251"}, + {file = "contourpy-1.1.1-cp38-cp38-win32.whl", hash = "sha256:f9dc7f933975367251c1b34da882c4f0e0b2e24bb35dc906d2f598a40b72bfc7"}, + {file = "contourpy-1.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:498e53573e8b94b1caeb9e62d7c2d053c263ebb6aa259c81050766beb50ff8d9"}, + {file = "contourpy-1.1.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:ba42e3810999a0ddd0439e6e5dbf6d034055cdc72b7c5c839f37a7c274cb4eba"}, + {file = "contourpy-1.1.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:6c06e4c6e234fcc65435223c7b2a90f286b7f1b2733058bdf1345d218cc59e34"}, + {file = "contourpy-1.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ca6fab080484e419528e98624fb5c4282148b847e3602dc8dbe0cb0669469887"}, + {file = "contourpy-1.1.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:93df44ab351119d14cd1e6b52a5063d3336f0754b72736cc63db59307dabb718"}, + {file = "contourpy-1.1.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:eafbef886566dc1047d7b3d4b14db0d5b7deb99638d8e1be4e23a7c7ac59ff0f"}, + {file = "contourpy-1.1.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:efe0fab26d598e1ec07d72cf03eaeeba8e42b4ecf6b9ccb5a356fde60ff08b85"}, + {file = "contourpy-1.1.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:f08e469821a5e4751c97fcd34bcb586bc243c39c2e39321822060ba902eac49e"}, + {file = "contourpy-1.1.1-cp39-cp39-win32.whl", hash = "sha256:bfc8a5e9238232a45ebc5cb3bfee71f1167064c8d382cadd6076f0d51cff1da0"}, + {file = "contourpy-1.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:c84fdf3da00c2827d634de4fcf17e3e067490c4aea82833625c4c8e6cdea0887"}, + {file = "contourpy-1.1.1-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:229a25f68046c5cf8067d6d6351c8b99e40da11b04d8416bf8d2b1d75922521e"}, + {file = "contourpy-1.1.1-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a10dab5ea1bd4401c9483450b5b0ba5416be799bbd50fc7a6cc5e2a15e03e8a3"}, + {file = "contourpy-1.1.1-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:4f9147051cb8fdb29a51dc2482d792b3b23e50f8f57e3720ca2e3d438b7adf23"}, + {file = "contourpy-1.1.1-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:a75cc163a5f4531a256f2c523bd80db509a49fc23721b36dd1ef2f60ff41c3cb"}, + {file = "contourpy-1.1.1-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3b53d5769aa1f2d4ea407c65f2d1d08002952fac1d9e9d307aa2e1023554a163"}, + {file = "contourpy-1.1.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:11b836b7dbfb74e049c302bbf74b4b8f6cb9d0b6ca1bf86cfa8ba144aedadd9c"}, + {file = "contourpy-1.1.1.tar.gz", hash = "sha256:96ba37c2e24b7212a77da85004c38e7c4d155d3e72a45eeaf22c1f03f607e8ab"}, +] + +[package.dependencies] +numpy = {version = ">=1.16,<2.0", markers = "python_version <= \"3.11\""} + +[package.extras] +bokeh = ["bokeh", "selenium"] +docs = ["furo", "sphinx (>=7.2)", "sphinx-copybutton"] +mypy = ["contourpy[bokeh,docs]", "docutils-stubs", "mypy (==1.4.1)", "types-Pillow"] +test = ["Pillow", "contourpy[test-no-images]", "matplotlib"] +test-no-images = ["pytest", "pytest-cov", "wurlitzer"] + [[package]] name = "coverage" -version = "7.2.2" +version = "7.3.2" description = "Code coverage measurement for Python" category = "dev" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" +files = [ + {file = "coverage-7.3.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d872145f3a3231a5f20fd48500274d7df222e291d90baa2026cc5152b7ce86bf"}, + {file = "coverage-7.3.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:310b3bb9c91ea66d59c53fa4989f57d2436e08f18fb2f421a1b0b6b8cc7fffda"}, + {file = "coverage-7.3.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f47d39359e2c3779c5331fc740cf4bce6d9d680a7b4b4ead97056a0ae07cb49a"}, + {file = "coverage-7.3.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:aa72dbaf2c2068404b9870d93436e6d23addd8bbe9295f49cbca83f6e278179c"}, + {file = "coverage-7.3.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:beaa5c1b4777f03fc63dfd2a6bd820f73f036bfb10e925fce067b00a340d0f3f"}, + {file = "coverage-7.3.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:dbc1b46b92186cc8074fee9d9fbb97a9dd06c6cbbef391c2f59d80eabdf0faa6"}, + {file = "coverage-7.3.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:315a989e861031334d7bee1f9113c8770472db2ac484e5b8c3173428360a9148"}, + {file = "coverage-7.3.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:d1bc430677773397f64a5c88cb522ea43175ff16f8bfcc89d467d974cb2274f9"}, + {file = "coverage-7.3.2-cp310-cp310-win32.whl", hash = "sha256:a889ae02f43aa45032afe364c8ae84ad3c54828c2faa44f3bfcafecb5c96b02f"}, + {file = "coverage-7.3.2-cp310-cp310-win_amd64.whl", hash = "sha256:c0ba320de3fb8c6ec16e0be17ee1d3d69adcda99406c43c0409cb5c41788a611"}, + {file = "coverage-7.3.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:ac8c802fa29843a72d32ec56d0ca792ad15a302b28ca6203389afe21f8fa062c"}, + {file = "coverage-7.3.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:89a937174104339e3a3ffcf9f446c00e3a806c28b1841c63edb2b369310fd074"}, + {file = "coverage-7.3.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e267e9e2b574a176ddb983399dec325a80dbe161f1a32715c780b5d14b5f583a"}, + {file = "coverage-7.3.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2443cbda35df0d35dcfb9bf8f3c02c57c1d6111169e3c85fc1fcc05e0c9f39a3"}, + {file = "coverage-7.3.2-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4175e10cc8dda0265653e8714b3174430b07c1dca8957f4966cbd6c2b1b8065a"}, + {file = "coverage-7.3.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:0cbf38419fb1a347aaf63481c00f0bdc86889d9fbf3f25109cf96c26b403fda1"}, + {file = "coverage-7.3.2-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:5c913b556a116b8d5f6ef834038ba983834d887d82187c8f73dec21049abd65c"}, + {file = "coverage-7.3.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:1981f785239e4e39e6444c63a98da3a1db8e971cb9ceb50a945ba6296b43f312"}, + {file = "coverage-7.3.2-cp311-cp311-win32.whl", hash = "sha256:43668cabd5ca8258f5954f27a3aaf78757e6acf13c17604d89648ecc0cc66640"}, + {file = "coverage-7.3.2-cp311-cp311-win_amd64.whl", hash = "sha256:e10c39c0452bf6e694511c901426d6b5ac005acc0f78ff265dbe36bf81f808a2"}, + {file = "coverage-7.3.2-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:4cbae1051ab791debecc4a5dcc4a1ff45fc27b91b9aee165c8a27514dd160836"}, + {file = "coverage-7.3.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:12d15ab5833a997716d76f2ac1e4b4d536814fc213c85ca72756c19e5a6b3d63"}, + {file = "coverage-7.3.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3c7bba973ebee5e56fe9251300c00f1579652587a9f4a5ed8404b15a0471f216"}, + {file = "coverage-7.3.2-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fe494faa90ce6381770746077243231e0b83ff3f17069d748f645617cefe19d4"}, + {file = "coverage-7.3.2-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f6e9589bd04d0461a417562649522575d8752904d35c12907d8c9dfeba588faf"}, + {file = "coverage-7.3.2-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:d51ac2a26f71da1b57f2dc81d0e108b6ab177e7d30e774db90675467c847bbdf"}, + {file = "coverage-7.3.2-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:99b89d9f76070237975b315b3d5f4d6956ae354a4c92ac2388a5695516e47c84"}, + {file = "coverage-7.3.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:fa28e909776dc69efb6ed975a63691bc8172b64ff357e663a1bb06ff3c9b589a"}, + {file = "coverage-7.3.2-cp312-cp312-win32.whl", hash = "sha256:289fe43bf45a575e3ab10b26d7b6f2ddb9ee2dba447499f5401cfb5ecb8196bb"}, + {file = "coverage-7.3.2-cp312-cp312-win_amd64.whl", hash = "sha256:7dbc3ed60e8659bc59b6b304b43ff9c3ed858da2839c78b804973f613d3e92ed"}, + {file = "coverage-7.3.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:f94b734214ea6a36fe16e96a70d941af80ff3bfd716c141300d95ebc85339738"}, + {file = "coverage-7.3.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:af3d828d2c1cbae52d34bdbb22fcd94d1ce715d95f1a012354a75e5913f1bda2"}, + {file = "coverage-7.3.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:630b13e3036e13c7adc480ca42fa7afc2a5d938081d28e20903cf7fd687872e2"}, + {file = "coverage-7.3.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c9eacf273e885b02a0273bb3a2170f30e2d53a6d53b72dbe02d6701b5296101c"}, + {file = "coverage-7.3.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d8f17966e861ff97305e0801134e69db33b143bbfb36436efb9cfff6ec7b2fd9"}, + {file = "coverage-7.3.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:b4275802d16882cf9c8b3d057a0839acb07ee9379fa2749eca54efbce1535b82"}, + {file = "coverage-7.3.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:72c0cfa5250f483181e677ebc97133ea1ab3eb68645e494775deb6a7f6f83901"}, + {file = "coverage-7.3.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:cb536f0dcd14149425996821a168f6e269d7dcd2c273a8bff8201e79f5104e76"}, + {file = "coverage-7.3.2-cp38-cp38-win32.whl", hash = "sha256:307adb8bd3abe389a471e649038a71b4eb13bfd6b7dd9a129fa856f5c695cf92"}, + {file = "coverage-7.3.2-cp38-cp38-win_amd64.whl", hash = "sha256:88ed2c30a49ea81ea3b7f172e0269c182a44c236eb394718f976239892c0a27a"}, + {file = "coverage-7.3.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b631c92dfe601adf8f5ebc7fc13ced6bb6e9609b19d9a8cd59fa47c4186ad1ce"}, + {file = "coverage-7.3.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:d3d9df4051c4a7d13036524b66ecf7a7537d14c18a384043f30a303b146164e9"}, + {file = "coverage-7.3.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5f7363d3b6a1119ef05015959ca24a9afc0ea8a02c687fe7e2d557705375c01f"}, + {file = "coverage-7.3.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2f11cc3c967a09d3695d2a6f03fb3e6236622b93be7a4b5dc09166a861be6d25"}, + {file = "coverage-7.3.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:149de1d2401ae4655c436a3dced6dd153f4c3309f599c3d4bd97ab172eaf02d9"}, + {file = "coverage-7.3.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:3a4006916aa6fee7cd38db3bfc95aa9c54ebb4ffbfc47c677c8bba949ceba0a6"}, + {file = "coverage-7.3.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9028a3871280110d6e1aa2df1afd5ef003bab5fb1ef421d6dc748ae1c8ef2ebc"}, + {file = "coverage-7.3.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:9f805d62aec8eb92bab5b61c0f07329275b6f41c97d80e847b03eb894f38d083"}, + {file = "coverage-7.3.2-cp39-cp39-win32.whl", hash = "sha256:d1c88ec1a7ff4ebca0219f5b1ef863451d828cccf889c173e1253aa84b1e07ce"}, + {file = "coverage-7.3.2-cp39-cp39-win_amd64.whl", hash = "sha256:b4767da59464bb593c07afceaddea61b154136300881844768037fd5e859353f"}, + {file = "coverage-7.3.2-pp38.pp39.pp310-none-any.whl", hash = "sha256:ae97af89f0fbf373400970c0a21eef5aa941ffeed90aee43650b81f7d7f47637"}, + {file = "coverage-7.3.2.tar.gz", hash = "sha256:be32ad29341b0170e795ca590e1c07e81fc061cb5b10c74ce7203491484404ef"}, +] [package.dependencies] tomli = {version = "*", optional = true, markers = "python_full_version <= \"3.11.0a6\" and extra == \"toml\""} @@ -233,25 +685,57 @@ description = "Generate coverage badges for Coverage.py." category = "dev" optional = false python-versions = "*" +files = [ + {file = "coverage-badge-1.1.0.tar.gz", hash = "sha256:c824a106503e981c02821e7d32f008fb3984b2338aa8c3800ec9357e33345b78"}, + {file = "coverage_badge-1.1.0-py2.py3-none-any.whl", hash = "sha256:e365d56e5202e923d1b237f82defd628a02d1d645a147f867ac85c58c81d7997"}, +] [package.dependencies] coverage = "*" [[package]] name = "cycler" -version = "0.11.0" +version = "0.12.1" description = "Composable style cycles" category = "dev" optional = false -python-versions = ">=3.6" +python-versions = ">=3.8" +files = [ + {file = "cycler-0.12.1-py3-none-any.whl", hash = "sha256:85cef7cff222d8644161529808465972e51340599459b8ac3ccbac5a854e0d30"}, + {file = "cycler-0.12.1.tar.gz", hash = "sha256:88bb128f02ba341da8ef447245a9e138fae777f6a23943da4540077d3601eb1c"}, +] + +[package.extras] +docs = ["ipython", "matplotlib", "numpydoc", "sphinx"] +tests = ["pytest", "pytest-cov", "pytest-xdist"] [[package]] name = "debugpy" -version = "1.6.7" +version = "1.8.0" description = "An implementation of the Debug Adapter Protocol for Python" category = "dev" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" +files = [ + {file = "debugpy-1.8.0-cp310-cp310-macosx_11_0_x86_64.whl", hash = "sha256:7fb95ca78f7ac43393cd0e0f2b6deda438ec7c5e47fa5d38553340897d2fbdfb"}, + {file = "debugpy-1.8.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ef9ab7df0b9a42ed9c878afd3eaaff471fce3fa73df96022e1f5c9f8f8c87ada"}, + {file = "debugpy-1.8.0-cp310-cp310-win32.whl", hash = "sha256:a8b7a2fd27cd9f3553ac112f356ad4ca93338feadd8910277aff71ab24d8775f"}, + {file = "debugpy-1.8.0-cp310-cp310-win_amd64.whl", hash = "sha256:5d9de202f5d42e62f932507ee8b21e30d49aae7e46d5b1dd5c908db1d7068637"}, + {file = "debugpy-1.8.0-cp311-cp311-macosx_11_0_universal2.whl", hash = "sha256:ef54404365fae8d45cf450d0544ee40cefbcb9cb85ea7afe89a963c27028261e"}, + {file = "debugpy-1.8.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:60009b132c91951354f54363f8ebdf7457aeb150e84abba5ae251b8e9f29a8a6"}, + {file = "debugpy-1.8.0-cp311-cp311-win32.whl", hash = "sha256:8cd0197141eb9e8a4566794550cfdcdb8b3db0818bdf8c49a8e8f8053e56e38b"}, + {file = "debugpy-1.8.0-cp311-cp311-win_amd64.whl", hash = "sha256:a64093656c4c64dc6a438e11d59369875d200bd5abb8f9b26c1f5f723622e153"}, + {file = "debugpy-1.8.0-cp38-cp38-macosx_11_0_x86_64.whl", hash = "sha256:b05a6b503ed520ad58c8dc682749113d2fd9f41ffd45daec16e558ca884008cd"}, + {file = "debugpy-1.8.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3c6fb41c98ec51dd010d7ed650accfd07a87fe5e93eca9d5f584d0578f28f35f"}, + {file = "debugpy-1.8.0-cp38-cp38-win32.whl", hash = "sha256:46ab6780159eeabb43c1495d9c84cf85d62975e48b6ec21ee10c95767c0590aa"}, + {file = "debugpy-1.8.0-cp38-cp38-win_amd64.whl", hash = "sha256:bdc5ef99d14b9c0fcb35351b4fbfc06ac0ee576aeab6b2511702e5a648a2e595"}, + {file = "debugpy-1.8.0-cp39-cp39-macosx_11_0_x86_64.whl", hash = "sha256:61eab4a4c8b6125d41a34bad4e5fe3d2cc145caecd63c3fe953be4cc53e65bf8"}, + {file = "debugpy-1.8.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:125b9a637e013f9faac0a3d6a82bd17c8b5d2c875fb6b7e2772c5aba6d082332"}, + {file = "debugpy-1.8.0-cp39-cp39-win32.whl", hash = "sha256:57161629133113c97b387382045649a2b985a348f0c9366e22217c87b68b73c6"}, + {file = "debugpy-1.8.0-cp39-cp39-win_amd64.whl", hash = "sha256:e3412f9faa9ade82aa64a50b602544efcba848c91384e9f93497a458767e6926"}, + {file = "debugpy-1.8.0-py2.py3-none-any.whl", hash = "sha256:9c9b0ac1ce2a42888199df1a1906e45e6f3c9555497643a85e0bf2406e3ffbc4"}, + {file = "debugpy-1.8.0.zip", hash = "sha256:12af2c55b419521e33d5fb21bd022df0b5eb267c3e178f1d374a63a2a6bdccd0"}, +] [[package]] name = "decorator" @@ -260,6 +744,10 @@ description = "Decorators for Humans" category = "dev" optional = false python-versions = ">=3.5" +files = [ + {file = "decorator-5.1.1-py3-none-any.whl", hash = "sha256:b8c3f85900b9dc423225913c5aace94729fe1fa9763b38939a95226f02d37186"}, + {file = "decorator-5.1.1.tar.gz", hash = "sha256:637996211036b6385ef91435e4fae22989472f9d571faba8927ba8253acbc330"}, +] [[package]] name = "defusedxml" @@ -268,14 +756,22 @@ description = "XML bomb protection for Python stdlib modules" category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +files = [ + {file = "defusedxml-0.7.1-py2.py3-none-any.whl", hash = "sha256:a352e7e428770286cc899e2542b6cdaedb2b4953ff269a210103ec58f6198a61"}, + {file = "defusedxml-0.7.1.tar.gz", hash = "sha256:1bb3032db185915b62d7c6209c5a8792be6a32ab2fedacc84e01b52c51aa3e69"}, +] [[package]] name = "distlib" -version = "0.3.6" +version = "0.3.7" description = "Distribution utilities" category = "dev" optional = false python-versions = "*" +files = [ + {file = "distlib-0.3.7-py2.py3-none-any.whl", hash = "sha256:2e24928bc811348f0feb63014e97aaae3037f2cf48712d51ae61df7fd6075057"}, + {file = "distlib-0.3.7.tar.gz", hash = "sha256:9dafe54b34a028eafd95039d5e5d4851a13734540f1331060d31c9916e7147a8"}, +] [[package]] name = "docutils" @@ -284,59 +780,124 @@ description = "Docutils -- Python Documentation Utilities" category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +files = [ + {file = "docutils-0.18.1-py2.py3-none-any.whl", hash = "sha256:23010f129180089fbcd3bc08cfefccb3b890b0050e1ca00c867036e9d161b98c"}, + {file = "docutils-0.18.1.tar.gz", hash = "sha256:679987caf361a7539d76e584cbeddc311e3aee937877c87346f31debc63e9d06"}, +] [[package]] name = "exceptiongroup" -version = "1.1.1" +version = "1.1.3" description = "Backport of PEP 654 (exception groups)" category = "dev" optional = false python-versions = ">=3.7" +files = [ + {file = "exceptiongroup-1.1.3-py3-none-any.whl", hash = "sha256:343280667a4585d195ca1cf9cef84a4e178c4b6cf2274caef9859782b567d5e3"}, + {file = "exceptiongroup-1.1.3.tar.gz", hash = "sha256:097acd85d473d75af5bb98e41b61ff7fe35efe6675e4f9370ec6ec5126d160e9"}, +] [package.extras] test = ["pytest (>=6)"] [[package]] name = "executing" -version = "1.2.0" +version = "2.0.0" description = "Get the currently executing AST node of a frame, and other information" category = "dev" optional = false python-versions = "*" +files = [ + {file = "executing-2.0.0-py2.py3-none-any.whl", hash = "sha256:06df6183df67389625f4e763921c6cf978944721abf3e714000200aab95b0657"}, + {file = "executing-2.0.0.tar.gz", hash = "sha256:0ff053696fdeef426cda5bd18eacd94f82c91f49823a2e9090124212ceea9b08"}, +] [package.extras] -tests = ["asttokens", "littleutils", "pytest", "rich"] +tests = ["asttokens (>=2.1.0)", "coverage", "coverage-enable-subprocess", "ipython", "littleutils", "pytest", "rich"] [[package]] name = "fastjsonschema" -version = "2.18.0" +version = "2.18.1" description = "Fastest Python implementation of JSON schema" category = "dev" optional = false python-versions = "*" +files = [ + {file = "fastjsonschema-2.18.1-py3-none-any.whl", hash = "sha256:aec6a19e9f66e9810ab371cc913ad5f4e9e479b63a7072a2cd060a9369e329a8"}, + {file = "fastjsonschema-2.18.1.tar.gz", hash = "sha256:06dc8680d937628e993fa0cd278f196d20449a1adc087640710846b324d422ea"}, +] [package.extras] devel = ["colorama", "json-spec", "jsonschema", "pylint", "pytest", "pytest-benchmark", "pytest-cache", "validictory"] [[package]] name = "filelock" -version = "3.10.7" +version = "3.12.4" description = "A platform independent file lock." category = "dev" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" +files = [ + {file = "filelock-3.12.4-py3-none-any.whl", hash = "sha256:08c21d87ded6e2b9da6728c3dff51baf1dcecf973b768ef35bcbc3447edb9ad4"}, + {file = "filelock-3.12.4.tar.gz", hash = "sha256:2e6f249f1f3654291606e046b09f1fd5eac39b360664c27f5aad072012f8bcbd"}, +] [package.extras] -docs = ["furo (>=2022.12.7)", "sphinx (>=6.1.3)", "sphinx-autodoc-typehints (>=1.22,!=1.23.4)"] -testing = ["covdefaults (>=2.3)", "coverage (>=7.2.2)", "diff-cover (>=7.5)", "pytest (>=7.2.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)", "pytest-timeout (>=2.1)"] +docs = ["furo (>=2023.7.26)", "sphinx (>=7.1.2)", "sphinx-autodoc-typehints (>=1.24)"] +testing = ["covdefaults (>=2.3)", "coverage (>=7.3)", "diff-cover (>=7.7)", "pytest (>=7.4)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)", "pytest-timeout (>=2.1)"] +typing = ["typing-extensions (>=4.7.1)"] [[package]] name = "fonttools" -version = "4.40.0" +version = "4.43.1" description = "Tools to manipulate font files" category = "dev" optional = false python-versions = ">=3.8" +files = [ + {file = "fonttools-4.43.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:bf11e2cca121df35e295bd34b309046c29476ee739753bc6bc9d5050de319273"}, + {file = "fonttools-4.43.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:10b3922875ffcba636674f406f9ab9a559564fdbaa253d66222019d569db869c"}, + {file = "fonttools-4.43.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9f727c3e3d08fd25352ed76cc3cb61486f8ed3f46109edf39e5a60fc9fecf6ca"}, + {file = "fonttools-4.43.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ad0b3f6342cfa14be996971ea2b28b125ad681c6277c4cd0fbdb50340220dfb6"}, + {file = "fonttools-4.43.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:3b7ad05b2beeebafb86aa01982e9768d61c2232f16470f9d0d8e385798e37184"}, + {file = "fonttools-4.43.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:4c54466f642d2116686268c3e5f35ebb10e49b0d48d41a847f0e171c785f7ac7"}, + {file = "fonttools-4.43.1-cp310-cp310-win32.whl", hash = "sha256:1e09da7e8519e336239fbd375156488a4c4945f11c4c5792ee086dd84f784d02"}, + {file = "fonttools-4.43.1-cp310-cp310-win_amd64.whl", hash = "sha256:1cf9e974f63b1080b1d2686180fc1fbfd3bfcfa3e1128695b5de337eb9075cef"}, + {file = "fonttools-4.43.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:5db46659cfe4e321158de74c6f71617e65dc92e54980086823a207f1c1c0e24b"}, + {file = "fonttools-4.43.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:1952c89a45caceedf2ab2506d9a95756e12b235c7182a7a0fff4f5e52227204f"}, + {file = "fonttools-4.43.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9c36da88422e0270fbc7fd959dc9749d31a958506c1d000e16703c2fce43e3d0"}, + {file = "fonttools-4.43.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7bbbf8174501285049e64d174e29f9578495e1b3b16c07c31910d55ad57683d8"}, + {file = "fonttools-4.43.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:d4071bd1c183b8d0b368cc9ed3c07a0f6eb1bdfc4941c4c024c49a35429ac7cd"}, + {file = "fonttools-4.43.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:d21099b411e2006d3c3e1f9aaf339e12037dbf7bf9337faf0e93ec915991f43b"}, + {file = "fonttools-4.43.1-cp311-cp311-win32.whl", hash = "sha256:b84a1c00f832feb9d0585ca8432fba104c819e42ff685fcce83537e2e7e91204"}, + {file = "fonttools-4.43.1-cp311-cp311-win_amd64.whl", hash = "sha256:9a2f0aa6ca7c9bc1058a9d0b35483d4216e0c1bbe3962bc62ce112749954c7b8"}, + {file = "fonttools-4.43.1-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:4d9740e3783c748521e77d3c397dc0662062c88fd93600a3c2087d3d627cd5e5"}, + {file = "fonttools-4.43.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:884ef38a5a2fd47b0c1291647b15f4e88b9de5338ffa24ee52c77d52b4dfd09c"}, + {file = "fonttools-4.43.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9648518ef687ba818db3fcc5d9aae27a369253ac09a81ed25c3867e8657a0680"}, + {file = "fonttools-4.43.1-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:95e974d70238fc2be5f444fa91f6347191d0e914d5d8ae002c9aa189572cc215"}, + {file = "fonttools-4.43.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:34f713dad41aa21c637b4e04fe507c36b986a40f7179dcc86402237e2d39dcd3"}, + {file = "fonttools-4.43.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:360201d46165fc0753229afe785900bc9596ee6974833124f4e5e9f98d0f592b"}, + {file = "fonttools-4.43.1-cp312-cp312-win32.whl", hash = "sha256:bb6d2f8ef81ea076877d76acfb6f9534a9c5f31dc94ba70ad001267ac3a8e56f"}, + {file = "fonttools-4.43.1-cp312-cp312-win_amd64.whl", hash = "sha256:25d3da8a01442cbc1106490eddb6d31d7dffb38c1edbfabbcc8db371b3386d72"}, + {file = "fonttools-4.43.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:8da417431bfc9885a505e86ba706f03f598c85f5a9c54f67d63e84b9948ce590"}, + {file = "fonttools-4.43.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:51669b60ee2a4ad6c7fc17539a43ffffc8ef69fd5dbed186a38a79c0ac1f5db7"}, + {file = "fonttools-4.43.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:748015d6f28f704e7d95cd3c808b483c5fb87fd3eefe172a9da54746ad56bfb6"}, + {file = "fonttools-4.43.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f7a58eb5e736d7cf198eee94844b81c9573102ae5989ebcaa1d1a37acd04b33d"}, + {file = "fonttools-4.43.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:6bb5ea9076e0e39defa2c325fc086593ae582088e91c0746bee7a5a197be3da0"}, + {file = "fonttools-4.43.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:5f37e31291bf99a63328668bb83b0669f2688f329c4c0d80643acee6e63cd933"}, + {file = "fonttools-4.43.1-cp38-cp38-win32.whl", hash = "sha256:9c60ecfa62839f7184f741d0509b5c039d391c3aff71dc5bc57b87cc305cff3b"}, + {file = "fonttools-4.43.1-cp38-cp38-win_amd64.whl", hash = "sha256:fe9b1ec799b6086460a7480e0f55c447b1aca0a4eecc53e444f639e967348896"}, + {file = "fonttools-4.43.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:13a9a185259ed144def3682f74fdcf6596f2294e56fe62dfd2be736674500dba"}, + {file = "fonttools-4.43.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b2adca1b46d69dce4a37eecc096fe01a65d81a2f5c13b25ad54d5430ae430b13"}, + {file = "fonttools-4.43.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:18eefac1b247049a3a44bcd6e8c8fd8b97f3cad6f728173b5d81dced12d6c477"}, + {file = "fonttools-4.43.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2062542a7565091cea4cc14dd99feff473268b5b8afdee564f7067dd9fff5860"}, + {file = "fonttools-4.43.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:18a2477c62a728f4d6e88c45ee9ee0229405e7267d7d79ce1f5ce0f3e9f8ab86"}, + {file = "fonttools-4.43.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:a7a06f8d95b7496e53af80d974d63516ffb263a468e614978f3899a6df52d4b3"}, + {file = "fonttools-4.43.1-cp39-cp39-win32.whl", hash = "sha256:10003ebd81fec0192c889e63a9c8c63f88c7d72ae0460b7ba0cd2a1db246e5ad"}, + {file = "fonttools-4.43.1-cp39-cp39-win_amd64.whl", hash = "sha256:e117a92b07407a061cde48158c03587ab97e74e7d73cb65e6aadb17af191162a"}, + {file = "fonttools-4.43.1-py3-none-any.whl", hash = "sha256:4f88cae635bfe4bbbdc29d479a297bb525a94889184bb69fa9560c2d4834ddb9"}, + {file = "fonttools-4.43.1.tar.gz", hash = "sha256:17dbc2eeafb38d5d0e865dcce16e313c58265a6d2d20081c435f84dc5a9d8212"}, +] [package.extras] all = ["brotli (>=1.0.1)", "brotlicffi (>=0.8.0)", "fs (>=2.2.0,<3)", "lxml (>=4.0,<5)", "lz4 (>=1.7.4.2)", "matplotlib", "munkres", "scipy", "skia-pathops (>=0.5.0)", "sympy", "uharfbuzz (>=0.23.0)", "unicodedata2 (>=15.0.0)", "xattr", "zopfli (>=0.1.4)"] @@ -354,11 +915,15 @@ woff = ["brotli (>=1.0.1)", "brotlicffi (>=0.8.0)", "zopfli (>=0.1.4)"] [[package]] name = "hypothesis" -version = "6.70.1" +version = "6.87.3" description = "A library for property-based testing" category = "dev" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" +files = [ + {file = "hypothesis-6.87.3-py3-none-any.whl", hash = "sha256:684a7b56a4a2e990cb0efb3124c2d886c5138453550b6f4f4a3b75bfc8ef24d4"}, + {file = "hypothesis-6.87.3.tar.gz", hash = "sha256:e67391efb9e6f663031f493d04b5edfb2e47bfc5a6ea56190aed3bc7993d5899"}, +] [package.dependencies] attrs = ">=19.2.0" @@ -366,7 +931,7 @@ exceptiongroup = {version = ">=1.0.0", markers = "python_version < \"3.11\""} sortedcontainers = ">=2.1.0,<3.0.0" [package.extras] -all = ["backports.zoneinfo (>=0.2.1)", "black (>=19.10b0)", "click (>=7.0)", "django (>=3.2)", "dpcontracts (>=0.4)", "importlib-metadata (>=3.6)", "lark (>=0.10.1)", "libcst (>=0.3.16)", "numpy (>=1.9.0)", "pandas (>=1.0)", "pytest (>=4.6)", "python-dateutil (>=1.4)", "pytz (>=2014.1)", "redis (>=3.0.0)", "rich (>=9.0.0)", "tzdata (>=2023.2)"] +all = ["backports.zoneinfo (>=0.2.1)", "black (>=19.10b0)", "click (>=7.0)", "django (>=3.2)", "dpcontracts (>=0.4)", "lark (>=0.10.1)", "libcst (>=0.3.16)", "numpy (>=1.17.3)", "pandas (>=1.1)", "pytest (>=4.6)", "python-dateutil (>=1.4)", "pytz (>=2014.1)", "redis (>=3.0.0)", "rich (>=9.0.0)", "tzdata (>=2023.3)"] cli = ["black (>=19.10b0)", "click (>=7.0)", "rich (>=9.0.0)"] codemods = ["libcst (>=0.3.16)"] dateutil = ["python-dateutil (>=1.4)"] @@ -374,20 +939,24 @@ django = ["django (>=3.2)"] dpcontracts = ["dpcontracts (>=0.4)"] ghostwriter = ["black (>=19.10b0)"] lark = ["lark (>=0.10.1)"] -numpy = ["numpy (>=1.9.0)"] -pandas = ["pandas (>=1.0)"] +numpy = ["numpy (>=1.17.3)"] +pandas = ["pandas (>=1.1)"] pytest = ["pytest (>=4.6)"] pytz = ["pytz (>=2014.1)"] redis = ["redis (>=3.0.0)"] -zoneinfo = ["backports.zoneinfo (>=0.2.1)", "tzdata (>=2023.2)"] +zoneinfo = ["backports.zoneinfo (>=0.2.1)", "tzdata (>=2023.3)"] [[package]] name = "identify" -version = "2.5.22" +version = "2.5.30" description = "File identification library for Python" category = "dev" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" +files = [ + {file = "identify-2.5.30-py2.py3-none-any.whl", hash = "sha256:afe67f26ae29bab007ec21b03d4114f41316ab9dd15aa8736a167481e108da54"}, + {file = "identify-2.5.30.tar.gz", hash = "sha256:f302a4256a15c849b91cfcdcec052a8ce914634b2f77ae87dad29cd749f2d88d"}, +] [package.extras] license = ["ukkonen"] @@ -399,6 +968,10 @@ description = "Internationalized Domain Names in Applications (IDNA)" category = "main" optional = false python-versions = ">=3.5" +files = [ + {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"}, + {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"}, +] [[package]] name = "imagesize" @@ -407,14 +980,22 @@ description = "Getting image size from png/jpeg/jpeg2000/gif file" category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +files = [ + {file = "imagesize-1.4.1-py2.py3-none-any.whl", hash = "sha256:0d8d18d08f840c19d0ee7ca1fd82490fdc3729b7ac93f49870406ddde8ef8d8b"}, + {file = "imagesize-1.4.1.tar.gz", hash = "sha256:69150444affb9cb0d5cc5a92b3676f0b2fb7cd9ae39e947a5e11a36b4497cd4a"}, +] [[package]] name = "importlib-metadata" -version = "6.1.0" +version = "6.8.0" description = "Read metadata from Python packages" category = "dev" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" +files = [ + {file = "importlib_metadata-6.8.0-py3-none-any.whl", hash = "sha256:3ebb78df84a805d7698245025b975d9d67053cd94c79245ba4b3eb694abe68bb"}, + {file = "importlib_metadata-6.8.0.tar.gz", hash = "sha256:dbace7892d8c0c4ac1ad096662232f831d4e64f4c4545bd53016a3e9d4654743"}, +] [package.dependencies] zipp = ">=0.5" @@ -422,22 +1003,26 @@ zipp = ">=0.5" [package.extras] docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] perf = ["ipython"] -testing = ["flake8 (<5)", "flufl.flake8", "importlib-resources (>=1.3)", "packaging", "pyfakefs", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)", "pytest-perf (>=0.9.2)"] +testing = ["flufl.flake8", "importlib-resources (>=1.3)", "packaging", "pyfakefs", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy (>=0.9.1)", "pytest-perf (>=0.9.2)", "pytest-ruff"] [[package]] name = "importlib-resources" -version = "5.12.0" +version = "6.1.0" description = "Read resources from Python packages" category = "dev" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" +files = [ + {file = "importlib_resources-6.1.0-py3-none-any.whl", hash = "sha256:aa50258bbfa56d4e33fbd8aa3ef48ded10d1735f11532b8df95388cc6bdb7e83"}, + {file = "importlib_resources-6.1.0.tar.gz", hash = "sha256:9d48dcccc213325e810fd723e7fbb45ccb39f6cf5c31f00cf2b965f5f10f3cb9"}, +] [package.dependencies] zipp = {version = ">=3.1.0", markers = "python_version < \"3.10\""} [package.extras] -docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] -testing = ["flake8 (<5)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)"] +docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (<7.2.5)", "sphinx (>=3.5)", "sphinx-lint"] +testing = ["pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy (>=0.9.1)", "pytest-ruff", "zipp (>=3.17)"] [[package]] name = "iniconfig" @@ -446,14 +1031,22 @@ description = "brain-dead simple config-ini parsing" category = "dev" optional = false python-versions = ">=3.7" +files = [ + {file = "iniconfig-2.0.0-py3-none-any.whl", hash = "sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374"}, + {file = "iniconfig-2.0.0.tar.gz", hash = "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3"}, +] [[package]] name = "ipykernel" -version = "6.23.1" +version = "6.25.2" description = "IPython Kernel for Jupyter" category = "dev" optional = false python-versions = ">=3.8" +files = [ + {file = "ipykernel-6.25.2-py3-none-any.whl", hash = "sha256:2e2ee359baba19f10251b99415bb39de1e97d04e1fab385646f24f0596510b77"}, + {file = "ipykernel-6.25.2.tar.gz", hash = "sha256:f468ddd1f17acb48c8ce67fcfa49ba6d46d4f9ac0438c1f441be7c3d1372230b"}, +] [package.dependencies] appnope = {version = "*", markers = "platform_system == \"Darwin\""} @@ -479,17 +1072,22 @@ test = ["flaky", "ipyparallel", "pre-commit", "pytest (>=7.0)", "pytest-asyncio" [[package]] name = "ipython" -version = "8.11.0" +version = "8.16.1" description = "IPython: Productive Interactive Computing" category = "dev" optional = false -python-versions = ">=3.8" +python-versions = ">=3.9" +files = [ + {file = "ipython-8.16.1-py3-none-any.whl", hash = "sha256:0852469d4d579d9cd613c220af7bf0c9cc251813e12be647cb9d463939db9b1e"}, + {file = "ipython-8.16.1.tar.gz", hash = "sha256:ad52f58fca8f9f848e256c629eff888efc0528c12fe0f8ec14f33205f23ef938"}, +] [package.dependencies] appnope = {version = "*", markers = "sys_platform == \"darwin\""} backcall = "*" colorama = {version = "*", markers = "sys_platform == \"win32\""} decorator = "*" +exceptiongroup = {version = "*", markers = "python_version < \"3.11\""} jedi = ">=0.16" matplotlib-inline = "*" pexpect = {version = ">4.3", markers = "sys_platform != \"win32\""} @@ -498,11 +1096,12 @@ prompt-toolkit = ">=3.0.30,<3.0.37 || >3.0.37,<3.1.0" pygments = ">=2.4.0" stack-data = "*" traitlets = ">=5" +typing-extensions = {version = "*", markers = "python_version < \"3.10\""} [package.extras] -all = ["black", "curio", "docrepr", "ipykernel", "ipyparallel", "ipywidgets", "matplotlib", "matplotlib (!=3.2.0)", "nbconvert", "nbformat", "notebook", "numpy (>=1.21)", "pandas", "pytest (<7)", "pytest (<7.1)", "pytest-asyncio", "qtconsole", "setuptools (>=18.5)", "sphinx (>=1.3)", "sphinx-rtd-theme", "stack-data", "testpath", "trio", "typing-extensions"] +all = ["black", "curio", "docrepr", "exceptiongroup", "ipykernel", "ipyparallel", "ipywidgets", "matplotlib", "matplotlib (!=3.2.0)", "nbconvert", "nbformat", "notebook", "numpy (>=1.21)", "pandas", "pytest (<7)", "pytest (<7.1)", "pytest-asyncio", "qtconsole", "setuptools (>=18.5)", "sphinx (>=1.3)", "sphinx-rtd-theme", "stack-data", "testpath", "trio", "typing-extensions"] black = ["black"] -doc = ["docrepr", "ipykernel", "matplotlib", "pytest (<7)", "pytest (<7.1)", "pytest-asyncio", "setuptools (>=18.5)", "sphinx (>=1.3)", "sphinx-rtd-theme", "stack-data", "testpath", "typing-extensions"] +doc = ["docrepr", "exceptiongroup", "ipykernel", "matplotlib", "pytest (<7)", "pytest (<7.1)", "pytest-asyncio", "setuptools (>=18.5)", "sphinx (>=1.3)", "sphinx-rtd-theme", "stack-data", "testpath", "typing-extensions"] kernel = ["ipykernel"] nbconvert = ["nbconvert"] nbformat = ["nbformat"] @@ -519,6 +1118,10 @@ description = "An ISO 8601 date/time/duration parser and formatter" category = "main" optional = false python-versions = "*" +files = [ + {file = "isodate-0.6.1-py2.py3-none-any.whl", hash = "sha256:0751eece944162659049d35f4f549ed815792b38793f07cf73381c1c87cbed96"}, + {file = "isodate-0.6.1.tar.gz", hash = "sha256:48c5881de7e8b0a0d648cb024c8062dc84e7b840ed81e864c7614fd3c127bde9"}, +] [package.dependencies] six = "*" @@ -530,6 +1133,10 @@ description = "A Python utility / library to sort Python imports." category = "dev" optional = false python-versions = ">=3.8.0" +files = [ + {file = "isort-5.12.0-py3-none-any.whl", hash = "sha256:f84c2818376e66cf843d497486ea8fed8700b340f308f076c6fb1229dff318b6"}, + {file = "isort-5.12.0.tar.gz", hash = "sha256:8bef7dde241278824a6d83f44a544709b065191b95b6e50894bdc722fcba0504"}, +] [package.extras] colors = ["colorama (>=0.4.3)"] @@ -539,19 +1146,23 @@ requirements-deprecated-finder = ["pip-api", "pipreqs"] [[package]] name = "jedi" -version = "0.18.2" +version = "0.19.1" description = "An autocompletion tool for Python that can be used for text editors." category = "dev" optional = false python-versions = ">=3.6" +files = [ + {file = "jedi-0.19.1-py2.py3-none-any.whl", hash = "sha256:e983c654fe5c02867aef4cdfce5a2fbb4a50adc0af145f70504238f18ef5e7e0"}, + {file = "jedi-0.19.1.tar.gz", hash = "sha256:cf0496f3651bc65d7174ac1b7d043eff454892c708a87d1b683e57b569927ffd"}, +] [package.dependencies] -parso = ">=0.8.0,<0.9.0" +parso = ">=0.8.3,<0.9.0" [package.extras] docs = ["Jinja2 (==2.11.3)", "MarkupSafe (==1.1.1)", "Pygments (==2.8.1)", "alabaster (==0.7.12)", "babel (==2.9.1)", "chardet (==4.0.0)", "commonmark (==0.8.1)", "docutils (==0.17.1)", "future (==0.18.2)", "idna (==2.10)", "imagesize (==1.2.0)", "mock (==1.0.1)", "packaging (==20.9)", "pyparsing (==2.4.7)", "pytz (==2021.1)", "readthedocs-sphinx-ext (==2.1.4)", "recommonmark (==0.5.0)", "requests (==2.25.1)", "six (==1.15.0)", "snowballstemmer (==2.1.0)", "sphinx (==1.8.5)", "sphinx-rtd-theme (==0.4.3)", "sphinxcontrib-serializinghtml (==1.1.4)", "sphinxcontrib-websupport (==1.2.4)", "urllib3 (==1.26.4)"] -qa = ["flake8 (==3.8.3)", "mypy (==0.782)"] -testing = ["Django (<3.1)", "attrs", "colorama", "docopt", "pytest (<7.0.0)"] +qa = ["flake8 (==5.0.4)", "mypy (==0.971)", "types-setuptools (==67.2.0.1)"] +testing = ["Django", "attrs", "colorama", "docopt", "pytest (<7.0.0)"] [[package]] name = "jinja2" @@ -560,6 +1171,10 @@ description = "A very fast and expressive template engine." category = "dev" optional = false python-versions = ">=3.7" +files = [ + {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"}, + {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"}, +] [package.dependencies] MarkupSafe = ">=2.0" @@ -569,11 +1184,15 @@ i18n = ["Babel (>=2.7)"] [[package]] name = "jsonschema" -version = "4.18.4" +version = "4.19.1" description = "An implementation of JSON Schema validation for Python" category = "dev" optional = false python-versions = ">=3.8" +files = [ + {file = "jsonschema-4.19.1-py3-none-any.whl", hash = "sha256:cd5f1f9ed9444e554b38ba003af06c0a8c2868131e56bfbef0550fb450c0330e"}, + {file = "jsonschema-4.19.1.tar.gz", hash = "sha256:ec84cc37cfa703ef7cd4928db24f9cb31428a5d0fa77747b8b51a847458e0bbf"}, +] [package.dependencies] attrs = ">=22.2.0" @@ -592,17 +1211,25 @@ description = "The JSON Schema meta-schemas and vocabularies, exposed as a Regis category = "dev" optional = false python-versions = ">=3.8" +files = [ + {file = "jsonschema_specifications-2023.7.1-py3-none-any.whl", hash = "sha256:05adf340b659828a004220a9613be00fa3f223f2b82002e273dee62fd50524b1"}, + {file = "jsonschema_specifications-2023.7.1.tar.gz", hash = "sha256:c91a50404e88a1f6ba40636778e2ee08f6e24c5613fe4c53ac24578a5a7f72bb"}, +] [package.dependencies] referencing = ">=0.28.0" [[package]] name = "jupyter-client" -version = "8.2.0" +version = "8.3.1" description = "Jupyter protocol implementation and client libraries" category = "dev" optional = false python-versions = ">=3.8" +files = [ + {file = "jupyter_client-8.3.1-py3-none-any.whl", hash = "sha256:5eb9f55eb0650e81de6b7e34308d8b92d04fe4ec41cd8193a913979e33d8e1a5"}, + {file = "jupyter_client-8.3.1.tar.gz", hash = "sha256:60294b2d5b869356c893f57b1a877ea6510d60d45cf4b38057f1672d85699ac9"}, +] [package.dependencies] importlib-metadata = {version = ">=4.8.3", markers = "python_version < \"3.10\""} @@ -618,11 +1245,15 @@ test = ["coverage", "ipykernel (>=6.14)", "mypy", "paramiko", "pre-commit", "pyt [[package]] name = "jupyter-core" -version = "5.3.0" +version = "5.4.0" description = "Jupyter core package. A base package on which Jupyter projects rely." category = "dev" optional = false python-versions = ">=3.8" +files = [ + {file = "jupyter_core-5.4.0-py3-none-any.whl", hash = "sha256:66e252f675ac04dcf2feb6ed4afb3cd7f68cf92f483607522dc251f32d471571"}, + {file = "jupyter_core-5.4.0.tar.gz", hash = "sha256:e4b98344bb94ee2e3e6c4519a97d001656009f9cb2b7f2baf15b3c205770011d"}, +] [package.dependencies] platformdirs = ">=2.5" @@ -640,14 +1271,124 @@ description = "Pygments theme using JupyterLab CSS variables" category = "dev" optional = false python-versions = ">=3.7" +files = [ + {file = "jupyterlab_pygments-0.2.2-py2.py3-none-any.whl", hash = "sha256:2405800db07c9f770863bcf8049a529c3dd4d3e28536638bd7c1c01d2748309f"}, + {file = "jupyterlab_pygments-0.2.2.tar.gz", hash = "sha256:7405d7fde60819d905a9fa8ce89e4cd830e318cdad22a0030f7a901da705585d"}, +] [[package]] name = "kiwisolver" -version = "1.4.4" +version = "1.4.5" description = "A fast implementation of the Cassowary constraint solver" category = "dev" optional = false python-versions = ">=3.7" +files = [ + {file = "kiwisolver-1.4.5-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:05703cf211d585109fcd72207a31bb170a0f22144d68298dc5e61b3c946518af"}, + {file = "kiwisolver-1.4.5-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:146d14bebb7f1dc4d5fbf74f8a6cb15ac42baadee8912eb84ac0b3b2a3dc6ac3"}, + {file = "kiwisolver-1.4.5-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:6ef7afcd2d281494c0a9101d5c571970708ad911d028137cd558f02b851c08b4"}, + {file = "kiwisolver-1.4.5-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:9eaa8b117dc8337728e834b9c6e2611f10c79e38f65157c4c38e9400286f5cb1"}, + {file = "kiwisolver-1.4.5-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:ec20916e7b4cbfb1f12380e46486ec4bcbaa91a9c448b97023fde0d5bbf9e4ff"}, + {file = "kiwisolver-1.4.5-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:39b42c68602539407884cf70d6a480a469b93b81b7701378ba5e2328660c847a"}, + {file = "kiwisolver-1.4.5-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:aa12042de0171fad672b6c59df69106d20d5596e4f87b5e8f76df757a7c399aa"}, + {file = "kiwisolver-1.4.5-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2a40773c71d7ccdd3798f6489aaac9eee213d566850a9533f8d26332d626b82c"}, + {file = "kiwisolver-1.4.5-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:19df6e621f6d8b4b9c4d45f40a66839294ff2bb235e64d2178f7522d9170ac5b"}, + {file = "kiwisolver-1.4.5-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:83d78376d0d4fd884e2c114d0621624b73d2aba4e2788182d286309ebdeed770"}, + {file = "kiwisolver-1.4.5-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:e391b1f0a8a5a10ab3b9bb6afcfd74f2175f24f8975fb87ecae700d1503cdee0"}, + {file = "kiwisolver-1.4.5-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:852542f9481f4a62dbb5dd99e8ab7aedfeb8fb6342349a181d4036877410f525"}, + {file = "kiwisolver-1.4.5-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:59edc41b24031bc25108e210c0def6f6c2191210492a972d585a06ff246bb79b"}, + {file = "kiwisolver-1.4.5-cp310-cp310-win32.whl", hash = "sha256:a6aa6315319a052b4ee378aa171959c898a6183f15c1e541821c5c59beaa0238"}, + {file = "kiwisolver-1.4.5-cp310-cp310-win_amd64.whl", hash = "sha256:d0ef46024e6a3d79c01ff13801cb19d0cad7fd859b15037aec74315540acc276"}, + {file = "kiwisolver-1.4.5-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:11863aa14a51fd6ec28688d76f1735f8f69ab1fabf388851a595d0721af042f5"}, + {file = "kiwisolver-1.4.5-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:8ab3919a9997ab7ef2fbbed0cc99bb28d3c13e6d4b1ad36e97e482558a91be90"}, + {file = "kiwisolver-1.4.5-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:fcc700eadbbccbf6bc1bcb9dbe0786b4b1cb91ca0dcda336eef5c2beed37b797"}, + {file = "kiwisolver-1.4.5-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:dfdd7c0b105af050eb3d64997809dc21da247cf44e63dc73ff0fd20b96be55a9"}, + {file = "kiwisolver-1.4.5-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:76c6a5964640638cdeaa0c359382e5703e9293030fe730018ca06bc2010c4437"}, + {file = "kiwisolver-1.4.5-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:bbea0db94288e29afcc4c28afbf3a7ccaf2d7e027489c449cf7e8f83c6346eb9"}, + {file = "kiwisolver-1.4.5-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ceec1a6bc6cab1d6ff5d06592a91a692f90ec7505d6463a88a52cc0eb58545da"}, + {file = "kiwisolver-1.4.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:040c1aebeda72197ef477a906782b5ab0d387642e93bda547336b8957c61022e"}, + {file = "kiwisolver-1.4.5-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:f91de7223d4c7b793867797bacd1ee53bfe7359bd70d27b7b58a04efbb9436c8"}, + {file = "kiwisolver-1.4.5-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:faae4860798c31530dd184046a900e652c95513796ef51a12bc086710c2eec4d"}, + {file = "kiwisolver-1.4.5-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:b0157420efcb803e71d1b28e2c287518b8808b7cf1ab8af36718fd0a2c453eb0"}, + {file = "kiwisolver-1.4.5-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:06f54715b7737c2fecdbf140d1afb11a33d59508a47bf11bb38ecf21dc9ab79f"}, + {file = "kiwisolver-1.4.5-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:fdb7adb641a0d13bdcd4ef48e062363d8a9ad4a182ac7647ec88f695e719ae9f"}, + {file = "kiwisolver-1.4.5-cp311-cp311-win32.whl", hash = "sha256:bb86433b1cfe686da83ce32a9d3a8dd308e85c76b60896d58f082136f10bffac"}, + {file = "kiwisolver-1.4.5-cp311-cp311-win_amd64.whl", hash = "sha256:6c08e1312a9cf1074d17b17728d3dfce2a5125b2d791527f33ffbe805200a355"}, + {file = "kiwisolver-1.4.5-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:32d5cf40c4f7c7b3ca500f8985eb3fb3a7dfc023215e876f207956b5ea26632a"}, + {file = "kiwisolver-1.4.5-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:f846c260f483d1fd217fe5ed7c173fb109efa6b1fc8381c8b7552c5781756192"}, + {file = "kiwisolver-1.4.5-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:5ff5cf3571589b6d13bfbfd6bcd7a3f659e42f96b5fd1c4830c4cf21d4f5ef45"}, + {file = "kiwisolver-1.4.5-cp312-cp312-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7269d9e5f1084a653d575c7ec012ff57f0c042258bf5db0954bf551c158466e7"}, + {file = "kiwisolver-1.4.5-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:da802a19d6e15dffe4b0c24b38b3af68e6c1a68e6e1d8f30148c83864f3881db"}, + {file = "kiwisolver-1.4.5-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3aba7311af82e335dd1e36ffff68aaca609ca6290c2cb6d821a39aa075d8e3ff"}, + {file = "kiwisolver-1.4.5-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:763773d53f07244148ccac5b084da5adb90bfaee39c197554f01b286cf869228"}, + {file = "kiwisolver-1.4.5-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2270953c0d8cdab5d422bee7d2007f043473f9d2999631c86a223c9db56cbd16"}, + {file = "kiwisolver-1.4.5-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:d099e745a512f7e3bbe7249ca835f4d357c586d78d79ae8f1dcd4d8adeb9bda9"}, + {file = "kiwisolver-1.4.5-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:74db36e14a7d1ce0986fa104f7d5637aea5c82ca6326ed0ec5694280942d1162"}, + {file = "kiwisolver-1.4.5-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:7e5bab140c309cb3a6ce373a9e71eb7e4873c70c2dda01df6820474f9889d6d4"}, + {file = "kiwisolver-1.4.5-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:0f114aa76dc1b8f636d077979c0ac22e7cd8f3493abbab152f20eb8d3cda71f3"}, + {file = "kiwisolver-1.4.5-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:88a2df29d4724b9237fc0c6eaf2a1adae0cdc0b3e9f4d8e7dc54b16812d2d81a"}, + {file = "kiwisolver-1.4.5-cp312-cp312-win32.whl", hash = "sha256:72d40b33e834371fd330fb1472ca19d9b8327acb79a5821d4008391db8e29f20"}, + {file = "kiwisolver-1.4.5-cp312-cp312-win_amd64.whl", hash = "sha256:2c5674c4e74d939b9d91dda0fae10597ac7521768fec9e399c70a1f27e2ea2d9"}, + {file = "kiwisolver-1.4.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:3a2b053a0ab7a3960c98725cfb0bf5b48ba82f64ec95fe06f1d06c99b552e130"}, + {file = "kiwisolver-1.4.5-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3cd32d6c13807e5c66a7cbb79f90b553642f296ae4518a60d8d76243b0ad2898"}, + {file = "kiwisolver-1.4.5-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:59ec7b7c7e1a61061850d53aaf8e93db63dce0c936db1fda2658b70e4a1be709"}, + {file = "kiwisolver-1.4.5-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:da4cfb373035def307905d05041c1d06d8936452fe89d464743ae7fb8371078b"}, + {file = "kiwisolver-1.4.5-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:2400873bccc260b6ae184b2b8a4fec0e4082d30648eadb7c3d9a13405d861e89"}, + {file = "kiwisolver-1.4.5-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:1b04139c4236a0f3aff534479b58f6f849a8b351e1314826c2d230849ed48985"}, + {file = "kiwisolver-1.4.5-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:4e66e81a5779b65ac21764c295087de82235597a2293d18d943f8e9e32746265"}, + {file = "kiwisolver-1.4.5-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:7931d8f1f67c4be9ba1dd9c451fb0eeca1a25b89e4d3f89e828fe12a519b782a"}, + {file = "kiwisolver-1.4.5-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:b3f7e75f3015df442238cca659f8baa5f42ce2a8582727981cbfa15fee0ee205"}, + {file = "kiwisolver-1.4.5-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:bbf1d63eef84b2e8c89011b7f2235b1e0bf7dacc11cac9431fc6468e99ac77fb"}, + {file = "kiwisolver-1.4.5-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:4c380469bd3f970ef677bf2bcba2b6b0b4d5c75e7a020fb863ef75084efad66f"}, + {file = "kiwisolver-1.4.5-cp37-cp37m-win32.whl", hash = "sha256:9408acf3270c4b6baad483865191e3e582b638b1654a007c62e3efe96f09a9a3"}, + {file = "kiwisolver-1.4.5-cp37-cp37m-win_amd64.whl", hash = "sha256:5b94529f9b2591b7af5f3e0e730a4e0a41ea174af35a4fd067775f9bdfeee01a"}, + {file = "kiwisolver-1.4.5-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:11c7de8f692fc99816e8ac50d1d1aef4f75126eefc33ac79aac02c099fd3db71"}, + {file = "kiwisolver-1.4.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:53abb58632235cd154176ced1ae8f0d29a6657aa1aa9decf50b899b755bc2b93"}, + {file = "kiwisolver-1.4.5-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:88b9f257ca61b838b6f8094a62418421f87ac2a1069f7e896c36a7d86b5d4c29"}, + {file = "kiwisolver-1.4.5-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3195782b26fc03aa9c6913d5bad5aeb864bdc372924c093b0f1cebad603dd712"}, + {file = "kiwisolver-1.4.5-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:fc579bf0f502e54926519451b920e875f433aceb4624a3646b3252b5caa9e0b6"}, + {file = "kiwisolver-1.4.5-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5a580c91d686376f0f7c295357595c5a026e6cbc3d77b7c36e290201e7c11ecb"}, + {file = "kiwisolver-1.4.5-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:cfe6ab8da05c01ba6fbea630377b5da2cd9bcbc6338510116b01c1bc939a2c18"}, + {file = "kiwisolver-1.4.5-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:d2e5a98f0ec99beb3c10e13b387f8db39106d53993f498b295f0c914328b1333"}, + {file = "kiwisolver-1.4.5-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:a51a263952b1429e429ff236d2f5a21c5125437861baeed77f5e1cc2d2c7c6da"}, + {file = "kiwisolver-1.4.5-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:3edd2fa14e68c9be82c5b16689e8d63d89fe927e56debd6e1dbce7a26a17f81b"}, + {file = "kiwisolver-1.4.5-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:74d1b44c6cfc897df648cc9fdaa09bc3e7679926e6f96df05775d4fb3946571c"}, + {file = "kiwisolver-1.4.5-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:76d9289ed3f7501012e05abb8358bbb129149dbd173f1f57a1bf1c22d19ab7cc"}, + {file = "kiwisolver-1.4.5-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:92dea1ffe3714fa8eb6a314d2b3c773208d865a0e0d35e713ec54eea08a66250"}, + {file = "kiwisolver-1.4.5-cp38-cp38-win32.whl", hash = "sha256:5c90ae8c8d32e472be041e76f9d2f2dbff4d0b0be8bd4041770eddb18cf49a4e"}, + {file = "kiwisolver-1.4.5-cp38-cp38-win_amd64.whl", hash = "sha256:c7940c1dc63eb37a67721b10d703247552416f719c4188c54e04334321351ced"}, + {file = "kiwisolver-1.4.5-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:9407b6a5f0d675e8a827ad8742e1d6b49d9c1a1da5d952a67d50ef5f4170b18d"}, + {file = "kiwisolver-1.4.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:15568384086b6df3c65353820a4473575dbad192e35010f622c6ce3eebd57af9"}, + {file = "kiwisolver-1.4.5-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:0dc9db8e79f0036e8173c466d21ef18e1befc02de8bf8aa8dc0813a6dc8a7046"}, + {file = "kiwisolver-1.4.5-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:cdc8a402aaee9a798b50d8b827d7ecf75edc5fb35ea0f91f213ff927c15f4ff0"}, + {file = "kiwisolver-1.4.5-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:6c3bd3cde54cafb87d74d8db50b909705c62b17c2099b8f2e25b461882e544ff"}, + {file = "kiwisolver-1.4.5-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:955e8513d07a283056b1396e9a57ceddbd272d9252c14f154d450d227606eb54"}, + {file = "kiwisolver-1.4.5-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:346f5343b9e3f00b8db8ba359350eb124b98c99efd0b408728ac6ebf38173958"}, + {file = "kiwisolver-1.4.5-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b9098e0049e88c6a24ff64545cdfc50807818ba6c1b739cae221bbbcbc58aad3"}, + {file = "kiwisolver-1.4.5-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:00bd361b903dc4bbf4eb165f24d1acbee754fce22ded24c3d56eec268658a5cf"}, + {file = "kiwisolver-1.4.5-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:7b8b454bac16428b22560d0a1cf0a09875339cab69df61d7805bf48919415901"}, + {file = "kiwisolver-1.4.5-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:f1d072c2eb0ad60d4c183f3fb44ac6f73fb7a8f16a2694a91f988275cbf352f9"}, + {file = "kiwisolver-1.4.5-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:31a82d498054cac9f6d0b53d02bb85811185bcb477d4b60144f915f3b3126342"}, + {file = "kiwisolver-1.4.5-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:6512cb89e334e4700febbffaaa52761b65b4f5a3cf33f960213d5656cea36a77"}, + {file = "kiwisolver-1.4.5-cp39-cp39-win32.whl", hash = "sha256:9db8ea4c388fdb0f780fe91346fd438657ea602d58348753d9fb265ce1bca67f"}, + {file = "kiwisolver-1.4.5-cp39-cp39-win_amd64.whl", hash = "sha256:59415f46a37f7f2efeec758353dd2eae1b07640d8ca0f0c42548ec4125492635"}, + {file = "kiwisolver-1.4.5-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:5c7b3b3a728dc6faf3fc372ef24f21d1e3cee2ac3e9596691d746e5a536de920"}, + {file = "kiwisolver-1.4.5-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:620ced262a86244e2be10a676b646f29c34537d0d9cc8eb26c08f53d98013390"}, + {file = "kiwisolver-1.4.5-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:378a214a1e3bbf5ac4a8708304318b4f890da88c9e6a07699c4ae7174c09a68d"}, + {file = "kiwisolver-1.4.5-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:aaf7be1207676ac608a50cd08f102f6742dbfc70e8d60c4db1c6897f62f71523"}, + {file = "kiwisolver-1.4.5-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:ba55dce0a9b8ff59495ddd050a0225d58bd0983d09f87cfe2b6aec4f2c1234e4"}, + {file = "kiwisolver-1.4.5-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:fd32ea360bcbb92d28933fc05ed09bffcb1704ba3fc7942e81db0fd4f81a7892"}, + {file = "kiwisolver-1.4.5-pp38-pypy38_pp73-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:5e7139af55d1688f8b960ee9ad5adafc4ac17c1c473fe07133ac092310d76544"}, + {file = "kiwisolver-1.4.5-pp38-pypy38_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:dced8146011d2bc2e883f9bd68618b8247387f4bbec46d7392b3c3b032640126"}, + {file = "kiwisolver-1.4.5-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c9bf3325c47b11b2e51bca0824ea217c7cd84491d8ac4eefd1e409705ef092bd"}, + {file = "kiwisolver-1.4.5-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:5794cf59533bc3f1b1c821f7206a3617999db9fbefc345360aafe2e067514929"}, + {file = "kiwisolver-1.4.5-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:e368f200bbc2e4f905b8e71eb38b3c04333bddaa6a2464a6355487b02bb7fb09"}, + {file = "kiwisolver-1.4.5-pp39-pypy39_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e5d706eba36b4c4d5bc6c6377bb6568098765e990cfc21ee16d13963fab7b3e7"}, + {file = "kiwisolver-1.4.5-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:85267bd1aa8880a9c88a8cb71e18d3d64d2751a790e6ca6c27b8ccc724bcd5ad"}, + {file = "kiwisolver-1.4.5-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:210ef2c3a1f03272649aff1ef992df2e724748918c4bc2d5a90352849eb40bea"}, + {file = "kiwisolver-1.4.5-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:11d011a7574eb3b82bcc9c1a1d35c1d7075677fdd15de527d91b46bd35e935ee"}, + {file = "kiwisolver-1.4.5.tar.gz", hash = "sha256:e57e563a57fb22a142da34f38acc2fc1a5c864bc29ca1517a88abc963e60d6ec"}, +] [[package]] name = "markdown-it-py" @@ -656,6 +1397,10 @@ description = "Python port of markdown-it. Markdown parsing, done right!" category = "dev" optional = false python-versions = ">=3.7" +files = [ + {file = "markdown-it-py-2.2.0.tar.gz", hash = "sha256:7c9a5e412688bc771c67432cbfebcdd686c93ce6484913dccf06cb5a0bea35a1"}, + {file = "markdown_it_py-2.2.0-py3-none-any.whl", hash = "sha256:5a35f8d1870171d9acc47b99612dc146129b631baf04970128b568f190d0cc30"}, +] [package.dependencies] mdurl = ">=0.1,<1.0" @@ -672,19 +1417,111 @@ testing = ["coverage", "pytest", "pytest-cov", "pytest-regressions"] [[package]] name = "markupsafe" -version = "2.1.2" +version = "2.1.3" description = "Safely add untrusted strings to HTML/XML markup." category = "dev" optional = false python-versions = ">=3.7" +files = [ + {file = "MarkupSafe-2.1.3-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:cd0f502fe016460680cd20aaa5a76d241d6f35a1c3350c474bac1273803893fa"}, + {file = "MarkupSafe-2.1.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e09031c87a1e51556fdcb46e5bd4f59dfb743061cf93c4d6831bf894f125eb57"}, + {file = "MarkupSafe-2.1.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:68e78619a61ecf91e76aa3e6e8e33fc4894a2bebe93410754bd28fce0a8a4f9f"}, + {file = "MarkupSafe-2.1.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:65c1a9bcdadc6c28eecee2c119465aebff8f7a584dd719facdd9e825ec61ab52"}, + {file = "MarkupSafe-2.1.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:525808b8019e36eb524b8c68acdd63a37e75714eac50e988180b169d64480a00"}, + {file = "MarkupSafe-2.1.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:962f82a3086483f5e5f64dbad880d31038b698494799b097bc59c2edf392fce6"}, + {file = "MarkupSafe-2.1.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:aa7bd130efab1c280bed0f45501b7c8795f9fdbeb02e965371bbef3523627779"}, + {file = "MarkupSafe-2.1.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:c9c804664ebe8f83a211cace637506669e7890fec1b4195b505c214e50dd4eb7"}, + {file = "MarkupSafe-2.1.3-cp310-cp310-win32.whl", hash = "sha256:10bbfe99883db80bdbaff2dcf681dfc6533a614f700da1287707e8a5d78a8431"}, + {file = "MarkupSafe-2.1.3-cp310-cp310-win_amd64.whl", hash = "sha256:1577735524cdad32f9f694208aa75e422adba74f1baee7551620e43a3141f559"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:ad9e82fb8f09ade1c3e1b996a6337afac2b8b9e365f926f5a61aacc71adc5b3c"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3c0fae6c3be832a0a0473ac912810b2877c8cb9d76ca48de1ed31e1c68386575"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b076b6226fb84157e3f7c971a47ff3a679d837cf338547532ab866c57930dbee"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bfce63a9e7834b12b87c64d6b155fdd9b3b96191b6bd334bf37db7ff1fe457f2"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:338ae27d6b8745585f87218a3f23f1512dbf52c26c28e322dbe54bcede54ccb9"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:e4dd52d80b8c83fdce44e12478ad2e85c64ea965e75d66dbeafb0a3e77308fcc"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:df0be2b576a7abbf737b1575f048c23fb1d769f267ec4358296f31c2479db8f9"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-win32.whl", hash = "sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb"}, + {file = "MarkupSafe-2.1.3-cp311-cp311-win_amd64.whl", hash = "sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:f698de3fd0c4e6972b92290a45bd9b1536bffe8c6759c62471efaa8acb4c37bc"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:aa57bd9cf8ae831a362185ee444e15a93ecb2e344c8e52e4d721ea3ab6ef1823"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffcc3f7c66b5f5b7931a5aa68fc9cecc51e685ef90282f4a82f0f5e9b704ad11"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47d4f1c5f80fc62fdd7777d0d40a2e9dda0a05883ab11374334f6c4de38adffd"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1f67c7038d560d92149c060157d623c542173016c4babc0c1913cca0564b9939"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:9aad3c1755095ce347e26488214ef77e0485a3c34a50c5a5e2471dff60b9dd9c"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:14ff806850827afd6b07a5f32bd917fb7f45b046ba40c57abdb636674a8b559c"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8f9293864fe09b8149f0cc42ce56e3f0e54de883a9de90cd427f191c346eb2e1"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-win32.whl", hash = "sha256:715d3562f79d540f251b99ebd6d8baa547118974341db04f5ad06d5ea3eb8007"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-win_amd64.whl", hash = "sha256:1b8dd8c3fd14349433c79fa8abeb573a55fc0fdd769133baac1f5e07abf54aeb"}, + {file = "MarkupSafe-2.1.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8e254ae696c88d98da6555f5ace2279cf7cd5b3f52be2b5cf97feafe883b58d2"}, + {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cb0932dc158471523c9637e807d9bfb93e06a95cbf010f1a38b98623b929ef2b"}, + {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9402b03f1a1b4dc4c19845e5c749e3ab82d5078d16a2a4c2cd2df62d57bb0707"}, + {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ca379055a47383d02a5400cb0d110cef0a776fc644cda797db0c5696cfd7e18e"}, + {file = "MarkupSafe-2.1.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:b7ff0f54cb4ff66dd38bebd335a38e2c22c41a8ee45aa608efc890ac3e3931bc"}, + {file = "MarkupSafe-2.1.3-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:c011a4149cfbcf9f03994ec2edffcb8b1dc2d2aede7ca243746df97a5d41ce48"}, + {file = "MarkupSafe-2.1.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:56d9f2ecac662ca1611d183feb03a3fa4406469dafe241673d521dd5ae92a155"}, + {file = "MarkupSafe-2.1.3-cp37-cp37m-win32.whl", hash = "sha256:8758846a7e80910096950b67071243da3e5a20ed2546e6392603c096778d48e0"}, + {file = "MarkupSafe-2.1.3-cp37-cp37m-win_amd64.whl", hash = "sha256:787003c0ddb00500e49a10f2844fac87aa6ce977b90b0feaaf9de23c22508b24"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:2ef12179d3a291be237280175b542c07a36e7f60718296278d8593d21ca937d4"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:2c1b19b3aaacc6e57b7e25710ff571c24d6c3613a45e905b1fde04d691b98ee0"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8afafd99945ead6e075b973fefa56379c5b5c53fd8937dad92c662da5d8fd5ee"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8c41976a29d078bb235fea9b2ecd3da465df42a562910f9022f1a03107bd02be"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d080e0a5eb2529460b30190fcfcc4199bd7f827663f858a226a81bc27beaa97e"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:69c0f17e9f5a7afdf2cc9fb2d1ce6aabdb3bafb7f38017c0b77862bcec2bbad8"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:504b320cd4b7eff6f968eddf81127112db685e81f7e36e75f9f84f0df46041c3"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:42de32b22b6b804f42c5d98be4f7e5e977ecdd9ee9b660fda1a3edf03b11792d"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-win32.whl", hash = "sha256:ceb01949af7121f9fc39f7d27f91be8546f3fb112c608bc4029aef0bab86a2a5"}, + {file = "MarkupSafe-2.1.3-cp38-cp38-win_amd64.whl", hash = "sha256:1b40069d487e7edb2676d3fbdb2b0829ffa2cd63a2ec26c4938b2d34391b4ecc"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:8023faf4e01efadfa183e863fefde0046de576c6f14659e8782065bcece22198"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6b2b56950d93e41f33b4223ead100ea0fe11f8e6ee5f641eb753ce4b77a7042b"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9dcdfd0eaf283af041973bff14a2e143b8bd64e069f4c383416ecd79a81aab58"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:05fb21170423db021895e1ea1e1f3ab3adb85d1c2333cbc2310f2a26bc77272e"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:282c2cb35b5b673bbcadb33a585408104df04f14b2d9b01d4c345a3b92861c2c"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:ab4a0df41e7c16a1392727727e7998a467472d0ad65f3ad5e6e765015df08636"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:7ef3cb2ebbf91e330e3bb937efada0edd9003683db6b57bb108c4001f37a02ea"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:0a4e4a1aff6c7ac4cd55792abf96c915634c2b97e3cc1c7129578aa68ebd754e"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-win32.whl", hash = "sha256:fec21693218efe39aa7f8599346e90c705afa52c5b31ae019b2e57e8f6542bb2"}, + {file = "MarkupSafe-2.1.3-cp39-cp39-win_amd64.whl", hash = "sha256:3fd4abcb888d15a94f32b75d8fd18ee162ca0c064f35b11134be77050296d6ba"}, + {file = "MarkupSafe-2.1.3.tar.gz", hash = "sha256:af598ed32d6ae86f1b747b82783958b1a4ab8f617b06fe68795c7f026abbdcad"}, +] [[package]] name = "matplotlib" -version = "3.7.1" +version = "3.8.0" description = "Python plotting package" category = "dev" optional = false -python-versions = ">=3.8" +python-versions = ">=3.9" +files = [ + {file = "matplotlib-3.8.0-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:c4940bad88a932ddc69734274f6fb047207e008389489f2b6f77d9ca485f0e7a"}, + {file = "matplotlib-3.8.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:a33bd3045c7452ca1fa65676d88ba940867880e13e2546abb143035fa9072a9d"}, + {file = "matplotlib-3.8.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2ea6886e93401c22e534bbfd39201ce8931b75502895cfb115cbdbbe2d31f287"}, + {file = "matplotlib-3.8.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d670b9348e712ec176de225d425f150dc8e37b13010d85233c539b547da0be39"}, + {file = "matplotlib-3.8.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:7b37b74f00c4cb6af908cb9a00779d97d294e89fd2145ad43f0cdc23f635760c"}, + {file = "matplotlib-3.8.0-cp310-cp310-win_amd64.whl", hash = "sha256:0e723f5b96f3cd4aad99103dc93e9e3cdc4f18afdcc76951f4857b46f8e39d2d"}, + {file = "matplotlib-3.8.0-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:5dc945a9cb2deb7d197ba23eb4c210e591d52d77bf0ba27c35fc82dec9fa78d4"}, + {file = "matplotlib-3.8.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f8b5a1bf27d078453aa7b5b27f52580e16360d02df6d3dc9504f3d2ce11f6309"}, + {file = "matplotlib-3.8.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6f25ffb6ad972cdffa7df8e5be4b1e3cadd2f8d43fc72085feb1518006178394"}, + {file = "matplotlib-3.8.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:eee482731c8c17d86d9ddb5194d38621f9b0f0d53c99006275a12523ab021732"}, + {file = "matplotlib-3.8.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:36eafe2128772195b373e1242df28d1b7ec6c04c15b090b8d9e335d55a323900"}, + {file = "matplotlib-3.8.0-cp311-cp311-win_amd64.whl", hash = "sha256:061ee58facb3580cd2d046a6d227fb77e9295599c5ec6ad069f06b5821ad1cfc"}, + {file = "matplotlib-3.8.0-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:3cc3776836d0f4f22654a7f2d2ec2004618d5cf86b7185318381f73b80fd8a2d"}, + {file = "matplotlib-3.8.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:6c49a2bd6981264bddcb8c317b6bd25febcece9e2ebfcbc34e7f4c0c867c09dc"}, + {file = "matplotlib-3.8.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:23ed11654fc83cd6cfdf6170b453e437674a050a452133a064d47f2f1371f8d3"}, + {file = "matplotlib-3.8.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dae97fdd6996b3a25da8ee43e3fc734fff502f396801063c6b76c20b56683196"}, + {file = "matplotlib-3.8.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:87df75f528020a6299f76a1d986c0ed4406e3b2bd44bc5e306e46bca7d45e53e"}, + {file = "matplotlib-3.8.0-cp312-cp312-win_amd64.whl", hash = "sha256:90d74a95fe055f73a6cd737beecc1b81c26f2893b7a3751d52b53ff06ca53f36"}, + {file = "matplotlib-3.8.0-cp39-cp39-macosx_10_12_x86_64.whl", hash = "sha256:c3499c312f5def8f362a2bf761d04fa2d452b333f3a9a3f58805273719bf20d9"}, + {file = "matplotlib-3.8.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:31e793c8bd4ea268cc5d3a695c27b30650ec35238626961d73085d5e94b6ab68"}, + {file = "matplotlib-3.8.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0d5ee602ef517a89d1f2c508ca189cfc395dd0b4a08284fb1b97a78eec354644"}, + {file = "matplotlib-3.8.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5de39dc61ca35342cf409e031f70f18219f2c48380d3886c1cf5ad9f17898e06"}, + {file = "matplotlib-3.8.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:dd386c80a98b5f51571b9484bf6c6976de383cd2a8cd972b6a9562d85c6d2087"}, + {file = "matplotlib-3.8.0-cp39-cp39-win_amd64.whl", hash = "sha256:f691b4ef47c7384d0936b2e8ebdeb5d526c81d004ad9403dfb9d4c76b9979a93"}, + {file = "matplotlib-3.8.0-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:0b11f354aae62a2aa53ec5bb09946f5f06fc41793e351a04ff60223ea9162955"}, + {file = "matplotlib-3.8.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7f54b9fb87ca5acbcdd0f286021bedc162e1425fa5555ebf3b3dfc167b955ad9"}, + {file = "matplotlib-3.8.0-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:60a6e04dfd77c0d3bcfee61c3cd335fff1b917c2f303b32524cd1235e194ef99"}, + {file = "matplotlib-3.8.0.tar.gz", hash = "sha256:df8505e1c19d5c2c26aff3497a7cbd3ccfc2e97043d1e4db3e76afa399164b69"}, +] [package.dependencies] contourpy = ">=1.0.1" @@ -692,7 +1529,7 @@ cycler = ">=0.10" fonttools = ">=4.22.0" importlib-resources = {version = ">=3.2.0", markers = "python_version < \"3.10\""} kiwisolver = ">=1.0.1" -numpy = ">=1.20" +numpy = ">=1.21,<2" packaging = ">=20.0" pillow = ">=6.2.0" pyparsing = ">=2.3.1" @@ -706,6 +1543,10 @@ description = "Inline Matplotlib backend for Jupyter" category = "dev" optional = false python-versions = ">=3.5" +files = [ + {file = "matplotlib-inline-0.1.6.tar.gz", hash = "sha256:f887e5f10ba98e8d2b150ddcf4702c1e5f8b3a20005eb0f74bfdbd360ee6f304"}, + {file = "matplotlib_inline-0.1.6-py3-none-any.whl", hash = "sha256:f1f41aab5328aa5aaea9b16d083b128102f8712542f819fe7e6a420ff581b311"}, +] [package.dependencies] traitlets = "*" @@ -717,6 +1558,10 @@ description = "Collection of plugins for markdown-it-py" category = "dev" optional = false python-versions = ">=3.7" +files = [ + {file = "mdit-py-plugins-0.3.5.tar.gz", hash = "sha256:eee0adc7195e5827e17e02d2a258a2ba159944a0748f59c5099a4a27f78fcf6a"}, + {file = "mdit_py_plugins-0.3.5-py3-none-any.whl", hash = "sha256:ca9a0714ea59a24b2b044a1831f48d817dd0c817e84339f20e7889f392d77c4e"}, +] [package.dependencies] markdown-it-py = ">=1.0.0,<3.0.0" @@ -733,22 +1578,46 @@ description = "Markdown URL utilities" category = "dev" optional = false python-versions = ">=3.7" +files = [ + {file = "mdurl-0.1.2-py3-none-any.whl", hash = "sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8"}, + {file = "mdurl-0.1.2.tar.gz", hash = "sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba"}, +] [[package]] name = "mistune" -version = "3.0.1" +version = "3.0.2" description = "A sane and fast Markdown parser with useful plugins and renderers" category = "dev" optional = false python-versions = ">=3.7" +files = [ + {file = "mistune-3.0.2-py3-none-any.whl", hash = "sha256:71481854c30fdbc938963d3605b72501f5c10a9320ecd412c121c163a1c7d205"}, + {file = "mistune-3.0.2.tar.gz", hash = "sha256:fc7f93ded930c92394ef2cb6f04a8aabab4117a91449e72dcc8dfa646a508be8"}, +] [[package]] name = "more-itertools" -version = "9.1.0" +version = "10.1.0" description = "More routines for operating on iterables, beyond itertools" category = "main" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" +files = [ + {file = "more-itertools-10.1.0.tar.gz", hash = "sha256:626c369fa0eb37bac0291bce8259b332fd59ac792fa5497b59837309cd5b114a"}, + {file = "more_itertools-10.1.0-py3-none-any.whl", hash = "sha256:64e0735fcfdc6f3464ea133afe8ea4483b1c5fe3a3d69852e6503b43a0b222e6"}, +] + +[[package]] +name = "mypy-extensions" +version = "1.0.0" +description = "Type system extensions for programs checked with the mypy type checker." +category = "dev" +optional = false +python-versions = ">=3.5" +files = [ + {file = "mypy_extensions-1.0.0-py3-none-any.whl", hash = "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d"}, + {file = "mypy_extensions-1.0.0.tar.gz", hash = "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782"}, +] [[package]] name = "myst-parser" @@ -757,6 +1626,10 @@ description = "An extended commonmark compliant parser, with bridges to docutils category = "dev" optional = false python-versions = ">=3.7" +files = [ + {file = "myst-parser-0.18.1.tar.gz", hash = "sha256:79317f4bb2c13053dd6e64f9da1ba1da6cd9c40c8a430c447a7b146a594c246d"}, + {file = "myst_parser-0.18.1-py3-none-any.whl", hash = "sha256:61b275b85d9f58aa327f370913ae1bec26ebad372cc99f3ab85c8ec3ee8d9fb8"}, +] [package.dependencies] docutils = ">=0.15,<0.20" @@ -780,6 +1653,10 @@ description = "A client library for executing notebooks. Formerly nbconvert's Ex category = "dev" optional = false python-versions = ">=3.8.0" +files = [ + {file = "nbclient-0.8.0-py3-none-any.whl", hash = "sha256:25e861299e5303a0477568557c4045eccc7a34c17fc08e7959558707b9ebe548"}, + {file = "nbclient-0.8.0.tar.gz", hash = "sha256:f9b179cd4b2d7bca965f900a2ebf0db4a12ebff2f36a711cb66861e4ae158e55"}, +] [package.dependencies] jupyter-client = ">=6.1.12" @@ -794,11 +1671,15 @@ test = ["flaky", "ipykernel (>=6.19.3)", "ipython", "ipywidgets", "nbconvert (>= [[package]] name = "nbconvert" -version = "7.7.3" +version = "7.9.2" description = "Converting Jupyter Notebooks" category = "dev" optional = false python-versions = ">=3.8" +files = [ + {file = "nbconvert-7.9.2-py3-none-any.whl", hash = "sha256:39fe4b8bdd1b0104fdd86fc8a43a9077ba64c720bda4c6132690d917a0a154ee"}, + {file = "nbconvert-7.9.2.tar.gz", hash = "sha256:e56cc7588acc4f93e2bb5a34ec69028e4941797b2bfaf6462f18a41d1cc258c9"}, +] [package.dependencies] beautifulsoup4 = "*" @@ -824,7 +1705,7 @@ docs = ["ipykernel", "ipython", "myst-parser", "nbsphinx (>=0.2.12)", "pydata-sp qtpdf = ["nbconvert[qtpng]"] qtpng = ["pyqtwebengine (>=5.15)"] serve = ["tornado (>=6.1)"] -test = ["flaky", "ipykernel", "ipywidgets (>=7)", "pre-commit", "pytest", "pytest-dependency"] +test = ["flaky", "ipykernel", "ipywidgets (>=7)", "pytest", "pytest-dependency"] webpdf = ["playwright"] [[package]] @@ -834,6 +1715,10 @@ description = "The Jupyter Notebook format" category = "dev" optional = false python-versions = ">=3.8" +files = [ + {file = "nbformat-5.9.2-py3-none-any.whl", hash = "sha256:1c5172d786a41b82bcfd0c23f9e6b6f072e8fb49c39250219e4acfff1efe89e9"}, + {file = "nbformat-5.9.2.tar.gz", hash = "sha256:5f98b5ba1997dff175e77e0c17d5c10a96eaed2cbd1de3533d1fc35d5e111192"}, +] [package.dependencies] fastjsonschema = "*" @@ -847,11 +1732,15 @@ test = ["pep440", "pre-commit", "pytest", "testpath"] [[package]] name = "nbsphinx" -version = "0.9.2" +version = "0.9.3" description = "Jupyter Notebook Tools for Sphinx" category = "dev" optional = false python-versions = ">=3.6" +files = [ + {file = "nbsphinx-0.9.3-py3-none-any.whl", hash = "sha256:6e805e9627f4a358bd5720d5cbf8bf48853989c79af557afd91a5f22e163029f"}, + {file = "nbsphinx-0.9.3.tar.gz", hash = "sha256:ec339c8691b688f8676104a367a4b8cf3ea01fd089dc28d24dec22d563b11562"}, +] [package.dependencies] docutils = "*" @@ -863,11 +1752,14 @@ traitlets = ">=5" [[package]] name = "neo4j" -version = "4.4.10" +version = "4.4.11" description = "Neo4j Bolt driver for Python" category = "main" optional = false python-versions = ">=3.6" +files = [ + {file = "neo4j-4.4.11.tar.gz", hash = "sha256:2fb4693d524e7661ed6b0ea5b4e3a6272dba2567809ecd1d63f1c896ebcfc241"}, +] [package.dependencies] pytz = "*" @@ -879,6 +1771,10 @@ description = "" category = "main" optional = false python-versions = ">=3.8,<4.0" +files = [ + {file = "neo4j-utils-0.0.7.tar.gz", hash = "sha256:c50e1e6cc3fd852dceadb93320718271afc6ae4efba662bde0cadd9d591ce031"}, + {file = "neo4j_utils-0.0.7-py3-none-any.whl", hash = "sha256:afb49258e60e9123c93dae99eef86fd5f8572997b5edaccaaae95b8826e02f42"}, +] [package.dependencies] colorlog = "*" @@ -888,94 +1784,265 @@ toml = "*" [[package]] name = "nest-asyncio" -version = "1.5.6" +version = "1.5.8" description = "Patch asyncio to allow nested event loops" category = "dev" optional = false python-versions = ">=3.5" +files = [ + {file = "nest_asyncio-1.5.8-py3-none-any.whl", hash = "sha256:accda7a339a70599cb08f9dd09a67e0c2ef8d8d6f4c07f96ab203f2ae254e48d"}, + {file = "nest_asyncio-1.5.8.tar.gz", hash = "sha256:25aa2ca0d2a5b5531956b9e273b45cf664cae2b145101d73b86b199978d48fdb"}, +] [[package]] name = "networkx" -version = "3.0" +version = "3.1" description = "Python package for creating and manipulating graphs and networks" category = "main" optional = false python-versions = ">=3.8" +files = [ + {file = "networkx-3.1-py3-none-any.whl", hash = "sha256:4f33f68cb2afcf86f28a45f43efc27a9386b535d567d2127f8f61d51dec58d36"}, + {file = "networkx-3.1.tar.gz", hash = "sha256:de346335408f84de0eada6ff9fafafff9bcda11f0a0dfaa931133debb146ab61"}, +] [package.extras] default = ["matplotlib (>=3.4)", "numpy (>=1.20)", "pandas (>=1.3)", "scipy (>=1.8)"] -developer = ["mypy (>=0.991)", "pre-commit (>=2.20)"] -doc = ["nb2plots (>=0.6)", "numpydoc (>=1.5)", "pillow (>=9.2)", "pydata-sphinx-theme (>=0.11)", "sphinx (==5.2.3)", "sphinx-gallery (>=0.11)", "texext (>=0.6.7)"] +developer = ["mypy (>=1.1)", "pre-commit (>=3.2)"] +doc = ["nb2plots (>=0.6)", "numpydoc (>=1.5)", "pillow (>=9.4)", "pydata-sphinx-theme (>=0.13)", "sphinx (>=6.1)", "sphinx-gallery (>=0.12)", "texext (>=0.6.7)"] extra = ["lxml (>=4.6)", "pydot (>=1.4.2)", "pygraphviz (>=1.10)", "sympy (>=1.10)"] test = ["codecov (>=2.1)", "pytest (>=7.2)", "pytest-cov (>=4.0)"] [[package]] name = "nodeenv" -version = "1.7.0" +version = "1.8.0" description = "Node.js virtual environment builder" category = "dev" optional = false python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*" +files = [ + {file = "nodeenv-1.8.0-py2.py3-none-any.whl", hash = "sha256:df865724bb3c3adc86b3876fa209771517b0cfe596beff01a92700e0e8be4cec"}, + {file = "nodeenv-1.8.0.tar.gz", hash = "sha256:d51e0c37e64fbf47d017feac3145cdbb58836d7eee8c6f6d3b6880c5456227d2"}, +] [package.dependencies] setuptools = "*" [[package]] name = "numpy" -version = "1.24.3" +version = "1.25.2" description = "Fundamental package for array computing in Python" category = "main" optional = false -python-versions = ">=3.8" +python-versions = ">=3.9" +files = [ + {file = "numpy-1.25.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:db3ccc4e37a6873045580d413fe79b68e47a681af8db2e046f1dacfa11f86eb3"}, + {file = "numpy-1.25.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:90319e4f002795ccfc9050110bbbaa16c944b1c37c0baeea43c5fb881693ae1f"}, + {file = "numpy-1.25.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dfe4a913e29b418d096e696ddd422d8a5d13ffba4ea91f9f60440a3b759b0187"}, + {file = "numpy-1.25.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f08f2e037bba04e707eebf4bc934f1972a315c883a9e0ebfa8a7756eabf9e357"}, + {file = "numpy-1.25.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:bec1e7213c7cb00d67093247f8c4db156fd03075f49876957dca4711306d39c9"}, + {file = "numpy-1.25.2-cp310-cp310-win32.whl", hash = "sha256:7dc869c0c75988e1c693d0e2d5b26034644399dd929bc049db55395b1379e044"}, + {file = "numpy-1.25.2-cp310-cp310-win_amd64.whl", hash = "sha256:834b386f2b8210dca38c71a6e0f4fd6922f7d3fcff935dbe3a570945acb1b545"}, + {file = "numpy-1.25.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:c5462d19336db4560041517dbb7759c21d181a67cb01b36ca109b2ae37d32418"}, + {file = "numpy-1.25.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:c5652ea24d33585ea39eb6a6a15dac87a1206a692719ff45d53c5282e66d4a8f"}, + {file = "numpy-1.25.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0d60fbae8e0019865fc4784745814cff1c421df5afee233db6d88ab4f14655a2"}, + {file = "numpy-1.25.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:60e7f0f7f6d0eee8364b9a6304c2845b9c491ac706048c7e8cf47b83123b8dbf"}, + {file = "numpy-1.25.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:bb33d5a1cf360304754913a350edda36d5b8c5331a8237268c48f91253c3a364"}, + {file = "numpy-1.25.2-cp311-cp311-win32.whl", hash = "sha256:5883c06bb92f2e6c8181df7b39971a5fb436288db58b5a1c3967702d4278691d"}, + {file = "numpy-1.25.2-cp311-cp311-win_amd64.whl", hash = "sha256:5c97325a0ba6f9d041feb9390924614b60b99209a71a69c876f71052521d42a4"}, + {file = "numpy-1.25.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b79e513d7aac42ae918db3ad1341a015488530d0bb2a6abcbdd10a3a829ccfd3"}, + {file = "numpy-1.25.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:eb942bfb6f84df5ce05dbf4b46673ffed0d3da59f13635ea9b926af3deb76926"}, + {file = "numpy-1.25.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3e0746410e73384e70d286f93abf2520035250aad8c5714240b0492a7302fdca"}, + {file = "numpy-1.25.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d7806500e4f5bdd04095e849265e55de20d8cc4b661b038957354327f6d9b295"}, + {file = "numpy-1.25.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8b77775f4b7df768967a7c8b3567e309f617dd5e99aeb886fa14dc1a0791141f"}, + {file = "numpy-1.25.2-cp39-cp39-win32.whl", hash = "sha256:2792d23d62ec51e50ce4d4b7d73de8f67a2fd3ea710dcbc8563a51a03fb07b01"}, + {file = "numpy-1.25.2-cp39-cp39-win_amd64.whl", hash = "sha256:76b4115d42a7dfc5d485d358728cdd8719be33cc5ec6ec08632a5d6fca2ed380"}, + {file = "numpy-1.25.2-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:1a1329e26f46230bf77b02cc19e900db9b52f398d6722ca853349a782d4cff55"}, + {file = "numpy-1.25.2-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4c3abc71e8b6edba80a01a52e66d83c5d14433cbcd26a40c329ec7ed09f37901"}, + {file = "numpy-1.25.2-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:1b9735c27cea5d995496f46a8b1cd7b408b3f34b6d50459d9ac8fe3a20cc17bf"}, + {file = "numpy-1.25.2.tar.gz", hash = "sha256:fd608e19c8d7c55021dffd43bfe5492fab8cc105cc8986f813f8c3c048b38760"}, +] + +[[package]] +name = "numpy" +version = "1.26.0" +description = "Fundamental package for array computing in Python" +category = "main" +optional = false +python-versions = "<3.13,>=3.9" +files = [ + {file = "numpy-1.26.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f8db2f125746e44dce707dd44d4f4efeea8d7e2b43aace3f8d1f235cfa2733dd"}, + {file = "numpy-1.26.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:0621f7daf973d34d18b4e4bafb210bbaf1ef5e0100b5fa750bd9cde84c7ac292"}, + {file = "numpy-1.26.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:51be5f8c349fdd1a5568e72713a21f518e7d6707bcf8503b528b88d33b57dc68"}, + {file = "numpy-1.26.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:767254ad364991ccfc4d81b8152912e53e103ec192d1bb4ea6b1f5a7117040be"}, + {file = "numpy-1.26.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:436c8e9a4bdeeee84e3e59614d38c3dbd3235838a877af8c211cfcac8a80b8d3"}, + {file = "numpy-1.26.0-cp310-cp310-win32.whl", hash = "sha256:c2e698cb0c6dda9372ea98a0344245ee65bdc1c9dd939cceed6bb91256837896"}, + {file = "numpy-1.26.0-cp310-cp310-win_amd64.whl", hash = "sha256:09aaee96c2cbdea95de76ecb8a586cb687d281c881f5f17bfc0fb7f5890f6b91"}, + {file = "numpy-1.26.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:637c58b468a69869258b8ae26f4a4c6ff8abffd4a8334c830ffb63e0feefe99a"}, + {file = "numpy-1.26.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:306545e234503a24fe9ae95ebf84d25cba1fdc27db971aa2d9f1ab6bba19a9dd"}, + {file = "numpy-1.26.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8c6adc33561bd1d46f81131d5352348350fc23df4d742bb246cdfca606ea1208"}, + {file = "numpy-1.26.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e062aa24638bb5018b7841977c360d2f5917268d125c833a686b7cbabbec496c"}, + {file = "numpy-1.26.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:546b7dd7e22f3c6861463bebb000646fa730e55df5ee4a0224408b5694cc6148"}, + {file = "numpy-1.26.0-cp311-cp311-win32.whl", hash = "sha256:c0b45c8b65b79337dee5134d038346d30e109e9e2e9d43464a2970e5c0e93229"}, + {file = "numpy-1.26.0-cp311-cp311-win_amd64.whl", hash = "sha256:eae430ecf5794cb7ae7fa3808740b015aa80747e5266153128ef055975a72b99"}, + {file = "numpy-1.26.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:166b36197e9debc4e384e9c652ba60c0bacc216d0fc89e78f973a9760b503388"}, + {file = "numpy-1.26.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:f042f66d0b4ae6d48e70e28d487376204d3cbf43b84c03bac57e28dac6151581"}, + {file = "numpy-1.26.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e5e18e5b14a7560d8acf1c596688f4dfd19b4f2945b245a71e5af4ddb7422feb"}, + {file = "numpy-1.26.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7f6bad22a791226d0a5c7c27a80a20e11cfe09ad5ef9084d4d3fc4a299cca505"}, + {file = "numpy-1.26.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:4acc65dd65da28060e206c8f27a573455ed724e6179941edb19f97e58161bb69"}, + {file = "numpy-1.26.0-cp312-cp312-win32.whl", hash = "sha256:bb0d9a1aaf5f1cb7967320e80690a1d7ff69f1d47ebc5a9bea013e3a21faec95"}, + {file = "numpy-1.26.0-cp312-cp312-win_amd64.whl", hash = "sha256:ee84ca3c58fe48b8ddafdeb1db87388dce2c3c3f701bf447b05e4cfcc3679112"}, + {file = "numpy-1.26.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:4a873a8180479bc829313e8d9798d5234dfacfc2e8a7ac188418189bb8eafbd2"}, + {file = "numpy-1.26.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:914b28d3215e0c721dc75db3ad6d62f51f630cb0c277e6b3bcb39519bed10bd8"}, + {file = "numpy-1.26.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c78a22e95182fb2e7874712433eaa610478a3caf86f28c621708d35fa4fd6e7f"}, + {file = "numpy-1.26.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:86f737708b366c36b76e953c46ba5827d8c27b7a8c9d0f471810728e5a2fe57c"}, + {file = "numpy-1.26.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:b44e6a09afc12952a7d2a58ca0a2429ee0d49a4f89d83a0a11052da696440e49"}, + {file = "numpy-1.26.0-cp39-cp39-win32.whl", hash = "sha256:5671338034b820c8d58c81ad1dafc0ed5a00771a82fccc71d6438df00302094b"}, + {file = "numpy-1.26.0-cp39-cp39-win_amd64.whl", hash = "sha256:020cdbee66ed46b671429c7265cf00d8ac91c046901c55684954c3958525dab2"}, + {file = "numpy-1.26.0-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:0792824ce2f7ea0c82ed2e4fecc29bb86bee0567a080dacaf2e0a01fe7654369"}, + {file = "numpy-1.26.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7d484292eaeb3e84a51432a94f53578689ffdea3f90e10c8b203a99be5af57d8"}, + {file = "numpy-1.26.0-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:186ba67fad3c60dbe8a3abff3b67a91351100f2661c8e2a80364ae6279720299"}, + {file = "numpy-1.26.0.tar.gz", hash = "sha256:f93fc78fe8bf15afe2b8d6b6499f1c73953169fad1e9a8dd086cdff3190e7fdf"}, +] [[package]] name = "packaging" -version = "23.0" +version = "23.2" description = "Core utilities for Python packages" category = "main" optional = false python-versions = ">=3.7" +files = [ + {file = "packaging-23.2-py3-none-any.whl", hash = "sha256:8c491190033a9af7e1d931d0b5dacc2ef47509b34dd0de67ed209b5203fc88c7"}, + {file = "packaging-23.2.tar.gz", hash = "sha256:048fb0e9405036518eaaf48a55953c750c11e1a1b68e0dd1a9d62ed0c092cfc5"}, +] [[package]] name = "pandas" -version = "2.0.1" +version = "2.1.0" description = "Powerful data structures for data analysis, time series, and statistics" category = "main" optional = false -python-versions = ">=3.8" +python-versions = ">=3.9" +files = [ + {file = "pandas-2.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:40dd20439ff94f1b2ed55b393ecee9cb6f3b08104c2c40b0cb7186a2f0046242"}, + {file = "pandas-2.1.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:d4f38e4fedeba580285eaac7ede4f686c6701a9e618d8a857b138a126d067f2f"}, + {file = "pandas-2.1.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6e6a0fe052cf27ceb29be9429428b4918f3740e37ff185658f40d8702f0b3e09"}, + {file = "pandas-2.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9d81e1813191070440d4c7a413cb673052b3b4a984ffd86b8dd468c45742d3cc"}, + {file = "pandas-2.1.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:eb20252720b1cc1b7d0b2879ffc7e0542dd568f24d7c4b2347cb035206936421"}, + {file = "pandas-2.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:38f74ef7ebc0ffb43b3d633e23d74882bce7e27bfa09607f3c5d3e03ffd9a4a5"}, + {file = "pandas-2.1.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:cda72cc8c4761c8f1d97b169661f23a86b16fdb240bdc341173aee17e4d6cedd"}, + {file = "pandas-2.1.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:d97daeac0db8c993420b10da4f5f5b39b01fc9ca689a17844e07c0a35ac96b4b"}, + {file = "pandas-2.1.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d8c58b1113892e0c8078f006a167cc210a92bdae23322bb4614f2f0b7a4b510f"}, + {file = "pandas-2.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:629124923bcf798965b054a540f9ccdfd60f71361255c81fa1ecd94a904b9dd3"}, + {file = "pandas-2.1.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:70cf866af3ab346a10debba8ea78077cf3a8cd14bd5e4bed3d41555a3280041c"}, + {file = "pandas-2.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:d53c8c1001f6a192ff1de1efe03b31a423d0eee2e9e855e69d004308e046e694"}, + {file = "pandas-2.1.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:86f100b3876b8c6d1a2c66207288ead435dc71041ee4aea789e55ef0e06408cb"}, + {file = "pandas-2.1.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:28f330845ad21c11db51e02d8d69acc9035edfd1116926ff7245c7215db57957"}, + {file = "pandas-2.1.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b9a6ccf0963db88f9b12df6720e55f337447aea217f426a22d71f4213a3099a6"}, + {file = "pandas-2.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d99e678180bc59b0c9443314297bddce4ad35727a1a2656dbe585fd78710b3b9"}, + {file = "pandas-2.1.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:b31da36d376d50a1a492efb18097b9101bdbd8b3fbb3f49006e02d4495d4c644"}, + {file = "pandas-2.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:0164b85937707ec7f70b34a6c3a578dbf0f50787f910f21ca3b26a7fd3363437"}, + {file = "pandas-2.1.0.tar.gz", hash = "sha256:62c24c7fc59e42b775ce0679cfa7b14a5f9bfb7643cfbe708c960699e05fb918"}, +] + +[package.dependencies] +numpy = {version = ">=1.23.2", markers = "python_version >= \"3.11\""} +python-dateutil = ">=2.8.2" +pytz = ">=2020.1" +tzdata = ">=2022.1" + +[package.extras] +all = ["PyQt5 (>=5.15.6)", "SQLAlchemy (>=1.4.36)", "beautifulsoup4 (>=4.11.1)", "bottleneck (>=1.3.4)", "dataframe-api-compat (>=0.1.7)", "fastparquet (>=0.8.1)", "fsspec (>=2022.05.0)", "gcsfs (>=2022.05.0)", "html5lib (>=1.1)", "hypothesis (>=6.46.1)", "jinja2 (>=3.1.2)", "lxml (>=4.8.0)", "matplotlib (>=3.6.1)", "numba (>=0.55.2)", "numexpr (>=2.8.0)", "odfpy (>=1.4.1)", "openpyxl (>=3.0.10)", "pandas-gbq (>=0.17.5)", "psycopg2 (>=2.9.3)", "pyarrow (>=7.0.0)", "pymysql (>=1.0.2)", "pyreadstat (>=1.1.5)", "pytest (>=7.3.2)", "pytest-asyncio (>=0.17.0)", "pytest-xdist (>=2.2.0)", "pyxlsb (>=1.0.9)", "qtpy (>=2.2.0)", "s3fs (>=2022.05.0)", "scipy (>=1.8.1)", "tables (>=3.7.0)", "tabulate (>=0.8.10)", "xarray (>=2022.03.0)", "xlrd (>=2.0.1)", "xlsxwriter (>=3.0.3)", "zstandard (>=0.17.0)"] +aws = ["s3fs (>=2022.05.0)"] +clipboard = ["PyQt5 (>=5.15.6)", "qtpy (>=2.2.0)"] +compression = ["zstandard (>=0.17.0)"] +computation = ["scipy (>=1.8.1)", "xarray (>=2022.03.0)"] +consortium-standard = ["dataframe-api-compat (>=0.1.7)"] +excel = ["odfpy (>=1.4.1)", "openpyxl (>=3.0.10)", "pyxlsb (>=1.0.9)", "xlrd (>=2.0.1)", "xlsxwriter (>=3.0.3)"] +feather = ["pyarrow (>=7.0.0)"] +fss = ["fsspec (>=2022.05.0)"] +gcp = ["gcsfs (>=2022.05.0)", "pandas-gbq (>=0.17.5)"] +hdf5 = ["tables (>=3.7.0)"] +html = ["beautifulsoup4 (>=4.11.1)", "html5lib (>=1.1)", "lxml (>=4.8.0)"] +mysql = ["SQLAlchemy (>=1.4.36)", "pymysql (>=1.0.2)"] +output-formatting = ["jinja2 (>=3.1.2)", "tabulate (>=0.8.10)"] +parquet = ["pyarrow (>=7.0.0)"] +performance = ["bottleneck (>=1.3.4)", "numba (>=0.55.2)", "numexpr (>=2.8.0)"] +plot = ["matplotlib (>=3.6.1)"] +postgresql = ["SQLAlchemy (>=1.4.36)", "psycopg2 (>=2.9.3)"] +spss = ["pyreadstat (>=1.1.5)"] +sql-other = ["SQLAlchemy (>=1.4.36)"] +test = ["hypothesis (>=6.46.1)", "pytest (>=7.3.2)", "pytest-asyncio (>=0.17.0)", "pytest-xdist (>=2.2.0)"] +xml = ["lxml (>=4.8.0)"] + +[[package]] +name = "pandas" +version = "2.1.1" +description = "Powerful data structures for data analysis, time series, and statistics" +category = "main" +optional = false +python-versions = ">=3.9" +files = [ + {file = "pandas-2.1.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:58d997dbee0d4b64f3cb881a24f918b5f25dd64ddf31f467bb9b67ae4c63a1e4"}, + {file = "pandas-2.1.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:02304e11582c5d090e5a52aec726f31fe3f42895d6bfc1f28738f9b64b6f0614"}, + {file = "pandas-2.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffa8f0966de2c22de408d0e322db2faed6f6e74265aa0856f3824813cf124363"}, + {file = "pandas-2.1.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c1f84c144dee086fe4f04a472b5cd51e680f061adf75c1ae4fc3a9275560f8f4"}, + {file = "pandas-2.1.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:75ce97667d06d69396d72be074f0556698c7f662029322027c226fd7a26965cb"}, + {file = "pandas-2.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:4c3f32fd7c4dccd035f71734df39231ac1a6ff95e8bdab8d891167197b7018d2"}, + {file = "pandas-2.1.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:9e2959720b70e106bb1d8b6eadd8ecd7c8e99ccdbe03ee03260877184bb2877d"}, + {file = "pandas-2.1.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:25e8474a8eb258e391e30c288eecec565bfed3e026f312b0cbd709a63906b6f8"}, + {file = "pandas-2.1.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b8bd1685556f3374520466998929bade3076aeae77c3e67ada5ed2b90b4de7f0"}, + {file = "pandas-2.1.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dc3657869c7902810f32bd072f0740487f9e030c1a3ab03e0af093db35a9d14e"}, + {file = "pandas-2.1.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:05674536bd477af36aa2effd4ec8f71b92234ce0cc174de34fd21e2ee99adbc2"}, + {file = "pandas-2.1.1-cp311-cp311-win_amd64.whl", hash = "sha256:b407381258a667df49d58a1b637be33e514b07f9285feb27769cedb3ab3d0b3a"}, + {file = "pandas-2.1.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:c747793c4e9dcece7bb20156179529898abf505fe32cb40c4052107a3c620b49"}, + {file = "pandas-2.1.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:3bcad1e6fb34b727b016775bea407311f7721db87e5b409e6542f4546a4951ea"}, + {file = "pandas-2.1.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f5ec7740f9ccb90aec64edd71434711f58ee0ea7f5ed4ac48be11cfa9abf7317"}, + {file = "pandas-2.1.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:29deb61de5a8a93bdd033df328441a79fcf8dd3c12d5ed0b41a395eef9cd76f0"}, + {file = "pandas-2.1.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:4f99bebf19b7e03cf80a4e770a3e65eee9dd4e2679039f542d7c1ace7b7b1daa"}, + {file = "pandas-2.1.1-cp312-cp312-win_amd64.whl", hash = "sha256:84e7e910096416adec68075dc87b986ff202920fb8704e6d9c8c9897fe7332d6"}, + {file = "pandas-2.1.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:366da7b0e540d1b908886d4feb3d951f2f1e572e655c1160f5fde28ad4abb750"}, + {file = "pandas-2.1.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:9e50e72b667415a816ac27dfcfe686dc5a0b02202e06196b943d54c4f9c7693e"}, + {file = "pandas-2.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cc1ab6a25da197f03ebe6d8fa17273126120874386b4ac11c1d687df288542dd"}, + {file = "pandas-2.1.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a0dbfea0dd3901ad4ce2306575c54348d98499c95be01b8d885a2737fe4d7a98"}, + {file = "pandas-2.1.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:0489b0e6aa3d907e909aef92975edae89b1ee1654db5eafb9be633b0124abe97"}, + {file = "pandas-2.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:4cdb0fab0400c2cb46dafcf1a0fe084c8bb2480a1fa8d81e19d15e12e6d4ded2"}, + {file = "pandas-2.1.1.tar.gz", hash = "sha256:fecb198dc389429be557cde50a2d46da8434a17fe37d7d41ff102e3987fd947b"}, +] [package.dependencies] numpy = [ - {version = ">=1.20.3", markers = "python_version < \"3.10\""}, - {version = ">=1.21.0", markers = "python_version >= \"3.10\""}, - {version = ">=1.23.2", markers = "python_version >= \"3.11\""}, + {version = ">=1.22.4", markers = "python_version < \"3.11\""}, + {version = ">=1.23.2", markers = "python_version == \"3.11\""}, ] python-dateutil = ">=2.8.2" pytz = ">=2020.1" tzdata = ">=2022.1" [package.extras] -all = ["PyQt5 (>=5.15.1)", "SQLAlchemy (>=1.4.16)", "beautifulsoup4 (>=4.9.3)", "bottleneck (>=1.3.2)", "brotlipy (>=0.7.0)", "fastparquet (>=0.6.3)", "fsspec (>=2021.07.0)", "gcsfs (>=2021.07.0)", "html5lib (>=1.1)", "hypothesis (>=6.34.2)", "jinja2 (>=3.0.0)", "lxml (>=4.6.3)", "matplotlib (>=3.6.1)", "numba (>=0.53.1)", "numexpr (>=2.7.3)", "odfpy (>=1.4.1)", "openpyxl (>=3.0.7)", "pandas-gbq (>=0.15.0)", "psycopg2 (>=2.8.6)", "pyarrow (>=7.0.0)", "pymysql (>=1.0.2)", "pyreadstat (>=1.1.2)", "pytest (>=7.0.0)", "pytest-asyncio (>=0.17.0)", "pytest-xdist (>=2.2.0)", "python-snappy (>=0.6.0)", "pyxlsb (>=1.0.8)", "qtpy (>=2.2.0)", "s3fs (>=2021.08.0)", "scipy (>=1.7.1)", "tables (>=3.6.1)", "tabulate (>=0.8.9)", "xarray (>=0.21.0)", "xlrd (>=2.0.1)", "xlsxwriter (>=1.4.3)", "zstandard (>=0.15.2)"] -aws = ["s3fs (>=2021.08.0)"] -clipboard = ["PyQt5 (>=5.15.1)", "qtpy (>=2.2.0)"] -compression = ["brotlipy (>=0.7.0)", "python-snappy (>=0.6.0)", "zstandard (>=0.15.2)"] -computation = ["scipy (>=1.7.1)", "xarray (>=0.21.0)"] -excel = ["odfpy (>=1.4.1)", "openpyxl (>=3.0.7)", "pyxlsb (>=1.0.8)", "xlrd (>=2.0.1)", "xlsxwriter (>=1.4.3)"] +all = ["PyQt5 (>=5.15.6)", "SQLAlchemy (>=1.4.36)", "beautifulsoup4 (>=4.11.1)", "bottleneck (>=1.3.4)", "dataframe-api-compat (>=0.1.7)", "fastparquet (>=0.8.1)", "fsspec (>=2022.05.0)", "gcsfs (>=2022.05.0)", "html5lib (>=1.1)", "hypothesis (>=6.46.1)", "jinja2 (>=3.1.2)", "lxml (>=4.8.0)", "matplotlib (>=3.6.1)", "numba (>=0.55.2)", "numexpr (>=2.8.0)", "odfpy (>=1.4.1)", "openpyxl (>=3.0.10)", "pandas-gbq (>=0.17.5)", "psycopg2 (>=2.9.3)", "pyarrow (>=7.0.0)", "pymysql (>=1.0.2)", "pyreadstat (>=1.1.5)", "pytest (>=7.3.2)", "pytest-asyncio (>=0.17.0)", "pytest-xdist (>=2.2.0)", "pyxlsb (>=1.0.9)", "qtpy (>=2.2.0)", "s3fs (>=2022.05.0)", "scipy (>=1.8.1)", "tables (>=3.7.0)", "tabulate (>=0.8.10)", "xarray (>=2022.03.0)", "xlrd (>=2.0.1)", "xlsxwriter (>=3.0.3)", "zstandard (>=0.17.0)"] +aws = ["s3fs (>=2022.05.0)"] +clipboard = ["PyQt5 (>=5.15.6)", "qtpy (>=2.2.0)"] +compression = ["zstandard (>=0.17.0)"] +computation = ["scipy (>=1.8.1)", "xarray (>=2022.03.0)"] +consortium-standard = ["dataframe-api-compat (>=0.1.7)"] +excel = ["odfpy (>=1.4.1)", "openpyxl (>=3.0.10)", "pyxlsb (>=1.0.9)", "xlrd (>=2.0.1)", "xlsxwriter (>=3.0.3)"] feather = ["pyarrow (>=7.0.0)"] -fss = ["fsspec (>=2021.07.0)"] -gcp = ["gcsfs (>=2021.07.0)", "pandas-gbq (>=0.15.0)"] -hdf5 = ["tables (>=3.6.1)"] -html = ["beautifulsoup4 (>=4.9.3)", "html5lib (>=1.1)", "lxml (>=4.6.3)"] -mysql = ["SQLAlchemy (>=1.4.16)", "pymysql (>=1.0.2)"] -output-formatting = ["jinja2 (>=3.0.0)", "tabulate (>=0.8.9)"] +fss = ["fsspec (>=2022.05.0)"] +gcp = ["gcsfs (>=2022.05.0)", "pandas-gbq (>=0.17.5)"] +hdf5 = ["tables (>=3.7.0)"] +html = ["beautifulsoup4 (>=4.11.1)", "html5lib (>=1.1)", "lxml (>=4.8.0)"] +mysql = ["SQLAlchemy (>=1.4.36)", "pymysql (>=1.0.2)"] +output-formatting = ["jinja2 (>=3.1.2)", "tabulate (>=0.8.10)"] parquet = ["pyarrow (>=7.0.0)"] -performance = ["bottleneck (>=1.3.2)", "numba (>=0.53.1)", "numexpr (>=2.7.1)"] +performance = ["bottleneck (>=1.3.4)", "numba (>=0.55.2)", "numexpr (>=2.8.0)"] plot = ["matplotlib (>=3.6.1)"] -postgresql = ["SQLAlchemy (>=1.4.16)", "psycopg2 (>=2.8.6)"] -spss = ["pyreadstat (>=1.1.2)"] -sql-other = ["SQLAlchemy (>=1.4.16)"] -test = ["hypothesis (>=6.34.2)", "pytest (>=7.0.0)", "pytest-asyncio (>=0.17.0)", "pytest-xdist (>=2.2.0)"] -xml = ["lxml (>=4.6.3)"] +postgresql = ["SQLAlchemy (>=1.4.36)", "psycopg2 (>=2.9.3)"] +spss = ["pyreadstat (>=1.1.5)"] +sql-other = ["SQLAlchemy (>=1.4.36)"] +test = ["hypothesis (>=6.46.1)", "pytest (>=7.3.2)", "pytest-asyncio (>=0.17.0)", "pytest-xdist (>=2.2.0)"] +xml = ["lxml (>=4.8.0)"] [[package]] name = "pandocfilters" @@ -984,6 +2051,10 @@ description = "Utilities for writing pandoc filters in python" category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +files = [ + {file = "pandocfilters-1.5.0-py2.py3-none-any.whl", hash = "sha256:33aae3f25fd1a026079f5d27bdd52496f0e0803b3469282162bafdcbdf6ef14f"}, + {file = "pandocfilters-1.5.0.tar.gz", hash = "sha256:0b679503337d233b4339a817bfc8c50064e2eff681314376a47cb582305a7a38"}, +] [[package]] name = "parso" @@ -992,11 +2063,27 @@ description = "A Python Parser" category = "dev" optional = false python-versions = ">=3.6" +files = [ + {file = "parso-0.8.3-py2.py3-none-any.whl", hash = "sha256:c001d4636cd3aecdaf33cbb40aebb59b094be2a74c556778ef5576c175e19e75"}, + {file = "parso-0.8.3.tar.gz", hash = "sha256:8c07be290bb59f03588915921e29e8a50002acaf2cdc5fa0e0114f91709fafa0"}, +] [package.extras] qa = ["flake8 (==3.8.3)", "mypy (==0.782)"] testing = ["docopt", "pytest (<6.0.0)"] +[[package]] +name = "pathspec" +version = "0.11.2" +description = "Utility library for gitignore style pattern matching of file paths." +category = "dev" +optional = false +python-versions = ">=3.7" +files = [ + {file = "pathspec-0.11.2-py3-none-any.whl", hash = "sha256:1d6ed233af05e679efb96b1851550ea95bbb64b7c490b0f5aa52996c11e92a20"}, + {file = "pathspec-0.11.2.tar.gz", hash = "sha256:e0d8d0ac2f12da61956eb2306b69f9469b42f4deb0f3cb6ed47b9cce9996ced3"}, +] + [[package]] name = "pexpect" version = "4.8.0" @@ -1004,6 +2091,10 @@ description = "Pexpect allows easy control of interactive console applications." category = "dev" optional = false python-versions = "*" +files = [ + {file = "pexpect-4.8.0-py2.py3-none-any.whl", hash = "sha256:0b48a55dcb3c05f3329815901ea4fc1537514d6ba867a152b581d69ae3710937"}, + {file = "pexpect-4.8.0.tar.gz", hash = "sha256:fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c"}, +] [package.dependencies] ptyprocess = ">=0.5" @@ -1015,14 +2106,74 @@ description = "Tiny 'shelve'-like database with concurrency support" category = "dev" optional = false python-versions = "*" +files = [ + {file = "pickleshare-0.7.5-py2.py3-none-any.whl", hash = "sha256:9649af414d74d4df115d5d718f82acb59c9d418196b7b4290ed47a12ce62df56"}, + {file = "pickleshare-0.7.5.tar.gz", hash = "sha256:87683d47965c1da65cdacaf31c8441d12b8044cdec9aca500cd78fc2c683afca"}, +] [[package]] name = "pillow" -version = "9.5.0" +version = "10.0.1" description = "Python Imaging Library (Fork)" category = "dev" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" +files = [ + {file = "Pillow-10.0.1-cp310-cp310-macosx_10_10_x86_64.whl", hash = "sha256:8f06be50669087250f319b706decf69ca71fdecd829091a37cc89398ca4dc17a"}, + {file = "Pillow-10.0.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:50bd5f1ebafe9362ad622072a1d2f5850ecfa44303531ff14353a4059113b12d"}, + {file = "Pillow-10.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e6a90167bcca1216606223a05e2cf991bb25b14695c518bc65639463d7db722d"}, + {file = "Pillow-10.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f11c9102c56ffb9ca87134bd025a43d2aba3f1155f508eff88f694b33a9c6d19"}, + {file = "Pillow-10.0.1-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:186f7e04248103482ea6354af6d5bcedb62941ee08f7f788a1c7707bc720c66f"}, + {file = "Pillow-10.0.1-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:0462b1496505a3462d0f35dc1c4d7b54069747d65d00ef48e736acda2c8cbdff"}, + {file = "Pillow-10.0.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d889b53ae2f030f756e61a7bff13684dcd77e9af8b10c6048fb2c559d6ed6eaf"}, + {file = "Pillow-10.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:552912dbca585b74d75279a7570dd29fa43b6d93594abb494ebb31ac19ace6bd"}, + {file = "Pillow-10.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:787bb0169d2385a798888e1122c980c6eff26bf941a8ea79747d35d8f9210ca0"}, + {file = "Pillow-10.0.1-cp311-cp311-macosx_10_10_x86_64.whl", hash = "sha256:fd2a5403a75b54661182b75ec6132437a181209b901446ee5724b589af8edef1"}, + {file = "Pillow-10.0.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:2d7e91b4379f7a76b31c2dda84ab9e20c6220488e50f7822e59dac36b0cd92b1"}, + {file = "Pillow-10.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:19e9adb3f22d4c416e7cd79b01375b17159d6990003633ff1d8377e21b7f1b21"}, + {file = "Pillow-10.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:93139acd8109edcdeffd85e3af8ae7d88b258b3a1e13a038f542b79b6d255c54"}, + {file = "Pillow-10.0.1-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:92a23b0431941a33242b1f0ce6c88a952e09feeea9af4e8be48236a68ffe2205"}, + {file = "Pillow-10.0.1-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:cbe68deb8580462ca0d9eb56a81912f59eb4542e1ef8f987405e35a0179f4ea2"}, + {file = "Pillow-10.0.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:522ff4ac3aaf839242c6f4e5b406634bfea002469656ae8358644fc6c4856a3b"}, + {file = "Pillow-10.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:84efb46e8d881bb06b35d1d541aa87f574b58e87f781cbba8d200daa835b42e1"}, + {file = "Pillow-10.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:898f1d306298ff40dc1b9ca24824f0488f6f039bc0e25cfb549d3195ffa17088"}, + {file = "Pillow-10.0.1-cp312-cp312-macosx_10_10_x86_64.whl", hash = "sha256:bcf1207e2f2385a576832af02702de104be71301c2696d0012b1b93fe34aaa5b"}, + {file = "Pillow-10.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:5d6c9049c6274c1bb565021367431ad04481ebb54872edecfcd6088d27edd6ed"}, + {file = "Pillow-10.0.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:28444cb6ad49726127d6b340217f0627abc8732f1194fd5352dec5e6a0105635"}, + {file = "Pillow-10.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:de596695a75496deb3b499c8c4f8e60376e0516e1a774e7bc046f0f48cd620ad"}, + {file = "Pillow-10.0.1-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:2872f2d7846cf39b3dbff64bc1104cc48c76145854256451d33c5faa55c04d1a"}, + {file = "Pillow-10.0.1-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:4ce90f8a24e1c15465048959f1e94309dfef93af272633e8f37361b824532e91"}, + {file = "Pillow-10.0.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:ee7810cf7c83fa227ba9125de6084e5e8b08c59038a7b2c9045ef4dde61663b4"}, + {file = "Pillow-10.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:b1be1c872b9b5fcc229adeadbeb51422a9633abd847c0ff87dc4ef9bb184ae08"}, + {file = "Pillow-10.0.1-cp312-cp312-win_amd64.whl", hash = "sha256:98533fd7fa764e5f85eebe56c8e4094db912ccbe6fbf3a58778d543cadd0db08"}, + {file = "Pillow-10.0.1-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:764d2c0daf9c4d40ad12fbc0abd5da3af7f8aa11daf87e4fa1b834000f4b6b0a"}, + {file = "Pillow-10.0.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:fcb59711009b0168d6ee0bd8fb5eb259c4ab1717b2f538bbf36bacf207ef7a68"}, + {file = "Pillow-10.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:697a06bdcedd473b35e50a7e7506b1d8ceb832dc238a336bd6f4f5aa91a4b500"}, + {file = "Pillow-10.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9f665d1e6474af9f9da5e86c2a3a2d2d6204e04d5af9c06b9d42afa6ebde3f21"}, + {file = "Pillow-10.0.1-cp38-cp38-manylinux_2_28_aarch64.whl", hash = "sha256:2fa6dd2661838c66f1a5473f3b49ab610c98a128fc08afbe81b91a1f0bf8c51d"}, + {file = "Pillow-10.0.1-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:3a04359f308ebee571a3127fdb1bd01f88ba6f6fb6d087f8dd2e0d9bff43f2a7"}, + {file = "Pillow-10.0.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:723bd25051454cea9990203405fa6b74e043ea76d4968166dfd2569b0210886a"}, + {file = "Pillow-10.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:71671503e3015da1b50bd18951e2f9daf5b6ffe36d16f1eb2c45711a301521a7"}, + {file = "Pillow-10.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:44e7e4587392953e5e251190a964675f61e4dae88d1e6edbe9f36d6243547ff3"}, + {file = "Pillow-10.0.1-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:3855447d98cced8670aaa63683808df905e956f00348732448b5a6df67ee5849"}, + {file = "Pillow-10.0.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ed2d9c0704f2dc4fa980b99d565c0c9a543fe5101c25b3d60488b8ba80f0cce1"}, + {file = "Pillow-10.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f5bb289bb835f9fe1a1e9300d011eef4d69661bb9b34d5e196e5e82c4cb09b37"}, + {file = "Pillow-10.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3a0d3e54ab1df9df51b914b2233cf779a5a10dfd1ce339d0421748232cea9876"}, + {file = "Pillow-10.0.1-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:2cc6b86ece42a11f16f55fe8903595eff2b25e0358dec635d0a701ac9586588f"}, + {file = "Pillow-10.0.1-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:ca26ba5767888c84bf5a0c1a32f069e8204ce8c21d00a49c90dabeba00ce0145"}, + {file = "Pillow-10.0.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:f0b4b06da13275bc02adfeb82643c4a6385bd08d26f03068c2796f60d125f6f2"}, + {file = "Pillow-10.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:bc2e3069569ea9dbe88d6b8ea38f439a6aad8f6e7a6283a38edf61ddefb3a9bf"}, + {file = "Pillow-10.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:8b451d6ead6e3500b6ce5c7916a43d8d8d25ad74b9102a629baccc0808c54971"}, + {file = "Pillow-10.0.1-pp310-pypy310_pp73-macosx_10_10_x86_64.whl", hash = "sha256:32bec7423cdf25c9038fef614a853c9d25c07590e1a870ed471f47fb80b244db"}, + {file = "Pillow-10.0.1-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b7cf63d2c6928b51d35dfdbda6f2c1fddbe51a6bc4a9d4ee6ea0e11670dd981e"}, + {file = "Pillow-10.0.1-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:f6d3d4c905e26354e8f9d82548475c46d8e0889538cb0657aa9c6f0872a37aa4"}, + {file = "Pillow-10.0.1-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:847e8d1017c741c735d3cd1883fa7b03ded4f825a6e5fcb9378fd813edee995f"}, + {file = "Pillow-10.0.1-pp39-pypy39_pp73-macosx_10_10_x86_64.whl", hash = "sha256:7f771e7219ff04b79e231d099c0a28ed83aa82af91fd5fa9fdb28f5b8d5addaf"}, + {file = "Pillow-10.0.1-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:459307cacdd4138edee3875bbe22a2492519e060660eaf378ba3b405d1c66317"}, + {file = "Pillow-10.0.1-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:b059ac2c4c7a97daafa7dc850b43b2d3667def858a4f112d1aa082e5c3d6cf7d"}, + {file = "Pillow-10.0.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:d6caf3cd38449ec3cd8a68b375e0c6fe4b6fd04edb6c9766b55ef84a6e8ddf2d"}, + {file = "Pillow-10.0.1.tar.gz", hash = "sha256:d72967b06be9300fed5cfbc8b5bafceec48bf7cdc7dab66b1d2549035287191d"}, +] [package.extras] docs = ["furo", "olefile", "sphinx (>=2.4)", "sphinx-copybutton", "sphinx-inline-tabs", "sphinx-removed-in", "sphinxext-opengraph"] @@ -1030,23 +2181,31 @@ tests = ["check-manifest", "coverage", "defusedxml", "markdown2", "olefile", "pa [[package]] name = "platformdirs" -version = "3.2.0" +version = "3.11.0" description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." category = "main" optional = false python-versions = ">=3.7" +files = [ + {file = "platformdirs-3.11.0-py3-none-any.whl", hash = "sha256:e9d171d00af68be50e9202731309c4e658fd8bc76f55c11c7dd760d023bda68e"}, + {file = "platformdirs-3.11.0.tar.gz", hash = "sha256:cf8ee52a3afdb965072dcc652433e0c7e3e40cf5ea1477cd4b3b1d2eb75495b3"}, +] [package.extras] -docs = ["furo (>=2022.12.7)", "proselint (>=0.13)", "sphinx (>=6.1.3)", "sphinx-autodoc-typehints (>=1.22,!=1.23.4)"] -test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.2.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)"] +docs = ["furo (>=2023.7.26)", "proselint (>=0.13)", "sphinx (>=7.1.1)", "sphinx-autodoc-typehints (>=1.24)"] +test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.4)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)"] [[package]] name = "pluggy" -version = "1.0.0" +version = "1.3.0" description = "plugin and hook calling mechanisms for python" category = "dev" optional = false -python-versions = ">=3.6" +python-versions = ">=3.8" +files = [ + {file = "pluggy-1.3.0-py3-none-any.whl", hash = "sha256:d89c696a773f8bd377d18e5ecda92b7a3793cbe66c87060a6fb58c7b6e1061f7"}, + {file = "pluggy-1.3.0.tar.gz", hash = "sha256:cf61ae8f126ac6f7c451172cf30e3e43d3ca77615509771b3a984a0730651e12"}, +] [package.extras] dev = ["pre-commit", "tox"] @@ -1059,6 +2218,10 @@ description = "\"Pooch manages your Python library's sample data files: it autom category = "main" optional = false python-versions = ">=3.7" +files = [ + {file = "pooch-1.7.0-py3-none-any.whl", hash = "sha256:74258224fc33d58f53113cf955e8d51bf01386b91492927d0d1b6b341a765ad7"}, + {file = "pooch-1.7.0.tar.gz", hash = "sha256:f174a1041b6447f0eef8860f76d17f60ed2f857dc0efa387a7f08228af05d998"}, +] [package.dependencies] packaging = ">=20.0" @@ -1072,11 +2235,15 @@ xxhash = ["xxhash (>=1.4.3)"] [[package]] name = "pre-commit" -version = "3.2.1" +version = "3.4.0" description = "A framework for managing and maintaining multi-language pre-commit hooks." category = "dev" optional = false python-versions = ">=3.8" +files = [ + {file = "pre_commit-3.4.0-py2.py3-none-any.whl", hash = "sha256:96d529a951f8b677f730a7212442027e8ba53f9b04d217c4c67dc56c393ad945"}, + {file = "pre_commit-3.4.0.tar.gz", hash = "sha256:6bbd5129a64cad4c0dfaeeb12cd8f7ea7e15b77028d985341478c8af3c759522"}, +] [package.dependencies] cfgv = ">=2.0.0" @@ -1087,11 +2254,15 @@ virtualenv = ">=20.10.0" [[package]] name = "prompt-toolkit" -version = "3.0.38" +version = "3.0.39" description = "Library for building powerful interactive command lines in Python" category = "dev" optional = false python-versions = ">=3.7.0" +files = [ + {file = "prompt_toolkit-3.0.39-py3-none-any.whl", hash = "sha256:9dffbe1d8acf91e3de75f3b544e4842382fc06c6babe903ac9acb74dc6e08d88"}, + {file = "prompt_toolkit-3.0.39.tar.gz", hash = "sha256:04505ade687dc26dc4284b1ad19a83be2f2afe83e7a828ace0c72f3a1df72aac"}, +] [package.dependencies] wcwidth = "*" @@ -1103,6 +2274,22 @@ description = "Cross-platform lib for process and system monitoring in Python." category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +files = [ + {file = "psutil-5.9.5-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:be8929ce4313f9f8146caad4272f6abb8bf99fc6cf59344a3167ecd74f4f203f"}, + {file = "psutil-5.9.5-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:ab8ed1a1d77c95453db1ae00a3f9c50227ebd955437bcf2a574ba8adbf6a74d5"}, + {file = "psutil-5.9.5-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:4aef137f3345082a3d3232187aeb4ac4ef959ba3d7c10c33dd73763fbc063da4"}, + {file = "psutil-5.9.5-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:ea8518d152174e1249c4f2a1c89e3e6065941df2fa13a1ab45327716a23c2b48"}, + {file = "psutil-5.9.5-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:acf2aef9391710afded549ff602b5887d7a2349831ae4c26be7c807c0a39fac4"}, + {file = "psutil-5.9.5-cp27-none-win32.whl", hash = "sha256:5b9b8cb93f507e8dbaf22af6a2fd0ccbe8244bf30b1baad6b3954e935157ae3f"}, + {file = "psutil-5.9.5-cp27-none-win_amd64.whl", hash = "sha256:8c5f7c5a052d1d567db4ddd231a9d27a74e8e4a9c3f44b1032762bd7b9fdcd42"}, + {file = "psutil-5.9.5-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:3c6f686f4225553615612f6d9bc21f1c0e305f75d7d8454f9b46e901778e7217"}, + {file = "psutil-5.9.5-cp36-abi3-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7a7dd9997128a0d928ed4fb2c2d57e5102bb6089027939f3b722f3a210f9a8da"}, + {file = "psutil-5.9.5-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:89518112647f1276b03ca97b65cc7f64ca587b1eb0278383017c2a0dcc26cbe4"}, + {file = "psutil-5.9.5-cp36-abi3-win32.whl", hash = "sha256:104a5cc0e31baa2bcf67900be36acde157756b9c44017b86b2c049f11957887d"}, + {file = "psutil-5.9.5-cp36-abi3-win_amd64.whl", hash = "sha256:b258c0c1c9d145a1d5ceffab1134441c4c5113b2417fafff7315a917a026c3c9"}, + {file = "psutil-5.9.5-cp38-abi3-macosx_11_0_arm64.whl", hash = "sha256:c607bb3b57dc779d55e1554846352b4e358c10fff3abf3514a7a6601beebdb30"}, + {file = "psutil-5.9.5.tar.gz", hash = "sha256:5410638e4df39c54d957fc51ce03048acd8e6d60abc0f5107af51e5fb566eb3c"}, +] [package.extras] test = ["enum34", "ipaddress", "mock", "pywin32", "wmi"] @@ -1114,6 +2301,10 @@ description = "Run a subprocess in a pseudo terminal" category = "dev" optional = false python-versions = "*" +files = [ + {file = "ptyprocess-0.7.0-py2.py3-none-any.whl", hash = "sha256:4b41f3967fce3af57cc7e94b888626c18bf37a083e3651ca8feeb66d492fef35"}, + {file = "ptyprocess-0.7.0.tar.gz", hash = "sha256:5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220"}, +] [[package]] name = "pure-eval" @@ -1122,6 +2313,10 @@ description = "Safely evaluate AST nodes without side effects" category = "dev" optional = false python-versions = "*" +files = [ + {file = "pure_eval-0.2.2-py3-none-any.whl", hash = "sha256:01eaab343580944bc56080ebe0a674b39ec44a945e6d09ba7db3cb8cec289350"}, + {file = "pure_eval-0.2.2.tar.gz", hash = "sha256:2b45320af6dfaa1750f543d714b6d1c520a1688dec6fd24d339063ce0aaa9ac3"}, +] [package.extras] tests = ["pytest"] @@ -1133,55 +2328,74 @@ description = "C parser in Python" category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +files = [ + {file = "pycparser-2.21-py2.py3-none-any.whl", hash = "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9"}, + {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"}, +] [[package]] name = "pygments" -version = "2.14.0" +version = "2.16.1" description = "Pygments is a syntax highlighting package written in Python." category = "dev" optional = false -python-versions = ">=3.6" +python-versions = ">=3.7" +files = [ + {file = "Pygments-2.16.1-py3-none-any.whl", hash = "sha256:13fc09fa63bc8d8671a6d247e1eb303c4b343eaee81d861f3404db2935653692"}, + {file = "Pygments-2.16.1.tar.gz", hash = "sha256:1daff0494820c69bc8941e407aa20f577374ee88364ee10a98fdbe0aece96e29"}, +] [package.extras] plugins = ["importlib-metadata"] [[package]] name = "pyparsing" -version = "3.0.9" +version = "3.1.1" description = "pyparsing module - Classes and methods to define and execute parsing grammars" category = "main" optional = false python-versions = ">=3.6.8" +files = [ + {file = "pyparsing-3.1.1-py3-none-any.whl", hash = "sha256:32c7c0b711493c72ff18a981d24f28aaf9c1fb7ed5e9667c9e84e3db623bdbfb"}, + {file = "pyparsing-3.1.1.tar.gz", hash = "sha256:ede28a1a32462f5a9705e07aea48001a08f7cf81a021585011deba701581a0db"}, +] [package.extras] diagrams = ["jinja2", "railroad-diagrams"] [[package]] name = "pyproject-api" -version = "1.5.1" +version = "1.6.1" description = "API to interact with the python pyproject.toml based projects" category = "dev" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" +files = [ + {file = "pyproject_api-1.6.1-py3-none-any.whl", hash = "sha256:4c0116d60476b0786c88692cf4e325a9814965e2469c5998b830bba16b183675"}, + {file = "pyproject_api-1.6.1.tar.gz", hash = "sha256:1817dc018adc0d1ff9ca1ed8c60e1623d5aaca40814b953af14a9cf9a5cae538"}, +] [package.dependencies] -packaging = ">=23" +packaging = ">=23.1" tomli = {version = ">=2.0.1", markers = "python_version < \"3.11\""} [package.extras] -docs = ["furo (>=2022.12.7)", "sphinx (>=6.1.3)", "sphinx-autodoc-typehints (>=1.22,!=1.23.4)"] -testing = ["covdefaults (>=2.2.2)", "importlib-metadata (>=6)", "pytest (>=7.2.1)", "pytest-cov (>=4)", "pytest-mock (>=3.10)", "virtualenv (>=20.17.1)", "wheel (>=0.38.4)"] +docs = ["furo (>=2023.8.19)", "sphinx (<7.2)", "sphinx-autodoc-typehints (>=1.24)"] +testing = ["covdefaults (>=2.3)", "pytest (>=7.4)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)", "setuptools (>=68.1.2)", "wheel (>=0.41.2)"] [[package]] name = "pytest" -version = "7.2.2" +version = "7.4.2" description = "pytest: simple powerful testing with Python" category = "dev" optional = false python-versions = ">=3.7" +files = [ + {file = "pytest-7.4.2-py3-none-any.whl", hash = "sha256:1d881c6124e08ff0a1bb75ba3ec0bfd8b5354a01c194ddd5a0a870a48d99b002"}, + {file = "pytest-7.4.2.tar.gz", hash = "sha256:a766259cfab564a2ad52cb1aae1b881a75c3eb7e34ca3779697c23ed47c47069"}, +] [package.dependencies] -attrs = ">=19.2.0" colorama = {version = "*", markers = "sys_platform == \"win32\""} exceptiongroup = {version = ">=1.0.0rc8", markers = "python_version < \"3.11\""} iniconfig = "*" @@ -1190,7 +2404,7 @@ pluggy = ">=0.12,<2.0" tomli = {version = ">=1.0.0", markers = "python_version < \"3.11\""} [package.extras] -testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "pygments (>=2.7.2)", "requests", "xmlschema"] +testing = ["argcomplete", "attrs (>=19.2.0)", "hypothesis (>=3.56)", "mock", "nose", "pygments (>=2.7.2)", "requests", "setuptools", "xmlschema"] [[package]] name = "pytest-cov" @@ -1199,6 +2413,10 @@ description = "Pytest plugin for measuring coverage." category = "dev" optional = false python-versions = ">=3.6" +files = [ + {file = "pytest-cov-3.0.0.tar.gz", hash = "sha256:e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470"}, + {file = "pytest_cov-3.0.0-py3-none-any.whl", hash = "sha256:578d5d15ac4a25e5f961c938b85a05b09fdaae9deef3bb6de9a6e766622ca7a6"}, +] [package.dependencies] coverage = {version = ">=5.2.1", extras = ["toml"]} @@ -1214,17 +2432,25 @@ description = "Extensions to the standard Python datetime module" category = "main" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7" +files = [ + {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"}, + {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"}, +] [package.dependencies] six = ">=1.5" [[package]] name = "pytz" -version = "2023.3" +version = "2023.3.post1" description = "World timezone definitions, modern and historical" category = "main" optional = false python-versions = "*" +files = [ + {file = "pytz-2023.3.post1-py2.py3-none-any.whl", hash = "sha256:ce42d816b81b68506614c11e8937d3aa9e41007ceb50bfdcb0749b921bf646c7"}, + {file = "pytz-2023.3.post1.tar.gz", hash = "sha256:7b4fddbeb94a1eba4b557da24f19fdf9db575192544270a9101d8509f9f43d7b"}, +] [[package]] name = "pywin32" @@ -1233,22 +2459,185 @@ description = "Python for Window Extensions" category = "dev" optional = false python-versions = "*" +files = [ + {file = "pywin32-306-cp310-cp310-win32.whl", hash = "sha256:06d3420a5155ba65f0b72f2699b5bacf3109f36acbe8923765c22938a69dfc8d"}, + {file = "pywin32-306-cp310-cp310-win_amd64.whl", hash = "sha256:84f4471dbca1887ea3803d8848a1616429ac94a4a8d05f4bc9c5dcfd42ca99c8"}, + {file = "pywin32-306-cp311-cp311-win32.whl", hash = "sha256:e65028133d15b64d2ed8f06dd9fbc268352478d4f9289e69c190ecd6818b6407"}, + {file = "pywin32-306-cp311-cp311-win_amd64.whl", hash = "sha256:a7639f51c184c0272e93f244eb24dafca9b1855707d94c192d4a0b4c01e1100e"}, + {file = "pywin32-306-cp311-cp311-win_arm64.whl", hash = "sha256:70dba0c913d19f942a2db25217d9a1b726c278f483a919f1abfed79c9cf64d3a"}, + {file = "pywin32-306-cp312-cp312-win32.whl", hash = "sha256:383229d515657f4e3ed1343da8be101000562bf514591ff383ae940cad65458b"}, + {file = "pywin32-306-cp312-cp312-win_amd64.whl", hash = "sha256:37257794c1ad39ee9be652da0462dc2e394c8159dfd913a8a4e8eb6fd346da0e"}, + {file = "pywin32-306-cp312-cp312-win_arm64.whl", hash = "sha256:5821ec52f6d321aa59e2db7e0a35b997de60c201943557d108af9d4ae1ec7040"}, + {file = "pywin32-306-cp37-cp37m-win32.whl", hash = "sha256:1c73ea9a0d2283d889001998059f5eaaba3b6238f767c9cf2833b13e6a685f65"}, + {file = "pywin32-306-cp37-cp37m-win_amd64.whl", hash = "sha256:72c5f621542d7bdd4fdb716227be0dd3f8565c11b280be6315b06ace35487d36"}, + {file = "pywin32-306-cp38-cp38-win32.whl", hash = "sha256:e4c092e2589b5cf0d365849e73e02c391c1349958c5ac3e9d5ccb9a28e017b3a"}, + {file = "pywin32-306-cp38-cp38-win_amd64.whl", hash = "sha256:e8ac1ae3601bee6ca9f7cb4b5363bf1c0badb935ef243c4733ff9a393b1690c0"}, + {file = "pywin32-306-cp39-cp39-win32.whl", hash = "sha256:e25fd5b485b55ac9c057f67d94bc203f3f6595078d1fb3b458c9c28b7153a802"}, + {file = "pywin32-306-cp39-cp39-win_amd64.whl", hash = "sha256:39b61c15272833b5c329a2989999dcae836b1eed650252ab1b7bfbe1d59f30f4"}, +] [[package]] name = "pyyaml" -version = "6.0" +version = "6.0.1" description = "YAML parser and emitter for Python" category = "main" optional = false python-versions = ">=3.6" +files = [ + {file = "PyYAML-6.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d858aa552c999bc8a8d57426ed01e40bef403cd8ccdd0fc5f6f04a00414cac2a"}, + {file = "PyYAML-6.0.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:fd66fc5d0da6d9815ba2cebeb4205f95818ff4b79c3ebe268e75d961704af52f"}, + {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938"}, + {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d"}, + {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515"}, + {file = "PyYAML-6.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290"}, + {file = "PyYAML-6.0.1-cp310-cp310-win32.whl", hash = "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924"}, + {file = "PyYAML-6.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d"}, + {file = "PyYAML-6.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007"}, + {file = "PyYAML-6.0.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f003ed9ad21d6a4713f0a9b5a7a0a79e08dd0f221aff4525a2be4c346ee60aab"}, + {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d"}, + {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc"}, + {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673"}, + {file = "PyYAML-6.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b"}, + {file = "PyYAML-6.0.1-cp311-cp311-win32.whl", hash = "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741"}, + {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"}, + {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"}, + {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"}, + {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"}, + {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"}, + {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"}, + {file = "PyYAML-6.0.1-cp312-cp312-win_amd64.whl", hash = "sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df"}, + {file = "PyYAML-6.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47"}, + {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98"}, + {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c"}, + {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:afd7e57eddb1a54f0f1a974bc4391af8bcce0b444685d936840f125cf046d5bd"}, + {file = "PyYAML-6.0.1-cp36-cp36m-win32.whl", hash = "sha256:fca0e3a251908a499833aa292323f32437106001d436eca0e6e7833256674585"}, + {file = "PyYAML-6.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:f22ac1c3cac4dbc50079e965eba2c1058622631e526bd9afd45fedd49ba781fa"}, + {file = "PyYAML-6.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:b1275ad35a5d18c62a7220633c913e1b42d44b46ee12554e5fd39c70a243d6a3"}, + {file = "PyYAML-6.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:18aeb1bf9a78867dc38b259769503436b7c72f7a1f1f4c93ff9a17de54319b27"}, + {file = "PyYAML-6.0.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:596106435fa6ad000c2991a98fa58eeb8656ef2325d7e158344fb33864ed87e3"}, + {file = "PyYAML-6.0.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:baa90d3f661d43131ca170712d903e6295d1f7a0f595074f151c0aed377c9b9c"}, + {file = "PyYAML-6.0.1-cp37-cp37m-win32.whl", hash = "sha256:9046c58c4395dff28dd494285c82ba00b546adfc7ef001486fbf0324bc174fba"}, + {file = "PyYAML-6.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:4fb147e7a67ef577a588a0e2c17b6db51dda102c71de36f8549b6816a96e1867"}, + {file = "PyYAML-6.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1d4c7e777c441b20e32f52bd377e0c409713e8bb1386e1099c2415f26e479595"}, + {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5"}, + {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696"}, + {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735"}, + {file = "PyYAML-6.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6"}, + {file = "PyYAML-6.0.1-cp38-cp38-win32.whl", hash = "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206"}, + {file = "PyYAML-6.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62"}, + {file = "PyYAML-6.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8"}, + {file = "PyYAML-6.0.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:c8098ddcc2a85b61647b2590f825f3db38891662cfc2fc776415143f599bb859"}, + {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6"}, + {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0"}, + {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c"}, + {file = "PyYAML-6.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5"}, + {file = "PyYAML-6.0.1-cp39-cp39-win32.whl", hash = "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c"}, + {file = "PyYAML-6.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486"}, + {file = "PyYAML-6.0.1.tar.gz", hash = "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43"}, +] [[package]] name = "pyzmq" -version = "25.1.0" +version = "25.1.1" description = "Python bindings for 0MQ" category = "dev" optional = false python-versions = ">=3.6" +files = [ + {file = "pyzmq-25.1.1-cp310-cp310-macosx_10_15_universal2.whl", hash = "sha256:381469297409c5adf9a0e884c5eb5186ed33137badcbbb0560b86e910a2f1e76"}, + {file = "pyzmq-25.1.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:955215ed0604dac5b01907424dfa28b40f2b2292d6493445dd34d0dfa72586a8"}, + {file = "pyzmq-25.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:985bbb1316192b98f32e25e7b9958088431d853ac63aca1d2c236f40afb17c83"}, + {file = "pyzmq-25.1.1-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:afea96f64efa98df4da6958bae37f1cbea7932c35878b185e5982821bc883369"}, + {file = "pyzmq-25.1.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:76705c9325d72a81155bb6ab48d4312e0032bf045fb0754889133200f7a0d849"}, + {file = "pyzmq-25.1.1-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:77a41c26205d2353a4c94d02be51d6cbdf63c06fbc1295ea57dad7e2d3381b71"}, + {file = "pyzmq-25.1.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:12720a53e61c3b99d87262294e2b375c915fea93c31fc2336898c26d7aed34cd"}, + {file = "pyzmq-25.1.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:57459b68e5cd85b0be8184382cefd91959cafe79ae019e6b1ae6e2ba8a12cda7"}, + {file = "pyzmq-25.1.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:292fe3fc5ad4a75bc8df0dfaee7d0babe8b1f4ceb596437213821f761b4589f9"}, + {file = "pyzmq-25.1.1-cp310-cp310-win32.whl", hash = "sha256:35b5ab8c28978fbbb86ea54958cd89f5176ce747c1fb3d87356cf698048a7790"}, + {file = "pyzmq-25.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:11baebdd5fc5b475d484195e49bae2dc64b94a5208f7c89954e9e354fc609d8f"}, + {file = "pyzmq-25.1.1-cp311-cp311-macosx_10_15_universal2.whl", hash = "sha256:d20a0ddb3e989e8807d83225a27e5c2eb2260eaa851532086e9e0fa0d5287d83"}, + {file = "pyzmq-25.1.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:e1c1be77bc5fb77d923850f82e55a928f8638f64a61f00ff18a67c7404faf008"}, + {file = "pyzmq-25.1.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d89528b4943d27029a2818f847c10c2cecc79fa9590f3cb1860459a5be7933eb"}, + {file = "pyzmq-25.1.1-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:90f26dc6d5f241ba358bef79be9ce06de58d477ca8485e3291675436d3827cf8"}, + {file = "pyzmq-25.1.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c2b92812bd214018e50b6380ea3ac0c8bb01ac07fcc14c5f86a5bb25e74026e9"}, + {file = "pyzmq-25.1.1-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:2f957ce63d13c28730f7fd6b72333814221c84ca2421298f66e5143f81c9f91f"}, + {file = "pyzmq-25.1.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:047a640f5c9c6ade7b1cc6680a0e28c9dd5a0825135acbd3569cc96ea00b2505"}, + {file = "pyzmq-25.1.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:7f7e58effd14b641c5e4dec8c7dab02fb67a13df90329e61c869b9cc607ef752"}, + {file = "pyzmq-25.1.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:c2910967e6ab16bf6fbeb1f771c89a7050947221ae12a5b0b60f3bca2ee19bca"}, + {file = "pyzmq-25.1.1-cp311-cp311-win32.whl", hash = "sha256:76c1c8efb3ca3a1818b837aea423ff8a07bbf7aafe9f2f6582b61a0458b1a329"}, + {file = "pyzmq-25.1.1-cp311-cp311-win_amd64.whl", hash = "sha256:44e58a0554b21fc662f2712814a746635ed668d0fbc98b7cb9d74cb798d202e6"}, + {file = "pyzmq-25.1.1-cp312-cp312-macosx_10_15_universal2.whl", hash = "sha256:e1ffa1c924e8c72778b9ccd386a7067cddf626884fd8277f503c48bb5f51c762"}, + {file = "pyzmq-25.1.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:1af379b33ef33757224da93e9da62e6471cf4a66d10078cf32bae8127d3d0d4a"}, + {file = "pyzmq-25.1.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cff084c6933680d1f8b2f3b4ff5bbb88538a4aac00d199ac13f49d0698727ecb"}, + {file = "pyzmq-25.1.1-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e2400a94f7dd9cb20cd012951a0cbf8249e3d554c63a9c0cdfd5cbb6c01d2dec"}, + {file = "pyzmq-25.1.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2d81f1ddae3858b8299d1da72dd7d19dd36aab654c19671aa8a7e7fb02f6638a"}, + {file = "pyzmq-25.1.1-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:255ca2b219f9e5a3a9ef3081512e1358bd4760ce77828e1028b818ff5610b87b"}, + {file = "pyzmq-25.1.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:a882ac0a351288dd18ecae3326b8a49d10c61a68b01419f3a0b9a306190baf69"}, + {file = "pyzmq-25.1.1-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:724c292bb26365659fc434e9567b3f1adbdb5e8d640c936ed901f49e03e5d32e"}, + {file = "pyzmq-25.1.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:4ca1ed0bb2d850aa8471387882247c68f1e62a4af0ce9c8a1dbe0d2bf69e41fb"}, + {file = "pyzmq-25.1.1-cp312-cp312-win32.whl", hash = "sha256:b3451108ab861040754fa5208bca4a5496c65875710f76789a9ad27c801a0075"}, + {file = "pyzmq-25.1.1-cp312-cp312-win_amd64.whl", hash = "sha256:eadbefd5e92ef8a345f0525b5cfd01cf4e4cc651a2cffb8f23c0dd184975d787"}, + {file = "pyzmq-25.1.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:db0b2af416ba735c6304c47f75d348f498b92952f5e3e8bff449336d2728795d"}, + {file = "pyzmq-25.1.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c7c133e93b405eb0d36fa430c94185bdd13c36204a8635470cccc200723c13bb"}, + {file = "pyzmq-25.1.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:273bc3959bcbff3f48606b28229b4721716598d76b5aaea2b4a9d0ab454ec062"}, + {file = "pyzmq-25.1.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:cbc8df5c6a88ba5ae385d8930da02201165408dde8d8322072e3e5ddd4f68e22"}, + {file = "pyzmq-25.1.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:18d43df3f2302d836f2a56f17e5663e398416e9dd74b205b179065e61f1a6edf"}, + {file = "pyzmq-25.1.1-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:73461eed88a88c866656e08f89299720a38cb4e9d34ae6bf5df6f71102570f2e"}, + {file = "pyzmq-25.1.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:34c850ce7976d19ebe7b9d4b9bb8c9dfc7aac336c0958e2651b88cbd46682123"}, + {file = "pyzmq-25.1.1-cp36-cp36m-win32.whl", hash = "sha256:d2045d6d9439a0078f2a34b57c7b18c4a6aef0bee37f22e4ec9f32456c852c71"}, + {file = "pyzmq-25.1.1-cp36-cp36m-win_amd64.whl", hash = "sha256:458dea649f2f02a0b244ae6aef8dc29325a2810aa26b07af8374dc2a9faf57e3"}, + {file = "pyzmq-25.1.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:7cff25c5b315e63b07a36f0c2bab32c58eafbe57d0dce61b614ef4c76058c115"}, + {file = "pyzmq-25.1.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b1579413ae492b05de5a6174574f8c44c2b9b122a42015c5292afa4be2507f28"}, + {file = "pyzmq-25.1.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:3d0a409d3b28607cc427aa5c30a6f1e4452cc44e311f843e05edb28ab5e36da0"}, + {file = "pyzmq-25.1.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:21eb4e609a154a57c520e3d5bfa0d97e49b6872ea057b7c85257b11e78068222"}, + {file = "pyzmq-25.1.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:034239843541ef7a1aee0c7b2cb7f6aafffb005ede965ae9cbd49d5ff4ff73cf"}, + {file = "pyzmq-25.1.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:f8115e303280ba09f3898194791a153862cbf9eef722ad8f7f741987ee2a97c7"}, + {file = "pyzmq-25.1.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:1a5d26fe8f32f137e784f768143728438877d69a586ddeaad898558dc971a5ae"}, + {file = "pyzmq-25.1.1-cp37-cp37m-win32.whl", hash = "sha256:f32260e556a983bc5c7ed588d04c942c9a8f9c2e99213fec11a031e316874c7e"}, + {file = "pyzmq-25.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:abf34e43c531bbb510ae7e8f5b2b1f2a8ab93219510e2b287a944432fad135f3"}, + {file = "pyzmq-25.1.1-cp38-cp38-macosx_10_15_universal2.whl", hash = "sha256:87e34f31ca8f168c56d6fbf99692cc8d3b445abb5bfd08c229ae992d7547a92a"}, + {file = "pyzmq-25.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:c9c6c9b2c2f80747a98f34ef491c4d7b1a8d4853937bb1492774992a120f475d"}, + {file = "pyzmq-25.1.1-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:5619f3f5a4db5dbb572b095ea3cb5cc035335159d9da950830c9c4db2fbb6995"}, + {file = "pyzmq-25.1.1-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:5a34d2395073ef862b4032343cf0c32a712f3ab49d7ec4f42c9661e0294d106f"}, + {file = "pyzmq-25.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:25f0e6b78220aba09815cd1f3a32b9c7cb3e02cb846d1cfc526b6595f6046618"}, + {file = "pyzmq-25.1.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:3669cf8ee3520c2f13b2e0351c41fea919852b220988d2049249db10046a7afb"}, + {file = "pyzmq-25.1.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:2d163a18819277e49911f7461567bda923461c50b19d169a062536fffe7cd9d2"}, + {file = "pyzmq-25.1.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:df27ffddff4190667d40de7beba4a950b5ce78fe28a7dcc41d6f8a700a80a3c0"}, + {file = "pyzmq-25.1.1-cp38-cp38-win32.whl", hash = "sha256:a382372898a07479bd34bda781008e4a954ed8750f17891e794521c3e21c2e1c"}, + {file = "pyzmq-25.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:52533489f28d62eb1258a965f2aba28a82aa747202c8fa5a1c7a43b5db0e85c1"}, + {file = "pyzmq-25.1.1-cp39-cp39-macosx_10_15_universal2.whl", hash = "sha256:03b3f49b57264909aacd0741892f2aecf2f51fb053e7d8ac6767f6c700832f45"}, + {file = "pyzmq-25.1.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:330f9e188d0d89080cde66dc7470f57d1926ff2fb5576227f14d5be7ab30b9fa"}, + {file = "pyzmq-25.1.1-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:2ca57a5be0389f2a65e6d3bb2962a971688cbdd30b4c0bd188c99e39c234f414"}, + {file = "pyzmq-25.1.1-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:d457aed310f2670f59cc5b57dcfced452aeeed77f9da2b9763616bd57e4dbaae"}, + {file = "pyzmq-25.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c56d748ea50215abef7030c72b60dd723ed5b5c7e65e7bc2504e77843631c1a6"}, + {file = "pyzmq-25.1.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:8f03d3f0d01cb5a018debeb412441996a517b11c5c17ab2001aa0597c6d6882c"}, + {file = "pyzmq-25.1.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:820c4a08195a681252f46926de10e29b6bbf3e17b30037bd4250d72dd3ddaab8"}, + {file = "pyzmq-25.1.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:17ef5f01d25b67ca8f98120d5fa1d21efe9611604e8eb03a5147360f517dd1e2"}, + {file = "pyzmq-25.1.1-cp39-cp39-win32.whl", hash = "sha256:04ccbed567171579ec2cebb9c8a3e30801723c575601f9a990ab25bcac6b51e2"}, + {file = "pyzmq-25.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:e61f091c3ba0c3578411ef505992d356a812fb200643eab27f4f70eed34a29ef"}, + {file = "pyzmq-25.1.1-pp310-pypy310_pp73-macosx_10_9_x86_64.whl", hash = "sha256:ade6d25bb29c4555d718ac6d1443a7386595528c33d6b133b258f65f963bb0f6"}, + {file = "pyzmq-25.1.1-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e0c95ddd4f6e9fca4e9e3afaa4f9df8552f0ba5d1004e89ef0a68e1f1f9807c7"}, + {file = "pyzmq-25.1.1-pp310-pypy310_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:48e466162a24daf86f6b5ca72444d2bf39a5e58da5f96370078be67c67adc978"}, + {file = "pyzmq-25.1.1-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:abc719161780932c4e11aaebb203be3d6acc6b38d2f26c0f523b5b59d2fc1996"}, + {file = "pyzmq-25.1.1-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:1ccf825981640b8c34ae54231b7ed00271822ea1c6d8ba1090ebd4943759abf5"}, + {file = "pyzmq-25.1.1-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:c2f20ce161ebdb0091a10c9ca0372e023ce24980d0e1f810f519da6f79c60800"}, + {file = "pyzmq-25.1.1-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:deee9ca4727f53464daf089536e68b13e6104e84a37820a88b0a057b97bba2d2"}, + {file = "pyzmq-25.1.1-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:aa8d6cdc8b8aa19ceb319aaa2b660cdaccc533ec477eeb1309e2a291eaacc43a"}, + {file = "pyzmq-25.1.1-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:019e59ef5c5256a2c7378f2fb8560fc2a9ff1d315755204295b2eab96b254d0a"}, + {file = "pyzmq-25.1.1-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:b9af3757495c1ee3b5c4e945c1df7be95562277c6e5bccc20a39aec50f826cd0"}, + {file = "pyzmq-25.1.1-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:548d6482dc8aadbe7e79d1b5806585c8120bafa1ef841167bc9090522b610fa6"}, + {file = "pyzmq-25.1.1-pp38-pypy38_pp73-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:057e824b2aae50accc0f9a0570998adc021b372478a921506fddd6c02e60308e"}, + {file = "pyzmq-25.1.1-pp38-pypy38_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:2243700cc5548cff20963f0ca92d3e5e436394375ab8a354bbea2b12911b20b0"}, + {file = "pyzmq-25.1.1-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:79986f3b4af059777111409ee517da24a529bdbd46da578b33f25580adcff728"}, + {file = "pyzmq-25.1.1-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:11d58723d44d6ed4dd677c5615b2ffb19d5c426636345567d6af82be4dff8a55"}, + {file = "pyzmq-25.1.1-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:49d238cf4b69652257db66d0c623cd3e09b5d2e9576b56bc067a396133a00d4a"}, + {file = "pyzmq-25.1.1-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fedbdc753827cf014c01dbbee9c3be17e5a208dcd1bf8641ce2cd29580d1f0d4"}, + {file = "pyzmq-25.1.1-pp39-pypy39_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:bc16ac425cc927d0a57d242589f87ee093884ea4804c05a13834d07c20db203c"}, + {file = "pyzmq-25.1.1-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:11c1d2aed9079c6b0c9550a7257a836b4a637feb334904610f06d70eb44c56d2"}, + {file = "pyzmq-25.1.1-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:e8a701123029cc240cea61dd2d16ad57cab4691804143ce80ecd9286b464d180"}, + {file = "pyzmq-25.1.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:61706a6b6c24bdece85ff177fec393545a3191eeda35b07aaa1458a027ad1304"}, + {file = "pyzmq-25.1.1.tar.gz", hash = "sha256:259c22485b71abacdfa8bf79720cd7bcf4b9d128b30ea554f01ae71fdbfdaa23"}, +] [package.dependencies] cffi = {version = "*", markers = "implementation_name == \"pypy\""} @@ -1260,6 +2649,10 @@ description = "RDFLib is a Python library for working with RDF, a simple yet pow category = "main" optional = false python-versions = ">=3.7,<4.0" +files = [ + {file = "rdflib-6.3.2-py3-none-any.whl", hash = "sha256:36b4e74a32aa1e4fa7b8719876fb192f19ecd45ff932ea5ebbd2e417a0247e63"}, + {file = "rdflib-6.3.2.tar.gz", hash = "sha256:72af591ff704f4caacea7ecc0c5a9056b8553e0489dd4f35a9bc52dbd41522e0"}, +] [package.dependencies] isodate = ">=0.6.0,<0.7.0" @@ -1273,11 +2666,15 @@ networkx = ["networkx (>=2.0.0,<3.0.0)"] [[package]] name = "referencing" -version = "0.30.0" +version = "0.30.2" description = "JSON Referencing + Python" category = "dev" optional = false python-versions = ">=3.8" +files = [ + {file = "referencing-0.30.2-py3-none-any.whl", hash = "sha256:449b6669b6121a9e96a7f9e410b245d471e8d48964c67113ce9afe50c8dd7bdf"}, + {file = "referencing-0.30.2.tar.gz", hash = "sha256:794ad8003c65938edcdbc027f1933215e0d0ccc0291e3ce20a4d87432b59efc0"}, +] [package.dependencies] attrs = ">=22.2.0" @@ -1285,17 +2682,21 @@ rpds-py = ">=0.7.0" [[package]] name = "requests" -version = "2.28.2" +version = "2.31.0" description = "Python HTTP for Humans." category = "main" optional = false -python-versions = ">=3.7, <4" +python-versions = ">=3.7" +files = [ + {file = "requests-2.31.0-py3-none-any.whl", hash = "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f"}, + {file = "requests-2.31.0.tar.gz", hash = "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1"}, +] [package.dependencies] certifi = ">=2017.4.17" charset-normalizer = ">=2,<4" idna = ">=2.5,<4" -urllib3 = ">=1.21.1,<1.27" +urllib3 = ">=1.21.1,<3" [package.extras] socks = ["PySocks (>=1.5.6,!=1.5.7)"] @@ -1303,42 +2704,152 @@ use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"] [[package]] name = "rpds-py" -version = "0.9.2" +version = "0.10.4" description = "Python bindings to Rust's persistent data structures (rpds)" category = "dev" optional = false python-versions = ">=3.8" +files = [ + {file = "rpds_py-0.10.4-cp310-cp310-macosx_10_7_x86_64.whl", hash = "sha256:e41824343c2c129599645373992b1ce17720bb8a514f04ff9567031e1c26951e"}, + {file = "rpds_py-0.10.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:b9d8884d58ea8801e5906a491ab34af975091af76d1a389173db491ee7e316bb"}, + {file = "rpds_py-0.10.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5db93f9017b384a4f194e1d89e1ce82d0a41b1fafdbbd3e0c8912baf13f2950f"}, + {file = "rpds_py-0.10.4-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:c31ecfc53ac03dad4928a1712f3a2893008bfba1b3cde49e1c14ff67faae2290"}, + {file = "rpds_py-0.10.4-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4f92d2372ec992c82fd7c74aa21e2a1910b3dcdc6a7e6392919a138f21d528a3"}, + {file = "rpds_py-0.10.4-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f7ea49ddf51d5ec0c3cbd95190dd15e077a3153c8d4b22a33da43b5dd2b3c640"}, + {file = "rpds_py-0.10.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1c27942722cd5039bbf5098c7e21935a96243fed00ea11a9589f3c6c6424bd84"}, + {file = "rpds_py-0.10.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:08f07150c8ebbdbce1d2d51b8e9f4d588749a2af6a98035485ebe45c7ad9394e"}, + {file = "rpds_py-0.10.4-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:f3331a3684192659fa1090bf2b448db928152fcba08222e58106f44758ef25f7"}, + {file = "rpds_py-0.10.4-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:efffa359cc69840c8793f0c05a7b663de6afa7b9078fa6c80309ee38b9db677d"}, + {file = "rpds_py-0.10.4-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:86e8d6ff15fa7a9590c0addaf3ce52fb58bda4299cab2c2d0afa404db6848dab"}, + {file = "rpds_py-0.10.4-cp310-none-win32.whl", hash = "sha256:8f90fc6dd505867514c8b8ef68a712dc0be90031a773c1ae2ad469f04062daef"}, + {file = "rpds_py-0.10.4-cp310-none-win_amd64.whl", hash = "sha256:9f9184744fb800c9f28e155a5896ecb54816296ee79d5d1978be6a2ae60f53c4"}, + {file = "rpds_py-0.10.4-cp311-cp311-macosx_10_7_x86_64.whl", hash = "sha256:72e9b1e92830c876cd49565d8404e4dcc9928302d348ea2517bc3f9e3a873a2a"}, + {file = "rpds_py-0.10.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:3650eae998dc718960e90120eb45d42bd57b18b21b10cb9ee05f91bff2345d48"}, + {file = "rpds_py-0.10.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f40413d2859737ce6d95c29ce2dde0ef7cdc3063b5830ae4342fef5922c3bba7"}, + {file = "rpds_py-0.10.4-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:b953d11b544ca5f2705bb77b177d8e17ab1bfd69e0fd99790a11549d2302258c"}, + {file = "rpds_py-0.10.4-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:28b4942ec7d9d6114c1e08cace0157db92ef674636a38093cab779ace5742d3a"}, + {file = "rpds_py-0.10.4-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2e0e2e01c5f61ddf47e3ed2d1fe1c9136e780ca6222d57a2517b9b02afd4710c"}, + {file = "rpds_py-0.10.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:927e3461dae0c09b1f2e0066e50c1a9204f8a64a3060f596e9a6742d3b307785"}, + {file = "rpds_py-0.10.4-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:8e69bbe0ede8f7fe2616e779421bbdb37f025c802335a90f6416e4d98b368a37"}, + {file = "rpds_py-0.10.4-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:cc688a59c100f038fa9fec9e4ab457c2e2d1fca350fe7ea395016666f0d0a2dc"}, + {file = "rpds_py-0.10.4-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:ec001689402b9104700b50a005c2d3d0218eae90eaa8bdbbd776fe78fe8a74b7"}, + {file = "rpds_py-0.10.4-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:628fbb8be71a103499d10b189af7764996ab2634ed7b44b423f1e19901606e0e"}, + {file = "rpds_py-0.10.4-cp311-none-win32.whl", hash = "sha256:e3f9c9e5dd8eba4768e15f19044e1b5e216929a43a54b4ab329e103aed9f3eda"}, + {file = "rpds_py-0.10.4-cp311-none-win_amd64.whl", hash = "sha256:3bc561c183684636c0099f9c3fbab8c1671841942edbce784bb01b4707d17924"}, + {file = "rpds_py-0.10.4-cp312-cp312-macosx_10_7_x86_64.whl", hash = "sha256:36ff30385fb9fb3ac23a28bffdd4a230a5229ed5b15704b708b7c84bfb7fce51"}, + {file = "rpds_py-0.10.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:db0589e0bf41ff6ce284ab045ca89f27be1adf19e7bce26c2e7de6739a70c18b"}, + {file = "rpds_py-0.10.4-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a5c330cb125983c5d380fef4a4155248a276297c86d64625fdaf500157e1981c"}, + {file = "rpds_py-0.10.4-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:d230fddc60caced271cc038e43e6fb8f4dd6b2dbaa44ac9763f2d76d05b0365a"}, + {file = "rpds_py-0.10.4-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2a9e864ec051a58fdb6bb2e6da03942adb20273897bc70067aee283e62bbac4d"}, + {file = "rpds_py-0.10.4-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5e41d5b334e8de4bc3f38843f31b2afa9a0c472ebf73119d3fd55cde08974bdf"}, + {file = "rpds_py-0.10.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5bb3f3cb6072c73e6ec1f865d8b80419b599f1597acf33f63fbf02252aab5a03"}, + {file = "rpds_py-0.10.4-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:576d48e1e45c211e99fc02655ade65c32a75d3e383ccfd98ce59cece133ed02c"}, + {file = "rpds_py-0.10.4-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:b28b9668a22ca2cfca4433441ba9acb2899624a323787a509a3dc5fbfa79c49d"}, + {file = "rpds_py-0.10.4-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:ddbd113a37307638f94be5ae232a325155fd24dbfae2c56455da8724b471e7be"}, + {file = "rpds_py-0.10.4-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:bd0ad98c7d72b0e4cbfe89cdfa12cd07d2fd6ed22864341cdce12b318a383442"}, + {file = "rpds_py-0.10.4-cp312-none-win32.whl", hash = "sha256:2a97406d5e08b7095428f01dac0d3c091dc072351151945a167e7968d2755559"}, + {file = "rpds_py-0.10.4-cp312-none-win_amd64.whl", hash = "sha256:aab24b9bbaa3d49e666e9309556591aa00748bd24ea74257a405f7fed9e8b10d"}, + {file = "rpds_py-0.10.4-cp38-cp38-macosx_10_7_x86_64.whl", hash = "sha256:6c5ca3eb817fb54bfd066740b64a2b31536eb8fe0b183dc35b09a7bd628ed680"}, + {file = "rpds_py-0.10.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:fd37ab9a24021821b715478357af1cf369d5a42ac7405e83e5822be00732f463"}, + {file = "rpds_py-0.10.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2573ec23ad3a59dd2bc622befac845695972f3f2d08dc1a4405d017d20a6c225"}, + {file = "rpds_py-0.10.4-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:362faeae52dc6ccc50c0b6a01fa2ec0830bb61c292033f3749a46040b876f4ba"}, + {file = "rpds_py-0.10.4-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:40f6e53461b19ddbb3354fe5bcf3d50d4333604ae4bf25b478333d83ca68002c"}, + {file = "rpds_py-0.10.4-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6090ba604ea06b525a231450ae5d343917a393cbf50423900dea968daf61d16f"}, + {file = "rpds_py-0.10.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:28e29dac59df890972f73c511948072897f512974714a803fe793635b80ff8c7"}, + {file = "rpds_py-0.10.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:f82abb5c5b83dc30e96be99ce76239a030b62a73a13c64410e429660a5602bfd"}, + {file = "rpds_py-0.10.4-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:a3628815fd170a64624001bfb4e28946fd515bd672e68a1902d9e0290186eaf3"}, + {file = "rpds_py-0.10.4-cp38-cp38-musllinux_1_2_i686.whl", hash = "sha256:d37f27ad80f742ef82796af3fe091888864958ad0bc8bab03da1830fa00c6004"}, + {file = "rpds_py-0.10.4-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:255a23bded80605e9f3997753e3a4b89c9aec9efb07ec036b1ca81440efcc1a9"}, + {file = "rpds_py-0.10.4-cp38-none-win32.whl", hash = "sha256:049098dabfe705e9638c55a3321137a821399c50940041a6fcce267a22c70db2"}, + {file = "rpds_py-0.10.4-cp38-none-win_amd64.whl", hash = "sha256:aa45cc71bf23a3181b8aa62466b5a2b7b7fb90fdc01df67ca433cd4fce7ec94d"}, + {file = "rpds_py-0.10.4-cp39-cp39-macosx_10_7_x86_64.whl", hash = "sha256:3507c459767cf24c11e9520e2a37c89674266abe8e65453e5cb66398aa47ee7b"}, + {file = "rpds_py-0.10.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:2603e084054351cc65097da326570102c4c5bd07426ba8471ceaefdb0b642cc9"}, + {file = "rpds_py-0.10.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b0f1d336786cb62613c72c00578c98e5bb8cd57b49c5bae5d4ab906ca7872f98"}, + {file = "rpds_py-0.10.4-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:bf032367f921201deaecf221d4cc895ea84b3decf50a9c73ee106f961885a0ad"}, + {file = "rpds_py-0.10.4-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7f050ceffd8c730c1619a16bbf0b9cd037dcdb94b54710928ba38c7bde67e4a4"}, + {file = "rpds_py-0.10.4-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8709eb4ab477c533b7d0a76cd3065d7d95c9e25e6b9f6e27caeeb8c63e8799c9"}, + {file = "rpds_py-0.10.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fc20dadb102140dff63529e08ce6f9745dbd36e673ebb2b1c4a63e134bca81c2"}, + {file = "rpds_py-0.10.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:cd7da2adc721ccf19ac7ec86cae3a4fcaba03d9c477d5bd64ded6e9bb817bf3f"}, + {file = "rpds_py-0.10.4-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:e5dba1c11e089b526379e74f6c636202e4c5bad9a48c7416502b8a5b0d026c91"}, + {file = "rpds_py-0.10.4-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:ffd539d213c1ea2989ab92a5b9371ae7159c8c03cf2bcb9f2f594752f755ecd3"}, + {file = "rpds_py-0.10.4-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:e791e3d13b14d0a7921804d0efe4d7bd15508bbcf8cb7a0c1ee1a27319a5f033"}, + {file = "rpds_py-0.10.4-cp39-none-win32.whl", hash = "sha256:2f2ac8bb01f705c5caaa7fe77ffd9b03f92f1b5061b94228f6ea5eaa0fca68ad"}, + {file = "rpds_py-0.10.4-cp39-none-win_amd64.whl", hash = "sha256:7c7ca791bedda059e5195cf7c6b77384657a51429357cdd23e64ac1d4973d6dc"}, + {file = "rpds_py-0.10.4-pp310-pypy310_pp73-macosx_10_7_x86_64.whl", hash = "sha256:9c7e7bd1fa1f535af71dfcd3700fc83a6dc261a1204f8f5327d8ffe82e52905d"}, + {file = "rpds_py-0.10.4-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:7089d8bfa8064b28b2e39f5af7bf12d42f61caed884e35b9b4ea9e6fb1175077"}, + {file = "rpds_py-0.10.4-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f1f191befea279cb9669b57be97ab1785781c8bab805900e95742ebfaa9cbf1d"}, + {file = "rpds_py-0.10.4-pp310-pypy310_pp73-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:98c0aecf661c175ce9cb17347fc51a5c98c3e9189ca57e8fcd9348dae18541db"}, + {file = "rpds_py-0.10.4-pp310-pypy310_pp73-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d81359911c3bb31c899c6a5c23b403bdc0279215e5b3bc0d2a692489fed38632"}, + {file = "rpds_py-0.10.4-pp310-pypy310_pp73-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:83da147124499fe41ed86edf34b4e81e951b3fe28edcc46288aac24e8a5c8484"}, + {file = "rpds_py-0.10.4-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:49db6c0a0e6626c2b97f5e7f8f7074da21cbd8ec73340c25e839a2457c007efa"}, + {file = "rpds_py-0.10.4-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:125776d5db15162fdd9135372bef7fe4fb7c5f5810cf25898eb74a06a0816aec"}, + {file = "rpds_py-0.10.4-pp310-pypy310_pp73-musllinux_1_2_aarch64.whl", hash = "sha256:32819b662e3b4c26355a4403ea2f60c0a00db45b640fe722dd12db3d2ef807fb"}, + {file = "rpds_py-0.10.4-pp310-pypy310_pp73-musllinux_1_2_i686.whl", hash = "sha256:3bd38b80491ef9686f719c1ad3d24d14fbd0e069988fdd4e7d1a6ffcdd7f4a13"}, + {file = "rpds_py-0.10.4-pp310-pypy310_pp73-musllinux_1_2_x86_64.whl", hash = "sha256:2e79eeeff8394284b09577f36316d410525e0cf0133abb3de10660e704d3d38e"}, + {file = "rpds_py-0.10.4-pp38-pypy38_pp73-macosx_10_7_x86_64.whl", hash = "sha256:3e37f1f134037601eb4b1f46854194f0cc082435dac2ee3de11e51529f7831f2"}, + {file = "rpds_py-0.10.4-pp38-pypy38_pp73-macosx_11_0_arm64.whl", hash = "sha256:ba3246c60303eab3d0e562addf25a983d60bddc36f4d1edc2510f056d19df255"}, + {file = "rpds_py-0.10.4-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9123ba0f3f98ff79780eebca9984a2b525f88563844b740f94cffb9099701230"}, + {file = "rpds_py-0.10.4-pp38-pypy38_pp73-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:d98802b78093c7083cc51f83da41a5be5a57d406798c9f69424bd75f8ae0812a"}, + {file = "rpds_py-0.10.4-pp38-pypy38_pp73-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:58bae860d1d116e6b4e1aad0cdc48a187d5893994f56d26db0c5534df7a47afd"}, + {file = "rpds_py-0.10.4-pp38-pypy38_pp73-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cd7e62e7d5bcfa38a62d8397fba6d0428b970ab7954c2197501cd1624f7f0bbb"}, + {file = "rpds_py-0.10.4-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ac83f5228459b84fa6279e4126a53abfdd73cd9cc183947ee5084153880f65d7"}, + {file = "rpds_py-0.10.4-pp38-pypy38_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:4bcb1abecd998a72ad4e36a0fca93577fd0c059a6aacc44f16247031b98f6ff4"}, + {file = "rpds_py-0.10.4-pp38-pypy38_pp73-musllinux_1_2_aarch64.whl", hash = "sha256:9e7b3ad9f53ea9e085b3d27286dd13f8290969c0a153f8a52c8b5c46002c374b"}, + {file = "rpds_py-0.10.4-pp38-pypy38_pp73-musllinux_1_2_i686.whl", hash = "sha256:cbec8e43cace64e63398155dc585dc479a89fef1e57ead06c22d3441e1bd09c3"}, + {file = "rpds_py-0.10.4-pp38-pypy38_pp73-musllinux_1_2_x86_64.whl", hash = "sha256:ad21c60fc880204798f320387164dcacc25818a7b4ec2a0bf6b6c1d57b007d23"}, + {file = "rpds_py-0.10.4-pp39-pypy39_pp73-macosx_10_7_x86_64.whl", hash = "sha256:6baea8a4f6f01e69e75cfdef3edd4a4d1c4b56238febbdf123ce96d09fbff010"}, + {file = "rpds_py-0.10.4-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:94876c21512535955a960f42a155213315e6ab06a4ce8ce372341a2a1b143eeb"}, + {file = "rpds_py-0.10.4-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4cb55454a20d1b935f9eaab52e6ceab624a2efd8b52927c7ae7a43e02828dbe0"}, + {file = "rpds_py-0.10.4-pp39-pypy39_pp73-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:13cbd79ccedc6b39c279af31ebfb0aec0467ad5d14641ddb15738bf6e4146157"}, + {file = "rpds_py-0.10.4-pp39-pypy39_pp73-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:00a88003db3cc953f8656b59fc9af9d0637a1fb93c235814007988f8c153b2f2"}, + {file = "rpds_py-0.10.4-pp39-pypy39_pp73-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d0f7f77a77c37159c9f417b8dd847f67a29e98c6acb52ee98fc6b91efbd1b2b6"}, + {file = "rpds_py-0.10.4-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:70563a1596d2e0660ca2cebb738443437fc0e38597e7cbb276de0a7363924a52"}, + {file = "rpds_py-0.10.4-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e3ece9aa6d07e18c966f14b4352a4c6f40249f6174d3d2c694c1062e19c6adbb"}, + {file = "rpds_py-0.10.4-pp39-pypy39_pp73-musllinux_1_2_aarch64.whl", hash = "sha256:d5ad7b1a1f6964d19b1a8acfc14bf7864f39587b3e25c16ca04f6cd1815026b3"}, + {file = "rpds_py-0.10.4-pp39-pypy39_pp73-musllinux_1_2_i686.whl", hash = "sha256:60018626e637528a1fa64bb3a2b3e46ab7bf672052316d61c3629814d5e65052"}, + {file = "rpds_py-0.10.4-pp39-pypy39_pp73-musllinux_1_2_x86_64.whl", hash = "sha256:ae8a32ab77a84cc870bbfb60645851ca0f7d58fd251085ad67464b1445d632ca"}, + {file = "rpds_py-0.10.4.tar.gz", hash = "sha256:18d5ff7fbd305a1d564273e9eb22de83ae3cd9cd6329fddc8f12f6428a711a6a"}, +] [[package]] name = "setuptools" -version = "67.6.1" +version = "68.2.2" description = "Easily download, build, install, upgrade, and uninstall Python packages" category = "dev" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" +files = [ + {file = "setuptools-68.2.2-py3-none-any.whl", hash = "sha256:b454a35605876da60632df1a60f736524eb73cc47bbc9f3f1ef1b644de74fd2a"}, + {file = "setuptools-68.2.2.tar.gz", hash = "sha256:4ac1475276d2f1c48684874089fefcd83bd7162ddaafb81fac866ba0db282a87"}, +] [package.extras] -docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"] -testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8 (<5)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pip (>=19.1)", "pip-run (>=8.8)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-timeout", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"] -testing-integration = ["build[virtualenv]", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"] +docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier"] +testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pip (>=19.1)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-ruff", "pytest-timeout", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"] +testing-integration = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "packaging (>=23.1)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"] [[package]] name = "setuptools-scm" -version = "7.1.0" +version = "8.0.4" description = "the blessed package to manage your versions by scm tags" category = "dev" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" +files = [ + {file = "setuptools-scm-8.0.4.tar.gz", hash = "sha256:b5f43ff6800669595193fd09891564ee9d1d7dcb196cab4b2506d53a2e1c95c7"}, + {file = "setuptools_scm-8.0.4-py3-none-any.whl", hash = "sha256:b47844cd2a84b83b3187a5782c71128c28b4c94cad8bfb871da2784a5cb54c4f"}, +] [package.dependencies] -packaging = ">=20.0" +packaging = ">=20" setuptools = "*" -tomli = {version = ">=1.0.0", markers = "python_version < \"3.11\""} +tomli = {version = ">=1", markers = "python_version < \"3.11\""} typing-extensions = "*" [package.extras] -test = ["pytest (>=6.2)", "virtualenv (>20)"] -toml = ["setuptools (>=42)"] +docs = ["entangled-cli[rich]", "mkdocs", "mkdocs-entangled-plugin", "mkdocs-material", "mkdocstrings[python]", "pygments"] +rich = ["rich"] +test = ["build", "pytest", "rich", "wheel"] [[package]] name = "six" @@ -1347,6 +2858,10 @@ description = "Python 2 and 3 compatibility utilities" category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*" +files = [ + {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, + {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"}, +] [[package]] name = "snowballstemmer" @@ -1355,6 +2870,10 @@ description = "This package provides 29 stemmers for 28 languages generated from category = "dev" optional = false python-versions = "*" +files = [ + {file = "snowballstemmer-2.2.0-py2.py3-none-any.whl", hash = "sha256:c8e1716e83cc398ae16824e5572ae04e0d9fc2c6b985fb0f900f5f0c96ecba1a"}, + {file = "snowballstemmer-2.2.0.tar.gz", hash = "sha256:09b16deb8547d3412ad7b590689584cd0fe25ec8db3be37788be3810cbf19cb1"}, +] [[package]] name = "sortedcontainers" @@ -1363,14 +2882,22 @@ description = "Sorted Containers -- Sorted List, Sorted Dict, Sorted Set" category = "dev" optional = false python-versions = "*" +files = [ + {file = "sortedcontainers-2.4.0-py2.py3-none-any.whl", hash = "sha256:a163dcaede0f1c021485e957a39245190e74249897e2ae4b2aa38595db237ee0"}, + {file = "sortedcontainers-2.4.0.tar.gz", hash = "sha256:25caa5a06cc30b6b83d11423433f65d1f9d76c4c6a0c90e3379eaa43b9bfdb88"}, +] [[package]] name = "soupsieve" -version = "2.4.1" +version = "2.5" description = "A modern CSS selector implementation for Beautiful Soup." category = "dev" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" +files = [ + {file = "soupsieve-2.5-py3-none-any.whl", hash = "sha256:eaa337ff55a1579b6549dc679565eac1e3d000563bcb1c8ab0d0fefbc0c2cdc7"}, + {file = "soupsieve-2.5.tar.gz", hash = "sha256:5663d5a7b3bfaeee0bc4372e7fc48f9cff4940b3eec54a6451cc5299f1097690"}, +] [[package]] name = "sphinx" @@ -1379,6 +2906,10 @@ description = "Python documentation generator" category = "dev" optional = false python-versions = ">=3.6" +files = [ + {file = "Sphinx-5.3.0.tar.gz", hash = "sha256:51026de0a9ff9fc13c05d74913ad66047e104f56a129ff73e174eb5c3ee794b5"}, + {file = "sphinx-5.3.0-py3-none-any.whl", hash = "sha256:060ca5c9f7ba57a08a1219e547b269fadf125ae25b06b9fa7f66768efb652d6d"}, +] [package.dependencies] alabaster = ">=0.7,<0.8" @@ -1406,18 +2937,22 @@ test = ["cython", "html5lib", "pytest (>=4.6)", "typed_ast"] [[package]] name = "sphinx-autodoc-typehints" -version = "1.22" +version = "1.23.0" description = "Type hints (PEP 484) support for the Sphinx autodoc extension" category = "dev" optional = false python-versions = ">=3.7" +files = [ + {file = "sphinx_autodoc_typehints-1.23.0-py3-none-any.whl", hash = "sha256:ac099057e66b09e51b698058ba7dd76e57e1fe696cd91b54e121d3dad188f91d"}, + {file = "sphinx_autodoc_typehints-1.23.0.tar.gz", hash = "sha256:5d44e2996633cdada499b6d27a496ddf9dbc95dd1f0f09f7b37940249e61f6e9"}, +] [package.dependencies] sphinx = ">=5.3" [package.extras] -docs = ["furo (>=2022.12.7)", "sphinx (>=6.1.3)", "sphinx-autodoc-typehints (>=1.21)"] -testing = ["covdefaults (>=2.2.2)", "coverage (>=7.0.5)", "diff-cover (>=7.3)", "nptyping (>=2.4.1)", "pytest (>=7.2.1)", "pytest-cov (>=4)", "sphobjinv (>=2.3.1)", "typing-extensions (>=4.4)"] +docs = ["furo (>=2022.12.7)", "sphinx (>=6.1.3)", "sphinx-autodoc-typehints (>=1.23.4)"] +testing = ["covdefaults (>=2.2.2)", "coverage (>=7.2.2)", "diff-cover (>=7.5)", "nptyping (>=2.5)", "pytest (>=7.2.2)", "pytest-cov (>=4)", "sphobjinv (>=2.3.1)", "typing-extensions (>=4.5)"] type-comment = ["typed-ast (>=1.5.4)"] [[package]] @@ -1427,6 +2962,10 @@ description = "A sphinx extension for designing beautiful, view size responsive category = "dev" optional = false python-versions = ">=3.7" +files = [ + {file = "sphinx_design-0.3.0-py3-none-any.whl", hash = "sha256:823c1dd74f31efb3285ec2f1254caefed29d762a40cd676f58413a1e4ed5cc96"}, + {file = "sphinx_design-0.3.0.tar.gz", hash = "sha256:7183fa1fae55b37ef01bda5125a21ee841f5bbcbf59a35382be598180c4cefba"}, +] [package.dependencies] sphinx = ">=4,<6" @@ -1442,38 +2981,53 @@ theme-sbt = ["sphinx-book-theme (>=0.3.0,<0.4.0)"] [[package]] name = "sphinx-last-updated-by-git" -version = "0.3.4" +version = "0.3.6" description = "Get the \"last updated\" time for each Sphinx page from Git" category = "dev" optional = false -python-versions = ">=3.6" +python-versions = ">=3.7" +files = [ + {file = "sphinx-last-updated-by-git-0.3.6.tar.gz", hash = "sha256:8f1f5c52740b14ff8481b25a2162eb0e4b144dbf871ca357ff341858390aa17c"}, + {file = "sphinx_last_updated_by_git-0.3.6-py3-none-any.whl", hash = "sha256:bc1890ec80f84607d9f77e144e26330a2c901154e7e77a2dad964f6a4bdd6329"}, +] [package.dependencies] sphinx = ">=1.8" [[package]] name = "sphinx-rtd-theme" -version = "1.2.0" +version = "1.3.0" description = "Read the Docs theme for Sphinx" category = "dev" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,>=2.7" +files = [ + {file = "sphinx_rtd_theme-1.3.0-py2.py3-none-any.whl", hash = "sha256:46ddef89cc2416a81ecfbeaceab1881948c014b1b6e4450b815311a89fb977b0"}, + {file = "sphinx_rtd_theme-1.3.0.tar.gz", hash = "sha256:590b030c7abb9cf038ec053b95e5380b5c70d61591eb0b552063fbe7c41f0931"}, +] [package.dependencies] docutils = "<0.19" -sphinx = ">=1.6,<7" -sphinxcontrib-jquery = {version = ">=2.0.0,<3.0.0 || >3.0.0", markers = "python_version > \"3\""} +sphinx = ">=1.6,<8" +sphinxcontrib-jquery = ">=4,<5" [package.extras] dev = ["bump2version", "sphinxcontrib-httpdomain", "transifex-client", "wheel"] [[package]] name = "sphinxcontrib-applehelp" -version = "1.0.4" +version = "1.0.7" description = "sphinxcontrib-applehelp is a Sphinx extension which outputs Apple help books" category = "dev" optional = false -python-versions = ">=3.8" +python-versions = ">=3.9" +files = [ + {file = "sphinxcontrib_applehelp-1.0.7-py3-none-any.whl", hash = "sha256:094c4d56209d1734e7d252f6e0b3ccc090bd52ee56807a5d9315b19c122ab15d"}, + {file = "sphinxcontrib_applehelp-1.0.7.tar.gz", hash = "sha256:39fdc8d762d33b01a7d8f026a3b7d71563ea3b72787d5f00ad8465bd9d6dfbfa"}, +] + +[package.dependencies] +Sphinx = ">=5" [package.extras] lint = ["docutils-stubs", "flake8", "mypy"] @@ -1481,11 +3035,18 @@ test = ["pytest"] [[package]] name = "sphinxcontrib-devhelp" -version = "1.0.2" -description = "sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp document." +version = "1.0.5" +description = "sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp documents" category = "dev" optional = false -python-versions = ">=3.5" +python-versions = ">=3.9" +files = [ + {file = "sphinxcontrib_devhelp-1.0.5-py3-none-any.whl", hash = "sha256:fe8009aed765188f08fcaadbb3ea0d90ce8ae2d76710b7e29ea7d047177dae2f"}, + {file = "sphinxcontrib_devhelp-1.0.5.tar.gz", hash = "sha256:63b41e0d38207ca40ebbeabcf4d8e51f76c03e78cd61abe118cf4435c73d4212"}, +] + +[package.dependencies] +Sphinx = ">=5" [package.extras] lint = ["docutils-stubs", "flake8", "mypy"] @@ -1493,11 +3054,18 @@ test = ["pytest"] [[package]] name = "sphinxcontrib-htmlhelp" -version = "2.0.1" +version = "2.0.4" description = "sphinxcontrib-htmlhelp is a sphinx extension which renders HTML help files" category = "dev" optional = false -python-versions = ">=3.8" +python-versions = ">=3.9" +files = [ + {file = "sphinxcontrib_htmlhelp-2.0.4-py3-none-any.whl", hash = "sha256:8001661c077a73c29beaf4a79968d0726103c5605e27db92b9ebed8bab1359e9"}, + {file = "sphinxcontrib_htmlhelp-2.0.4.tar.gz", hash = "sha256:6c26a118a05b76000738429b724a0568dbde5b72391a688577da08f11891092a"}, +] + +[package.dependencies] +Sphinx = ">=5" [package.extras] lint = ["docutils-stubs", "flake8", "mypy"] @@ -1510,6 +3078,10 @@ description = "Extension to include jQuery on newer Sphinx releases" category = "dev" optional = false python-versions = ">=2.7" +files = [ + {file = "sphinxcontrib-jquery-4.1.tar.gz", hash = "sha256:1620739f04e36a2c779f1a131a2dfd49b2fd07351bf1968ced074365933abc7a"}, + {file = "sphinxcontrib_jquery-4.1-py2.py3-none-any.whl", hash = "sha256:f936030d7d0147dd026a4f2b5a57343d233f1fc7b363f68b3d4f1cb0993878ae"}, +] [package.dependencies] Sphinx = ">=1.8" @@ -1521,17 +3093,28 @@ description = "A sphinx extension which renders display math in HTML via JavaScr category = "dev" optional = false python-versions = ">=3.5" +files = [ + {file = "sphinxcontrib-jsmath-1.0.1.tar.gz", hash = "sha256:a9925e4a4587247ed2191a22df5f6970656cb8ca2bd6284309578f2153e0c4b8"}, + {file = "sphinxcontrib_jsmath-1.0.1-py2.py3-none-any.whl", hash = "sha256:2ec2eaebfb78f3f2078e73666b1415417a116cc848b72e5172e596c871103178"}, +] [package.extras] test = ["flake8", "mypy", "pytest"] [[package]] name = "sphinxcontrib-qthelp" -version = "1.0.3" -description = "sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document." +version = "1.0.6" +description = "sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp documents" category = "dev" optional = false -python-versions = ">=3.5" +python-versions = ">=3.9" +files = [ + {file = "sphinxcontrib_qthelp-1.0.6-py3-none-any.whl", hash = "sha256:bf76886ee7470b934e363da7a954ea2825650013d367728588732c7350f49ea4"}, + {file = "sphinxcontrib_qthelp-1.0.6.tar.gz", hash = "sha256:62b9d1a186ab7f5ee3356d906f648cacb7a6bdb94d201ee7adf26db55092982d"}, +] + +[package.dependencies] +Sphinx = ">=5" [package.extras] lint = ["docutils-stubs", "flake8", "mypy"] @@ -1539,11 +3122,18 @@ test = ["pytest"] [[package]] name = "sphinxcontrib-serializinghtml" -version = "1.1.5" -description = "sphinxcontrib-serializinghtml is a sphinx extension which outputs \"serialized\" HTML files (json and pickle)." +version = "1.1.9" +description = "sphinxcontrib-serializinghtml is a sphinx extension which outputs \"serialized\" HTML files (json and pickle)" category = "dev" optional = false -python-versions = ">=3.5" +python-versions = ">=3.9" +files = [ + {file = "sphinxcontrib_serializinghtml-1.1.9-py3-none-any.whl", hash = "sha256:9b36e503703ff04f20e9675771df105e58aa029cfcbc23b8ed716019b7416ae1"}, + {file = "sphinxcontrib_serializinghtml-1.1.9.tar.gz", hash = "sha256:0c64ff898339e1fac29abd2bf5f11078f3ec413cfe9c046d3120d7ca65530b54"}, +] + +[package.dependencies] +Sphinx = ">=5" [package.extras] lint = ["docutils-stubs", "flake8", "mypy"] @@ -1556,6 +3146,10 @@ description = "Sphinx Extension to enable OGP support" category = "dev" optional = false python-versions = ">=3.7" +files = [ + {file = "sphinxext-opengraph-0.8.2.tar.gz", hash = "sha256:45a693b6704052c426576f0a1f630649c55b4188bc49eb63e9587e24a923db39"}, + {file = "sphinxext_opengraph-0.8.2-py3-none-any.whl", hash = "sha256:6a05bdfe5176d9dd0a1d58a504f17118362ab976631213cd36fb44c4c40544c9"}, +] [package.dependencies] matplotlib = "*" @@ -1563,11 +3157,15 @@ sphinx = ">=4.0" [[package]] name = "stack-data" -version = "0.6.2" +version = "0.6.3" description = "Extract data from python stack frames and tracebacks for informative displays" category = "dev" optional = false python-versions = "*" +files = [ + {file = "stack_data-0.6.3-py3-none-any.whl", hash = "sha256:d5558e0c25a4cb0853cddad3d77da9891a08cb85dd9f9f91b9f8cd66e511e695"}, + {file = "stack_data-0.6.3.tar.gz", hash = "sha256:836a778de4fec4dcd1dcd89ed8abff8a221f58308462e1c4aa2a3cf30148f0b9"}, +] [package.dependencies] asttokens = ">=2.1.0" @@ -1584,6 +3182,9 @@ description = "String case converter." category = "main" optional = false python-versions = "*" +files = [ + {file = "stringcase-1.2.0.tar.gz", hash = "sha256:48a06980661908efe8d9d34eab2b6c13aefa2163b3ced26972902e3bdfd87008"}, +] [[package]] name = "tinycss2" @@ -1592,6 +3193,10 @@ description = "A tiny CSS parser" category = "dev" optional = false python-versions = ">=3.7" +files = [ + {file = "tinycss2-1.2.1-py3-none-any.whl", hash = "sha256:2b80a96d41e7c3914b8cda8bc7f705a4d9c49275616e886103dd839dfc847847"}, + {file = "tinycss2-1.2.1.tar.gz", hash = "sha256:8cff3a8f066c2ec677c06dbc7b45619804a6938478d9d73c284b29d14ecb0627"}, +] [package.dependencies] webencodings = ">=0.4" @@ -1607,6 +3212,10 @@ description = "Python Library for Tom's Obvious, Minimal Language" category = "main" optional = false python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" +files = [ + {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"}, + {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"}, +] [[package]] name = "tomli" @@ -1615,67 +3224,96 @@ description = "A lil' TOML parser" category = "dev" optional = false python-versions = ">=3.7" +files = [ + {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"}, + {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"}, +] [[package]] name = "tornado" -version = "6.3.2" +version = "6.3.3" description = "Tornado is a Python web framework and asynchronous networking library, originally developed at FriendFeed." category = "dev" optional = false python-versions = ">= 3.8" +files = [ + {file = "tornado-6.3.3-cp38-abi3-macosx_10_9_universal2.whl", hash = "sha256:502fba735c84450974fec147340016ad928d29f1e91f49be168c0a4c18181e1d"}, + {file = "tornado-6.3.3-cp38-abi3-macosx_10_9_x86_64.whl", hash = "sha256:805d507b1f588320c26f7f097108eb4023bbaa984d63176d1652e184ba24270a"}, + {file = "tornado-6.3.3-cp38-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1bd19ca6c16882e4d37368e0152f99c099bad93e0950ce55e71daed74045908f"}, + {file = "tornado-6.3.3-cp38-abi3-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7ac51f42808cca9b3613f51ffe2a965c8525cb1b00b7b2d56828b8045354f76a"}, + {file = "tornado-6.3.3-cp38-abi3-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:71a8db65160a3c55d61839b7302a9a400074c9c753040455494e2af74e2501f2"}, + {file = "tornado-6.3.3-cp38-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:ceb917a50cd35882b57600709dd5421a418c29ddc852da8bcdab1f0db33406b0"}, + {file = "tornado-6.3.3-cp38-abi3-musllinux_1_1_i686.whl", hash = "sha256:7d01abc57ea0dbb51ddfed477dfe22719d376119844e33c661d873bf9c0e4a16"}, + {file = "tornado-6.3.3-cp38-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:9dc4444c0defcd3929d5c1eb5706cbe1b116e762ff3e0deca8b715d14bf6ec17"}, + {file = "tornado-6.3.3-cp38-abi3-win32.whl", hash = "sha256:65ceca9500383fbdf33a98c0087cb975b2ef3bfb874cb35b8de8740cf7f41bd3"}, + {file = "tornado-6.3.3-cp38-abi3-win_amd64.whl", hash = "sha256:22d3c2fa10b5793da13c807e6fc38ff49a4f6e1e3868b0a6f4164768bb8e20f5"}, + {file = "tornado-6.3.3.tar.gz", hash = "sha256:e7d8db41c0181c80d76c982aacc442c0783a2c54d6400fe028954201a2e032fe"}, +] [[package]] name = "tox" -version = "4.4.8" +version = "4.11.3" description = "tox is a generic virtualenv management and test command line tool" category = "dev" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" +files = [ + {file = "tox-4.11.3-py3-none-any.whl", hash = "sha256:599af5e5bb0cad0148ac1558a0b66f8fff219ef88363483b8d92a81e4246f28f"}, + {file = "tox-4.11.3.tar.gz", hash = "sha256:5039f68276461fae6a9452a3b2c7295798f00a0e92edcd9a3b78ba1a73577951"}, +] [package.dependencies] -cachetools = ">=5.3" -chardet = ">=5.1" +cachetools = ">=5.3.1" +chardet = ">=5.2" colorama = ">=0.4.6" -filelock = ">=3.10" -packaging = ">=23" -platformdirs = ">=3.1.1" -pluggy = ">=1" -pyproject-api = ">=1.5.1" +filelock = ">=3.12.3" +packaging = ">=23.1" +platformdirs = ">=3.10" +pluggy = ">=1.3" +pyproject-api = ">=1.6.1" tomli = {version = ">=2.0.1", markers = "python_version < \"3.11\""} -virtualenv = ">=20.21" +virtualenv = ">=20.24.3" [package.extras] -docs = ["furo (>=2022.12.7)", "sphinx (>=6.1.3)", "sphinx-argparse-cli (>=1.11)", "sphinx-autodoc-typehints (>=1.22,!=1.23.4)", "sphinx-copybutton (>=0.5.1)", "sphinx-inline-tabs (>=2022.1.2b11)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=22.12)"] -testing = ["build[virtualenv] (>=0.10)", "covdefaults (>=2.3)", "devpi-process (>=0.3)", "diff-cover (>=7.5)", "distlib (>=0.3.6)", "flaky (>=3.7)", "hatch-vcs (>=0.3)", "hatchling (>=1.13)", "psutil (>=5.9.4)", "pytest (>=7.2.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)", "pytest-xdist (>=3.2.1)", "re-assert (>=1.1)", "time-machine (>=2.9)", "wheel (>=0.40)"] +docs = ["furo (>=2023.8.19)", "sphinx (>=7.2.4)", "sphinx-argparse-cli (>=1.11.1)", "sphinx-autodoc-typehints (>=1.24)", "sphinx-copybutton (>=0.5.2)", "sphinx-inline-tabs (>=2023.4.21)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"] +testing = ["build[virtualenv] (>=0.10)", "covdefaults (>=2.3)", "detect-test-pollution (>=1.1.1)", "devpi-process (>=1)", "diff-cover (>=7.7)", "distlib (>=0.3.7)", "flaky (>=3.7)", "hatch-vcs (>=0.3)", "hatchling (>=1.18)", "psutil (>=5.9.5)", "pytest (>=7.4)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)", "pytest-xdist (>=3.3.1)", "re-assert (>=1.1)", "time-machine (>=2.12)", "wheel (>=0.41.2)"] [[package]] name = "tqdm" -version = "4.65.0" +version = "4.66.1" description = "Fast, Extensible Progress Meter" category = "main" optional = false python-versions = ">=3.7" +files = [ + {file = "tqdm-4.66.1-py3-none-any.whl", hash = "sha256:d302b3c5b53d47bce91fea46679d9c3c6508cf6332229aa1e7d8653723793386"}, + {file = "tqdm-4.66.1.tar.gz", hash = "sha256:d88e651f9db8d8551a62556d3cff9e3034274ca5d66e93197cf2490e2dcb69c7"}, +] [package.dependencies] colorama = {version = "*", markers = "platform_system == \"Windows\""} [package.extras] -dev = ["py-make (>=0.1.0)", "twine", "wheel"] +dev = ["pytest (>=6)", "pytest-cov", "pytest-timeout", "pytest-xdist"] notebook = ["ipywidgets (>=6)"] slack = ["slack-sdk"] telegram = ["requests"] [[package]] name = "traitlets" -version = "5.9.0" +version = "5.11.2" description = "Traitlets Python configuration system" category = "dev" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" +files = [ + {file = "traitlets-5.11.2-py3-none-any.whl", hash = "sha256:98277f247f18b2c5cabaf4af369187754f4fb0e85911d473f72329db8a7f4fae"}, + {file = "traitlets-5.11.2.tar.gz", hash = "sha256:7564b5bf8d38c40fa45498072bf4dc5e8346eb087bbf1e2ae2d8774f6a0f078e"}, +] [package.extras] docs = ["myst-parser", "pydata-sphinx-theme", "sphinx"] -test = ["argcomplete (>=2.0)", "pre-commit", "pytest", "pytest-mock"] +test = ["argcomplete (>=3.0.3)", "mypy (>=1.5.1)", "pre-commit", "pytest (>=7.0,<7.5)", "pytest-mock", "pytest-mypy-testing"] [[package]] name = "treelib" @@ -1684,17 +3322,25 @@ description = "A Python 2/3 implementation of tree structure." category = "main" optional = false python-versions = "*" +files = [ + {file = "treelib-1.6.4-py3-none-any.whl", hash = "sha256:4218f7dded2448dfa6a335888bf68a28430660163e7faf18c6128ec4477d34c0"}, + {file = "treelib-1.6.4.tar.gz", hash = "sha256:1a2e838f6b99e2690bc3d992d5a1f04cdb4af6564bd7688883c23d17257bbb2a"}, +] [package.dependencies] six = "*" [[package]] name = "typing-extensions" -version = "4.5.0" -description = "Backported and Experimental Type Hints for Python 3.7+" +version = "4.8.0" +description = "Backported and Experimental Type Hints for Python 3.8+" category = "dev" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" +files = [ + {file = "typing_extensions-4.8.0-py3-none-any.whl", hash = "sha256:8f92fc8806f9a6b641eaa5318da32b44d401efaac0f6678c9bc448ba3605faa0"}, + {file = "typing_extensions-4.8.0.tar.gz", hash = "sha256:df8e4339e9cb77357558cbdbceca33c303714cf861d1eef15e1070055ae8b7ef"}, +] [[package]] name = "tzdata" @@ -1703,44 +3349,61 @@ description = "Provider of IANA time zone data" category = "main" optional = false python-versions = ">=2" +files = [ + {file = "tzdata-2023.3-py2.py3-none-any.whl", hash = "sha256:7e65763eef3120314099b6939b5546db7adce1e7d6f2e179e3df563c70511eda"}, + {file = "tzdata-2023.3.tar.gz", hash = "sha256:11ef1e08e54acb0d4f95bdb1be05da659673de4acbd21bf9c69e94cc5e907a3a"}, +] [[package]] name = "urllib3" -version = "1.26.15" +version = "2.0.6" description = "HTTP library with thread-safe connection pooling, file post, and more." category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">=3.7" +files = [ + {file = "urllib3-2.0.6-py3-none-any.whl", hash = "sha256:7a7c7003b000adf9e7ca2a377c9688bbc54ed41b985789ed576570342a375cd2"}, + {file = "urllib3-2.0.6.tar.gz", hash = "sha256:b19e1a85d206b56d7df1d5e683df4a7725252a964e3993648dd0fb5a1c157564"}, +] [package.extras] -brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)", "brotlipy (>=0.6.0)"] -secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "ipaddress", "pyOpenSSL (>=0.14)", "urllib3-secure-extra"] -socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] +brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)"] +secure = ["certifi", "cryptography (>=1.9)", "idna (>=2.0.0)", "pyopenssl (>=17.1.0)", "urllib3-secure-extra"] +socks = ["pysocks (>=1.5.6,!=1.5.7,<2.0)"] +zstd = ["zstandard (>=0.18.0)"] [[package]] name = "virtualenv" -version = "20.21.0" +version = "20.24.5" description = "Virtual Python Environment builder" category = "dev" optional = false python-versions = ">=3.7" +files = [ + {file = "virtualenv-20.24.5-py3-none-any.whl", hash = "sha256:b80039f280f4919c77b30f1c23294ae357c4c8701042086e3fc005963e4e537b"}, + {file = "virtualenv-20.24.5.tar.gz", hash = "sha256:e8361967f6da6fbdf1426483bfe9fca8287c242ac0bc30429905721cefbff752"}, +] [package.dependencies] -distlib = ">=0.3.6,<1" -filelock = ">=3.4.1,<4" -platformdirs = ">=2.4,<4" +distlib = ">=0.3.7,<1" +filelock = ">=3.12.2,<4" +platformdirs = ">=3.9.1,<4" [package.extras] -docs = ["furo (>=2022.12.7)", "proselint (>=0.13)", "sphinx (>=6.1.3)", "sphinx-argparse (>=0.4)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=22.12)"] -test = ["covdefaults (>=2.2.2)", "coverage (>=7.1)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=23)", "pytest (>=7.2.1)", "pytest-env (>=0.8.1)", "pytest-freezegun (>=0.4.2)", "pytest-mock (>=3.10)", "pytest-randomly (>=3.12)", "pytest-timeout (>=2.1)"] +docs = ["furo (>=2023.7.26)", "proselint (>=0.13)", "sphinx (>=7.1.2)", "sphinx-argparse (>=0.4)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"] +test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=23.1)", "pytest (>=7.4)", "pytest-env (>=0.8.2)", "pytest-freezer (>=0.4.8)", "pytest-mock (>=3.11.1)", "pytest-randomly (>=3.12)", "pytest-timeout (>=2.1)", "setuptools (>=68)", "time-machine (>=2.10)"] [[package]] name = "wcwidth" -version = "0.2.6" +version = "0.2.8" description = "Measures the displayed width of unicode strings in a terminal" category = "dev" optional = false python-versions = "*" +files = [ + {file = "wcwidth-0.2.8-py2.py3-none-any.whl", hash = "sha256:77f719e01648ed600dfa5402c347481c0992263b81a027344f3e1ba25493a704"}, + {file = "wcwidth-0.2.8.tar.gz", hash = "sha256:8705c569999ffbb4f6a87c6d1b80f324bd6db952f5eb0b95bc07517f4c1813d4"}, +] [[package]] name = "webencodings" @@ -1749,6 +3412,10 @@ description = "Character encoding aliases for legacy web content" category = "dev" optional = false python-versions = "*" +files = [ + {file = "webencodings-0.5.1-py2.py3-none-any.whl", hash = "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78"}, + {file = "webencodings-0.5.1.tar.gz", hash = "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"}, +] [[package]] name = "yapf" @@ -1757,1348 +3424,28 @@ description = "A formatter for Python code." category = "dev" optional = false python-versions = "*" +files = [ + {file = "yapf-0.32.0-py2.py3-none-any.whl", hash = "sha256:8fea849025584e486fd06d6ba2bed717f396080fd3cc236ba10cb97c4c51cf32"}, + {file = "yapf-0.32.0.tar.gz", hash = "sha256:a3f5085d37ef7e3e004c4ba9f9b3e40c54ff1901cd111f05145ae313a7c67d1b"}, +] [[package]] name = "zipp" -version = "3.15.0" +version = "3.17.0" description = "Backport of pathlib-compatible object wrapper for zip files" category = "dev" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" +files = [ + {file = "zipp-3.17.0-py3-none-any.whl", hash = "sha256:0e923e726174922dce09c53c59ad483ff7bbb8e572e00c7f7c46b88556409f31"}, + {file = "zipp-3.17.0.tar.gz", hash = "sha256:84e64a1c28cf7e91ed2078bb8cc8c259cb19b76942096c8d7b84947690cabaf0"}, +] [package.extras] -docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] -testing = ["big-O", "flake8 (<5)", "jaraco.functools", "jaraco.itertools", "more-itertools", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)"] +docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (<7.2.5)", "sphinx (>=3.5)", "sphinx-lint"] +testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-ignore-flaky", "pytest-mypy (>=0.9.1)", "pytest-ruff"] [metadata] -lock-version = "1.1" +lock-version = "2.0" python-versions = "^3.9" -content-hash = "779e998b2d52f944078197c035c3f9081df88b0c1c77d7b322ee95d622edb54c" - -[metadata.files] -alabaster = [ - {file = "alabaster-0.7.13-py3-none-any.whl", hash = "sha256:1ee19aca801bbabb5ba3f5f258e4422dfa86f82f3e9cefb0859b283cdd7f62a3"}, - {file = "alabaster-0.7.13.tar.gz", hash = "sha256:a27a4a084d5e690e16e01e03ad2b2e552c61a65469419b907243193de1a84ae2"}, -] -appdirs = [ - {file = "appdirs-1.4.4-py2.py3-none-any.whl", hash = "sha256:a841dacd6b99318a741b166adb07e19ee71a274450e68237b4650ca1055ab128"}, - {file = "appdirs-1.4.4.tar.gz", hash = "sha256:7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41"}, -] -appnope = [ - {file = "appnope-0.1.3-py2.py3-none-any.whl", hash = "sha256:265a455292d0bd8a72453494fa24df5a11eb18373a60c7c0430889f22548605e"}, - {file = "appnope-0.1.3.tar.gz", hash = "sha256:02bd91c4de869fbb1e1c50aafc4098827a7a54ab2f39d9dcba6c9547ed920e24"}, -] -asttokens = [ - {file = "asttokens-2.2.1-py2.py3-none-any.whl", hash = "sha256:6b0ac9e93fb0335014d382b8fa9b3afa7df546984258005da0b9e7095b3deb1c"}, - {file = "asttokens-2.2.1.tar.gz", hash = "sha256:4622110b2a6f30b77e1473affaa97e711bc2f07d3f10848420ff1898edbe94f3"}, -] -attrs = [ - {file = "attrs-22.2.0-py3-none-any.whl", hash = "sha256:29e95c7f6778868dbd49170f98f8818f78f3dc5e0e37c0b1f474e3561b240836"}, - {file = "attrs-22.2.0.tar.gz", hash = "sha256:c9227bfc2f01993c03f68db37d1d15c9690188323c067c641f1a35ca58185f99"}, -] -babel = [ - {file = "Babel-2.12.1-py3-none-any.whl", hash = "sha256:b4246fb7677d3b98f501a39d43396d3cafdc8eadb045f4a31be01863f655c610"}, - {file = "Babel-2.12.1.tar.gz", hash = "sha256:cc2d99999cd01d44420ae725a21c9e3711b3aadc7976d6147f622d8581963455"}, -] -backcall = [ - {file = "backcall-0.2.0-py2.py3-none-any.whl", hash = "sha256:fbbce6a29f263178a1f7915c1940bde0ec2b2a967566fe1c65c1dfb7422bd255"}, - {file = "backcall-0.2.0.tar.gz", hash = "sha256:5cbdbf27be5e7cfadb448baf0aa95508f91f2bbc6c6437cd9cd06e2a4c215e1e"}, -] -beautifulsoup4 = [ - {file = "beautifulsoup4-4.12.2-py3-none-any.whl", hash = "sha256:bd2520ca0d9d7d12694a53d44ac482d181b4ec1888909b035a3dbf40d0f57d4a"}, - {file = "beautifulsoup4-4.12.2.tar.gz", hash = "sha256:492bbc69dca35d12daac71c4db1bfff0c876c00ef4a2ffacce226d4638eb72da"}, -] -bleach = [ - {file = "bleach-6.0.0-py3-none-any.whl", hash = "sha256:33c16e3353dbd13028ab4799a0f89a83f113405c766e9c122df8a06f5b85b3f4"}, - {file = "bleach-6.0.0.tar.gz", hash = "sha256:1a1a85c1595e07d8db14c5f09f09e6433502c51c595970edc090551f0db99414"}, -] -bump2version = [ - {file = "bump2version-1.0.1-py2.py3-none-any.whl", hash = "sha256:37f927ea17cde7ae2d7baf832f8e80ce3777624554a653006c9144f8017fe410"}, - {file = "bump2version-1.0.1.tar.gz", hash = "sha256:762cb2bfad61f4ec8e2bdf452c7c267416f8c70dd9ecb1653fd0bbb01fa936e6"}, -] -cachetools = [ - {file = "cachetools-5.3.0-py3-none-any.whl", hash = "sha256:429e1a1e845c008ea6c85aa35d4b98b65d6a9763eeef3e37e92728a12d1de9d4"}, - {file = "cachetools-5.3.0.tar.gz", hash = "sha256:13dfddc7b8df938c21a940dfa6557ce6e94a2f1cdfa58eb90c805721d58f2c14"}, -] -certifi = [ - {file = "certifi-2022.12.7-py3-none-any.whl", hash = "sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18"}, - {file = "certifi-2022.12.7.tar.gz", hash = "sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3"}, -] -cffi = [ - {file = "cffi-1.15.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:a66d3508133af6e8548451b25058d5812812ec3798c886bf38ed24a98216fab2"}, - {file = "cffi-1.15.1-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:470c103ae716238bbe698d67ad020e1db9d9dba34fa5a899b5e21577e6d52ed2"}, - {file = "cffi-1.15.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:9ad5db27f9cabae298d151c85cf2bad1d359a1b9c686a275df03385758e2f914"}, - {file = "cffi-1.15.1-cp27-cp27m-win32.whl", hash = "sha256:b3bbeb01c2b273cca1e1e0c5df57f12dce9a4dd331b4fa1635b8bec26350bde3"}, - {file = "cffi-1.15.1-cp27-cp27m-win_amd64.whl", hash = "sha256:e00b098126fd45523dd056d2efba6c5a63b71ffe9f2bbe1a4fe1716e1d0c331e"}, - {file = "cffi-1.15.1-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:d61f4695e6c866a23a21acab0509af1cdfd2c013cf256bbf5b6b5e2695827162"}, - {file = "cffi-1.15.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:ed9cb427ba5504c1dc15ede7d516b84757c3e3d7868ccc85121d9310d27eed0b"}, - {file = "cffi-1.15.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:39d39875251ca8f612b6f33e6b1195af86d1b3e60086068be9cc053aa4376e21"}, - {file = "cffi-1.15.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:285d29981935eb726a4399badae8f0ffdff4f5050eaa6d0cfc3f64b857b77185"}, - {file = "cffi-1.15.1-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3eb6971dcff08619f8d91607cfc726518b6fa2a9eba42856be181c6d0d9515fd"}, - {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:21157295583fe8943475029ed5abdcf71eb3911894724e360acff1d61c1d54bc"}, - {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5635bd9cb9731e6d4a1132a498dd34f764034a8ce60cef4f5319c0541159392f"}, - {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2012c72d854c2d03e45d06ae57f40d78e5770d252f195b93f581acf3ba44496e"}, - {file = "cffi-1.15.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd86c085fae2efd48ac91dd7ccffcfc0571387fe1193d33b6394db7ef31fe2a4"}, - {file = "cffi-1.15.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:fa6693661a4c91757f4412306191b6dc88c1703f780c8234035eac011922bc01"}, - {file = "cffi-1.15.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:59c0b02d0a6c384d453fece7566d1c7e6b7bae4fc5874ef2ef46d56776d61c9e"}, - {file = "cffi-1.15.1-cp310-cp310-win32.whl", hash = "sha256:cba9d6b9a7d64d4bd46167096fc9d2f835e25d7e4c121fb2ddfc6528fb0413b2"}, - {file = "cffi-1.15.1-cp310-cp310-win_amd64.whl", hash = "sha256:ce4bcc037df4fc5e3d184794f27bdaab018943698f4ca31630bc7f84a7b69c6d"}, - {file = "cffi-1.15.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3d08afd128ddaa624a48cf2b859afef385b720bb4b43df214f85616922e6a5ac"}, - {file = "cffi-1.15.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:3799aecf2e17cf585d977b780ce79ff0dc9b78d799fc694221ce814c2c19db83"}, - {file = "cffi-1.15.1-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a591fe9e525846e4d154205572a029f653ada1a78b93697f3b5a8f1f2bc055b9"}, - {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3548db281cd7d2561c9ad9984681c95f7b0e38881201e157833a2342c30d5e8c"}, - {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:91fc98adde3d7881af9b59ed0294046f3806221863722ba7d8d120c575314325"}, - {file = "cffi-1.15.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:94411f22c3985acaec6f83c6df553f2dbe17b698cc7f8ae751ff2237d96b9e3c"}, - {file = "cffi-1.15.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:03425bdae262c76aad70202debd780501fabeaca237cdfddc008987c0e0f59ef"}, - {file = "cffi-1.15.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:cc4d65aeeaa04136a12677d3dd0b1c0c94dc43abac5860ab33cceb42b801c1e8"}, - {file = "cffi-1.15.1-cp311-cp311-win32.whl", hash = "sha256:a0f100c8912c114ff53e1202d0078b425bee3649ae34d7b070e9697f93c5d52d"}, - {file = "cffi-1.15.1-cp311-cp311-win_amd64.whl", hash = "sha256:04ed324bda3cda42b9b695d51bb7d54b680b9719cfab04227cdd1e04e5de3104"}, - {file = "cffi-1.15.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50a74364d85fd319352182ef59c5c790484a336f6db772c1a9231f1c3ed0cbd7"}, - {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e263d77ee3dd201c3a142934a086a4450861778baaeeb45db4591ef65550b0a6"}, - {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:cec7d9412a9102bdc577382c3929b337320c4c4c4849f2c5cdd14d7368c5562d"}, - {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4289fc34b2f5316fbb762d75362931e351941fa95fa18789191b33fc4cf9504a"}, - {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:173379135477dc8cac4bc58f45db08ab45d228b3363adb7af79436135d028405"}, - {file = "cffi-1.15.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:6975a3fac6bc83c4a65c9f9fcab9e47019a11d3d2cf7f3c0d03431bf145a941e"}, - {file = "cffi-1.15.1-cp36-cp36m-win32.whl", hash = "sha256:2470043b93ff09bf8fb1d46d1cb756ce6132c54826661a32d4e4d132e1977adf"}, - {file = "cffi-1.15.1-cp36-cp36m-win_amd64.whl", hash = "sha256:30d78fbc8ebf9c92c9b7823ee18eb92f2e6ef79b45ac84db507f52fbe3ec4497"}, - {file = "cffi-1.15.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:198caafb44239b60e252492445da556afafc7d1e3ab7a1fb3f0584ef6d742375"}, - {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5ef34d190326c3b1f822a5b7a45f6c4535e2f47ed06fec77d3d799c450b2651e"}, - {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8102eaf27e1e448db915d08afa8b41d6c7ca7a04b7d73af6514df10a3e74bd82"}, - {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5df2768244d19ab7f60546d0c7c63ce1581f7af8b5de3eb3004b9b6fc8a9f84b"}, - {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a8c4917bd7ad33e8eb21e9a5bbba979b49d9a97acb3a803092cbc1133e20343c"}, - {file = "cffi-1.15.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0e2642fe3142e4cc4af0799748233ad6da94c62a8bec3a6648bf8ee68b1c7426"}, - {file = "cffi-1.15.1-cp37-cp37m-win32.whl", hash = "sha256:e229a521186c75c8ad9490854fd8bbdd9a0c9aa3a524326b55be83b54d4e0ad9"}, - {file = "cffi-1.15.1-cp37-cp37m-win_amd64.whl", hash = "sha256:a0b71b1b8fbf2b96e41c4d990244165e2c9be83d54962a9a1d118fd8657d2045"}, - {file = "cffi-1.15.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:320dab6e7cb2eacdf0e658569d2575c4dad258c0fcc794f46215e1e39f90f2c3"}, - {file = "cffi-1.15.1-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1e74c6b51a9ed6589199c787bf5f9875612ca4a8a0785fb2d4a84429badaf22a"}, - {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a5c84c68147988265e60416b57fc83425a78058853509c1b0629c180094904a5"}, - {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3b926aa83d1edb5aa5b427b4053dc420ec295a08e40911296b9eb1b6170f6cca"}, - {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:87c450779d0914f2861b8526e035c5e6da0a3199d8f1add1a665e1cbc6fc6d02"}, - {file = "cffi-1.15.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4f2c9f67e9821cad2e5f480bc8d83b8742896f1242dba247911072d4fa94c192"}, - {file = "cffi-1.15.1-cp38-cp38-win32.whl", hash = "sha256:8b7ee99e510d7b66cdb6c593f21c043c248537a32e0bedf02e01e9553a172314"}, - {file = "cffi-1.15.1-cp38-cp38-win_amd64.whl", hash = "sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5"}, - {file = "cffi-1.15.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:54a2db7b78338edd780e7ef7f9f6c442500fb0d41a5a4ea24fff1c929d5af585"}, - {file = "cffi-1.15.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:fcd131dd944808b5bdb38e6f5b53013c5aa4f334c5cad0c72742f6eba4b73db0"}, - {file = "cffi-1.15.1-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7473e861101c9e72452f9bf8acb984947aa1661a7704553a9f6e4baa5ba64415"}, - {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6c9a799e985904922a4d207a94eae35c78ebae90e128f0c4e521ce339396be9d"}, - {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3bcde07039e586f91b45c88f8583ea7cf7a0770df3a1649627bf598332cb6984"}, - {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:33ab79603146aace82c2427da5ca6e58f2b3f2fb5da893ceac0c42218a40be35"}, - {file = "cffi-1.15.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5d598b938678ebf3c67377cdd45e09d431369c3b1a5b331058c338e201f12b27"}, - {file = "cffi-1.15.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:db0fbb9c62743ce59a9ff687eb5f4afbe77e5e8403d6697f7446e5f609976f76"}, - {file = "cffi-1.15.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:98d85c6a2bef81588d9227dde12db8a7f47f639f4a17c9ae08e773aa9c697bf3"}, - {file = "cffi-1.15.1-cp39-cp39-win32.whl", hash = "sha256:40f4774f5a9d4f5e344f31a32b5096977b5d48560c5592e2f3d2c4374bd543ee"}, - {file = "cffi-1.15.1-cp39-cp39-win_amd64.whl", hash = "sha256:70df4e3b545a17496c9b3f41f5115e69a4f2e77e94e1d2a8e1070bc0c38c8a3c"}, - {file = "cffi-1.15.1.tar.gz", hash = "sha256:d400bfb9a37b1351253cb402671cea7e89bdecc294e8016a707f6d1d8ac934f9"}, -] -cfgv = [ - {file = "cfgv-3.3.1-py2.py3-none-any.whl", hash = "sha256:c6a0883f3917a037485059700b9e75da2464e6c27051014ad85ba6aaa5884426"}, - {file = "cfgv-3.3.1.tar.gz", hash = "sha256:f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736"}, -] -chardet = [ - {file = "chardet-5.1.0-py3-none-any.whl", hash = "sha256:362777fb014af596ad31334fde1e8c327dfdb076e1960d1694662d46a6917ab9"}, - {file = "chardet-5.1.0.tar.gz", hash = "sha256:0d62712b956bc154f85fb0a266e2a3c5913c2967e00348701b32411d6def31e5"}, -] -charset-normalizer = [ - {file = "charset-normalizer-3.1.0.tar.gz", hash = "sha256:34e0a2f9c370eb95597aae63bf85eb5e96826d81e3dcf88b8886012906f509b5"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:e0ac8959c929593fee38da1c2b64ee9778733cdf03c482c9ff1d508b6b593b2b"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d7fc3fca01da18fbabe4625d64bb612b533533ed10045a2ac3dd194bfa656b60"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:04eefcee095f58eaabe6dc3cc2262f3bcd776d2c67005880894f447b3f2cb9c1"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:20064ead0717cf9a73a6d1e779b23d149b53daf971169289ed2ed43a71e8d3b0"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1435ae15108b1cb6fffbcea2af3d468683b7afed0169ad718451f8db5d1aff6f"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c84132a54c750fda57729d1e2599bb598f5fa0344085dbde5003ba429a4798c0"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:75f2568b4189dda1c567339b48cba4ac7384accb9c2a7ed655cd86b04055c795"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:11d3bcb7be35e7b1bba2c23beedac81ee893ac9871d0ba79effc7fc01167db6c"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:891cf9b48776b5c61c700b55a598621fdb7b1e301a550365571e9624f270c203"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:5f008525e02908b20e04707a4f704cd286d94718f48bb33edddc7d7b584dddc1"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:b06f0d3bf045158d2fb8837c5785fe9ff9b8c93358be64461a1089f5da983137"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:49919f8400b5e49e961f320c735388ee686a62327e773fa5b3ce6721f7e785ce"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:22908891a380d50738e1f978667536f6c6b526a2064156203d418f4856d6e86a"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-win32.whl", hash = "sha256:12d1a39aa6b8c6f6248bb54550efcc1c38ce0d8096a146638fd4738e42284448"}, - {file = "charset_normalizer-3.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:65ed923f84a6844de5fd29726b888e58c62820e0769b76565480e1fdc3d062f8"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:9a3267620866c9d17b959a84dd0bd2d45719b817245e49371ead79ed4f710d19"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6734e606355834f13445b6adc38b53c0fd45f1a56a9ba06c2058f86893ae8017"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f8303414c7b03f794347ad062c0516cee0e15f7a612abd0ce1e25caf6ceb47df"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:aaf53a6cebad0eae578f062c7d462155eada9c172bd8c4d250b8c1d8eb7f916a"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3dc5b6a8ecfdc5748a7e429782598e4f17ef378e3e272eeb1340ea57c9109f41"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e1b25e3ad6c909f398df8921780d6a3d120d8c09466720226fc621605b6f92b1"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0ca564606d2caafb0abe6d1b5311c2649e8071eb241b2d64e75a0d0065107e62"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b82fab78e0b1329e183a65260581de4375f619167478dddab510c6c6fb04d9b6"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:bd7163182133c0c7701b25e604cf1611c0d87712e56e88e7ee5d72deab3e76b5"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:11d117e6c63e8f495412d37e7dc2e2fff09c34b2d09dbe2bee3c6229577818be"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:cf6511efa4801b9b38dc5546d7547d5b5c6ef4b081c60b23e4d941d0eba9cbeb"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:abc1185d79f47c0a7aaf7e2412a0eb2c03b724581139193d2d82b3ad8cbb00ac"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:cb7b2ab0188829593b9de646545175547a70d9a6e2b63bf2cd87a0a391599324"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-win32.whl", hash = "sha256:c36bcbc0d5174a80d6cccf43a0ecaca44e81d25be4b7f90f0ed7bcfbb5a00909"}, - {file = "charset_normalizer-3.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:cca4def576f47a09a943666b8f829606bcb17e2bc2d5911a46c8f8da45f56755"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0c95f12b74681e9ae127728f7e5409cbbef9cd914d5896ef238cc779b8152373"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fca62a8301b605b954ad2e9c3666f9d97f63872aa4efcae5492baca2056b74ab"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ac0aa6cd53ab9a31d397f8303f92c42f534693528fafbdb997c82bae6e477ad9"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c3af8e0f07399d3176b179f2e2634c3ce9c1301379a6b8c9c9aeecd481da494f"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3a5fc78f9e3f501a1614a98f7c54d3969f3ad9bba8ba3d9b438c3bc5d047dd28"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:628c985afb2c7d27a4800bfb609e03985aaecb42f955049957814e0491d4006d"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:74db0052d985cf37fa111828d0dd230776ac99c740e1a758ad99094be4f1803d"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:1e8fcdd8f672a1c4fc8d0bd3a2b576b152d2a349782d1eb0f6b8e52e9954731d"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:04afa6387e2b282cf78ff3dbce20f0cc071c12dc8f685bd40960cc68644cfea6"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:dd5653e67b149503c68c4018bf07e42eeed6b4e956b24c00ccdf93ac79cdff84"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:d2686f91611f9e17f4548dbf050e75b079bbc2a82be565832bc8ea9047b61c8c"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-win32.whl", hash = "sha256:4155b51ae05ed47199dc5b2a4e62abccb274cee6b01da5b895099b61b1982974"}, - {file = "charset_normalizer-3.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:322102cdf1ab682ecc7d9b1c5eed4ec59657a65e1c146a0da342b78f4112db23"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e633940f28c1e913615fd624fcdd72fdba807bf53ea6925d6a588e84e1151531"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:3a06f32c9634a8705f4ca9946d667609f52cf130d5548881401f1eb2c39b1e2c"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7381c66e0561c5757ffe616af869b916c8b4e42b367ab29fedc98481d1e74e14"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3573d376454d956553c356df45bb824262c397c6e26ce43e8203c4c540ee0acb"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e89df2958e5159b811af9ff0f92614dabf4ff617c03a4c1c6ff53bf1c399e0e1"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:78cacd03e79d009d95635e7d6ff12c21eb89b894c354bd2b2ed0b4763373693b"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:de5695a6f1d8340b12a5d6d4484290ee74d61e467c39ff03b39e30df62cf83a0"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1c60b9c202d00052183c9be85e5eaf18a4ada0a47d188a83c8f5c5b23252f649"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:f645caaf0008bacf349875a974220f1f1da349c5dbe7c4ec93048cdc785a3326"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:ea9f9c6034ea2d93d9147818f17c2a0860d41b71c38b9ce4d55f21b6f9165a11"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:80d1543d58bd3d6c271b66abf454d437a438dff01c3e62fdbcd68f2a11310d4b"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:73dc03a6a7e30b7edc5b01b601e53e7fc924b04e1835e8e407c12c037e81adbd"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6f5c2e7bc8a4bf7c426599765b1bd33217ec84023033672c1e9a8b35eaeaaaf8"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-win32.whl", hash = "sha256:12a2b561af122e3d94cdb97fe6fb2bb2b82cef0cdca131646fdb940a1eda04f0"}, - {file = "charset_normalizer-3.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:3160a0fd9754aab7d47f95a6b63ab355388d890163eb03b2d2b87ab0a30cfa59"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:38e812a197bf8e71a59fe55b757a84c1f946d0ac114acafaafaf21667a7e169e"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6baf0baf0d5d265fa7944feb9f7451cc316bfe30e8df1a61b1bb08577c554f31"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:8f25e17ab3039b05f762b0a55ae0b3632b2e073d9c8fc88e89aca31a6198e88f"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3747443b6a904001473370d7810aa19c3a180ccd52a7157aacc264a5ac79265e"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b116502087ce8a6b7a5f1814568ccbd0e9f6cfd99948aa59b0e241dc57cf739f"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d16fd5252f883eb074ca55cb622bc0bee49b979ae4e8639fff6ca3ff44f9f854"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:21fa558996782fc226b529fdd2ed7866c2c6ec91cee82735c98a197fae39f706"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6f6c7a8a57e9405cad7485f4c9d3172ae486cfef1344b5ddd8e5239582d7355e"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:ac3775e3311661d4adace3697a52ac0bab17edd166087d493b52d4f4f553f9f0"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:10c93628d7497c81686e8e5e557aafa78f230cd9e77dd0c40032ef90c18f2230"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:6f4f4668e1831850ebcc2fd0b1cd11721947b6dc7c00bf1c6bd3c929ae14f2c7"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:0be65ccf618c1e7ac9b849c315cc2e8a8751d9cfdaa43027d4f6624bd587ab7e"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:53d0a3fa5f8af98a1e261de6a3943ca631c526635eb5817a87a59d9a57ebf48f"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-win32.whl", hash = "sha256:a04f86f41a8916fe45ac5024ec477f41f886b3c435da2d4e3d2709b22ab02af1"}, - {file = "charset_normalizer-3.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:830d2948a5ec37c386d3170c483063798d7879037492540f10a475e3fd6f244b"}, - {file = "charset_normalizer-3.1.0-py3-none-any.whl", hash = "sha256:3d9098b479e78c85080c98e1e35ff40b4a31d8953102bb0fd7d1b6f8a2111a3d"}, -] -colorama = [ - {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"}, - {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"}, -] -colorlog = [ - {file = "colorlog-6.7.0-py2.py3-none-any.whl", hash = "sha256:0d33ca236784a1ba3ff9c532d4964126d8a2c44f1f0cb1d2b0728196f512f662"}, - {file = "colorlog-6.7.0.tar.gz", hash = "sha256:bd94bd21c1e13fac7bd3153f4bc3a7dc0eb0974b8bc2fdf1a989e474f6e582e5"}, -] -comm = [ - {file = "comm-0.1.3-py3-none-any.whl", hash = "sha256:16613c6211e20223f215fc6d3b266a247b6e2641bf4e0a3ad34cb1aff2aa3f37"}, - {file = "comm-0.1.3.tar.gz", hash = "sha256:a61efa9daffcfbe66fd643ba966f846a624e4e6d6767eda9cf6e993aadaab93e"}, -] -contourpy = [ - {file = "contourpy-1.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:89f06eff3ce2f4b3eb24c1055a26981bffe4e7264acd86f15b97e40530b794bc"}, - {file = "contourpy-1.1.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:dffcc2ddec1782dd2f2ce1ef16f070861af4fb78c69862ce0aab801495dda6a3"}, - {file = "contourpy-1.1.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:25ae46595e22f93592d39a7eac3d638cda552c3e1160255258b695f7b58e5655"}, - {file = "contourpy-1.1.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:17cfaf5ec9862bc93af1ec1f302457371c34e688fbd381f4035a06cd47324f48"}, - {file = "contourpy-1.1.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:18a64814ae7bce73925131381603fff0116e2df25230dfc80d6d690aa6e20b37"}, - {file = "contourpy-1.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:90c81f22b4f572f8a2110b0b741bb64e5a6427e0a198b2cdc1fbaf85f352a3aa"}, - {file = "contourpy-1.1.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:53cc3a40635abedbec7f1bde60f8c189c49e84ac180c665f2cd7c162cc454baa"}, - {file = "contourpy-1.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:1f795597073b09d631782e7245016a4323cf1cf0b4e06eef7ea6627e06a37ff2"}, - {file = "contourpy-1.1.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:0b7b04ed0961647691cfe5d82115dd072af7ce8846d31a5fac6c142dcce8b882"}, - {file = "contourpy-1.1.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:27bc79200c742f9746d7dd51a734ee326a292d77e7d94c8af6e08d1e6c15d545"}, - {file = "contourpy-1.1.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:052cc634bf903c604ef1a00a5aa093c54f81a2612faedaa43295809ffdde885e"}, - {file = "contourpy-1.1.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9382a1c0bc46230fb881c36229bfa23d8c303b889b788b939365578d762b5c18"}, - {file = "contourpy-1.1.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e5cec36c5090e75a9ac9dbd0ff4a8cf7cecd60f1b6dc23a374c7d980a1cd710e"}, - {file = "contourpy-1.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1f0cbd657e9bde94cd0e33aa7df94fb73c1ab7799378d3b3f902eb8eb2e04a3a"}, - {file = "contourpy-1.1.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:181cbace49874f4358e2929aaf7ba84006acb76694102e88dd15af861996c16e"}, - {file = "contourpy-1.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:fb3b7d9e6243bfa1efb93ccfe64ec610d85cfe5aec2c25f97fbbd2e58b531256"}, - {file = "contourpy-1.1.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:bcb41692aa09aeb19c7c213411854402f29f6613845ad2453d30bf421fe68fed"}, - {file = "contourpy-1.1.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:5d123a5bc63cd34c27ff9c7ac1cd978909e9c71da12e05be0231c608048bb2ae"}, - {file = "contourpy-1.1.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:62013a2cf68abc80dadfd2307299bfa8f5aa0dcaec5b2954caeb5fa094171103"}, - {file = "contourpy-1.1.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0b6616375d7de55797d7a66ee7d087efe27f03d336c27cf1f32c02b8c1a5ac70"}, - {file = "contourpy-1.1.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:317267d915490d1e84577924bd61ba71bf8681a30e0d6c545f577363157e5e94"}, - {file = "contourpy-1.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d551f3a442655f3dcc1285723f9acd646ca5858834efeab4598d706206b09c9f"}, - {file = "contourpy-1.1.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:e7a117ce7df5a938fe035cad481b0189049e8d92433b4b33aa7fc609344aafa1"}, - {file = "contourpy-1.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:d4f26b25b4f86087e7d75e63212756c38546e70f2a92d2be44f80114826e1cd4"}, - {file = "contourpy-1.1.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:bc00bb4225d57bff7ebb634646c0ee2a1298402ec10a5fe7af79df9a51c1bfd9"}, - {file = "contourpy-1.1.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:189ceb1525eb0655ab8487a9a9c41f42a73ba52d6789754788d1883fb06b2d8a"}, - {file = "contourpy-1.1.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9f2931ed4741f98f74b410b16e5213f71dcccee67518970c42f64153ea9313b9"}, - {file = "contourpy-1.1.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:30f511c05fab7f12e0b1b7730ebdc2ec8deedcfb505bc27eb570ff47c51a8f15"}, - {file = "contourpy-1.1.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:143dde50520a9f90e4a2703f367cf8ec96a73042b72e68fcd184e1279962eb6f"}, - {file = "contourpy-1.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e94bef2580e25b5fdb183bf98a2faa2adc5b638736b2c0a4da98691da641316a"}, - {file = "contourpy-1.1.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:ed614aea8462735e7d70141374bd7650afd1c3f3cb0c2dbbcbe44e14331bf002"}, - {file = "contourpy-1.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:438ba416d02f82b692e371858143970ed2eb6337d9cdbbede0d8ad9f3d7dd17d"}, - {file = "contourpy-1.1.0-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:a698c6a7a432789e587168573a864a7ea374c6be8d4f31f9d87c001d5a843493"}, - {file = "contourpy-1.1.0-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:397b0ac8a12880412da3551a8cb5a187d3298a72802b45a3bd1805e204ad8439"}, - {file = "contourpy-1.1.0-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:a67259c2b493b00e5a4d0f7bfae51fb4b3371395e47d079a4446e9b0f4d70e76"}, - {file = "contourpy-1.1.0-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:2b836d22bd2c7bb2700348e4521b25e077255ebb6ab68e351ab5aa91ca27e027"}, - {file = "contourpy-1.1.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:084eaa568400cfaf7179b847ac871582199b1b44d5699198e9602ecbbb5f6104"}, - {file = "contourpy-1.1.0-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:911ff4fd53e26b019f898f32db0d4956c9d227d51338fb3b03ec72ff0084ee5f"}, - {file = "contourpy-1.1.0.tar.gz", hash = "sha256:e53046c3863828d21d531cc3b53786e6580eb1ba02477e8681009b6aa0870b21"}, -] -coverage = [ - {file = "coverage-7.2.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:c90e73bdecb7b0d1cea65a08cb41e9d672ac6d7995603d6465ed4914b98b9ad7"}, - {file = "coverage-7.2.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e2926b8abedf750c2ecf5035c07515770944acf02e1c46ab08f6348d24c5f94d"}, - {file = "coverage-7.2.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:57b77b9099f172804e695a40ebaa374f79e4fb8b92f3e167f66facbf92e8e7f5"}, - {file = "coverage-7.2.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:efe1c0adad110bf0ad7fb59f833880e489a61e39d699d37249bdf42f80590169"}, - {file = "coverage-7.2.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2199988e0bc8325d941b209f4fd1c6fa007024b1442c5576f1a32ca2e48941e6"}, - {file = "coverage-7.2.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:81f63e0fb74effd5be736cfe07d710307cc0a3ccb8f4741f7f053c057615a137"}, - {file = "coverage-7.2.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:186e0fc9cf497365036d51d4d2ab76113fb74f729bd25da0975daab2e107fd90"}, - {file = "coverage-7.2.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:420f94a35e3e00a2b43ad5740f935358e24478354ce41c99407cddd283be00d2"}, - {file = "coverage-7.2.2-cp310-cp310-win32.whl", hash = "sha256:38004671848b5745bb05d4d621526fca30cee164db42a1f185615f39dc997292"}, - {file = "coverage-7.2.2-cp310-cp310-win_amd64.whl", hash = "sha256:0ce383d5f56d0729d2dd40e53fe3afeb8f2237244b0975e1427bfb2cf0d32bab"}, - {file = "coverage-7.2.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:3eb55b7b26389dd4f8ae911ba9bc8c027411163839dea4c8b8be54c4ee9ae10b"}, - {file = "coverage-7.2.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:d2b96123a453a2d7f3995ddb9f28d01fd112319a7a4d5ca99796a7ff43f02af5"}, - {file = "coverage-7.2.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:299bc75cb2a41e6741b5e470b8c9fb78d931edbd0cd009c58e5c84de57c06731"}, - {file = "coverage-7.2.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5e1df45c23d4230e3d56d04414f9057eba501f78db60d4eeecfcb940501b08fd"}, - {file = "coverage-7.2.2-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:006ed5582e9cbc8115d2e22d6d2144a0725db542f654d9d4fda86793832f873d"}, - {file = "coverage-7.2.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:d683d230b5774816e7d784d7ed8444f2a40e7a450e5720d58af593cb0b94a212"}, - {file = "coverage-7.2.2-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:8efb48fa743d1c1a65ee8787b5b552681610f06c40a40b7ef94a5b517d885c54"}, - {file = "coverage-7.2.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:4c752d5264053a7cf2fe81c9e14f8a4fb261370a7bb344c2a011836a96fb3f57"}, - {file = "coverage-7.2.2-cp311-cp311-win32.whl", hash = "sha256:55272f33da9a5d7cccd3774aeca7a01e500a614eaea2a77091e9be000ecd401d"}, - {file = "coverage-7.2.2-cp311-cp311-win_amd64.whl", hash = "sha256:92ebc1619650409da324d001b3a36f14f63644c7f0a588e331f3b0f67491f512"}, - {file = "coverage-7.2.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:5afdad4cc4cc199fdf3e18088812edcf8f4c5a3c8e6cb69127513ad4cb7471a9"}, - {file = "coverage-7.2.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0484d9dd1e6f481b24070c87561c8d7151bdd8b044c93ac99faafd01f695c78e"}, - {file = "coverage-7.2.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d530191aa9c66ab4f190be8ac8cc7cfd8f4f3217da379606f3dd4e3d83feba69"}, - {file = "coverage-7.2.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4ac0f522c3b6109c4b764ffec71bf04ebc0523e926ca7cbe6c5ac88f84faced0"}, - {file = "coverage-7.2.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:ba279aae162b20444881fc3ed4e4f934c1cf8620f3dab3b531480cf602c76b7f"}, - {file = "coverage-7.2.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:53d0fd4c17175aded9c633e319360d41a1f3c6e352ba94edcb0fa5167e2bad67"}, - {file = "coverage-7.2.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:8c99cb7c26a3039a8a4ee3ca1efdde471e61b4837108847fb7d5be7789ed8fd9"}, - {file = "coverage-7.2.2-cp37-cp37m-win32.whl", hash = "sha256:5cc0783844c84af2522e3a99b9b761a979a3ef10fb87fc4048d1ee174e18a7d8"}, - {file = "coverage-7.2.2-cp37-cp37m-win_amd64.whl", hash = "sha256:817295f06eacdc8623dc4df7d8b49cea65925030d4e1e2a7c7218380c0072c25"}, - {file = "coverage-7.2.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:6146910231ece63facfc5984234ad1b06a36cecc9fd0c028e59ac7c9b18c38c6"}, - {file = "coverage-7.2.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:387fb46cb8e53ba7304d80aadca5dca84a2fbf6fe3faf6951d8cf2d46485d1e5"}, - {file = "coverage-7.2.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:046936ab032a2810dcaafd39cc4ef6dd295df1a7cbead08fe996d4765fca9fe4"}, - {file = "coverage-7.2.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e627dee428a176ffb13697a2c4318d3f60b2ccdde3acdc9b3f304206ec130ccd"}, - {file = "coverage-7.2.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4fa54fb483decc45f94011898727802309a109d89446a3c76387d016057d2c84"}, - {file = "coverage-7.2.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:3668291b50b69a0c1ef9f462c7df2c235da3c4073f49543b01e7eb1dee7dd540"}, - {file = "coverage-7.2.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:7c20b731211261dc9739bbe080c579a1835b0c2d9b274e5fcd903c3a7821cf88"}, - {file = "coverage-7.2.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:5764e1f7471cb8f64b8cda0554f3d4c4085ae4b417bfeab236799863703e5de2"}, - {file = "coverage-7.2.2-cp38-cp38-win32.whl", hash = "sha256:4f01911c010122f49a3e9bdc730eccc66f9b72bd410a3a9d3cb8448bb50d65d3"}, - {file = "coverage-7.2.2-cp38-cp38-win_amd64.whl", hash = "sha256:c448b5c9e3df5448a362208b8d4b9ed85305528313fca1b479f14f9fe0d873b8"}, - {file = "coverage-7.2.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:bfe7085783cda55e53510482fa7b5efc761fad1abe4d653b32710eb548ebdd2d"}, - {file = "coverage-7.2.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:9d22e94e6dc86de981b1b684b342bec5e331401599ce652900ec59db52940005"}, - {file = "coverage-7.2.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:507e4720791977934bba016101579b8c500fb21c5fa3cd4cf256477331ddd988"}, - {file = "coverage-7.2.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:bc4803779f0e4b06a2361f666e76f5c2e3715e8e379889d02251ec911befd149"}, - {file = "coverage-7.2.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:db8c2c5ace167fd25ab5dd732714c51d4633f58bac21fb0ff63b0349f62755a8"}, - {file = "coverage-7.2.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:4f68ee32d7c4164f1e2c8797535a6d0a3733355f5861e0f667e37df2d4b07140"}, - {file = "coverage-7.2.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:d52f0a114b6a58305b11a5cdecd42b2e7f1ec77eb20e2b33969d702feafdd016"}, - {file = "coverage-7.2.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:797aad79e7b6182cb49c08cc5d2f7aa7b2128133b0926060d0a8889ac43843be"}, - {file = "coverage-7.2.2-cp39-cp39-win32.whl", hash = "sha256:db45eec1dfccdadb179b0f9ca616872c6f700d23945ecc8f21bb105d74b1c5fc"}, - {file = "coverage-7.2.2-cp39-cp39-win_amd64.whl", hash = "sha256:8dbe2647bf58d2c5a6c5bcc685f23b5f371909a5624e9f5cd51436d6a9f6c6ef"}, - {file = "coverage-7.2.2-pp37.pp38.pp39-none-any.whl", hash = "sha256:872d6ce1f5be73f05bea4df498c140b9e7ee5418bfa2cc8204e7f9b817caa968"}, - {file = "coverage-7.2.2.tar.gz", hash = "sha256:36dd42da34fe94ed98c39887b86db9d06777b1c8f860520e21126a75507024f2"}, -] -coverage-badge = [ - {file = "coverage-badge-1.1.0.tar.gz", hash = "sha256:c824a106503e981c02821e7d32f008fb3984b2338aa8c3800ec9357e33345b78"}, - {file = "coverage_badge-1.1.0-py2.py3-none-any.whl", hash = "sha256:e365d56e5202e923d1b237f82defd628a02d1d645a147f867ac85c58c81d7997"}, -] -cycler = [ - {file = "cycler-0.11.0-py3-none-any.whl", hash = "sha256:3a27e95f763a428a739d2add979fa7494c912a32c17c4c38c4d5f082cad165a3"}, - {file = "cycler-0.11.0.tar.gz", hash = "sha256:9c87405839a19696e837b3b818fed3f5f69f16f1eec1a1ad77e043dcea9c772f"}, -] -debugpy = [ - {file = "debugpy-1.6.7-cp310-cp310-macosx_11_0_x86_64.whl", hash = "sha256:b3e7ac809b991006ad7f857f016fa92014445085711ef111fdc3f74f66144096"}, - {file = "debugpy-1.6.7-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e3876611d114a18aafef6383695dfc3f1217c98a9168c1aaf1a02b01ec7d8d1e"}, - {file = "debugpy-1.6.7-cp310-cp310-win32.whl", hash = "sha256:33edb4afa85c098c24cc361d72ba7c21bb92f501104514d4ffec1fb36e09c01a"}, - {file = "debugpy-1.6.7-cp310-cp310-win_amd64.whl", hash = "sha256:ed6d5413474e209ba50b1a75b2d9eecf64d41e6e4501977991cdc755dc83ab0f"}, - {file = "debugpy-1.6.7-cp37-cp37m-macosx_10_15_x86_64.whl", hash = "sha256:38ed626353e7c63f4b11efad659be04c23de2b0d15efff77b60e4740ea685d07"}, - {file = "debugpy-1.6.7-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:279d64c408c60431c8ee832dfd9ace7c396984fd7341fa3116aee414e7dcd88d"}, - {file = "debugpy-1.6.7-cp37-cp37m-win32.whl", hash = "sha256:dbe04e7568aa69361a5b4c47b4493d5680bfa3a911d1e105fbea1b1f23f3eb45"}, - {file = "debugpy-1.6.7-cp37-cp37m-win_amd64.whl", hash = "sha256:f90a2d4ad9a035cee7331c06a4cf2245e38bd7c89554fe3b616d90ab8aab89cc"}, - {file = "debugpy-1.6.7-cp38-cp38-macosx_10_15_x86_64.whl", hash = "sha256:5224eabbbeddcf1943d4e2821876f3e5d7d383f27390b82da5d9558fd4eb30a9"}, - {file = "debugpy-1.6.7-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bae1123dff5bfe548ba1683eb972329ba6d646c3a80e6b4c06cd1b1dd0205e9b"}, - {file = "debugpy-1.6.7-cp38-cp38-win32.whl", hash = "sha256:9cd10cf338e0907fdcf9eac9087faa30f150ef5445af5a545d307055141dd7a4"}, - {file = "debugpy-1.6.7-cp38-cp38-win_amd64.whl", hash = "sha256:aaf6da50377ff4056c8ed470da24632b42e4087bc826845daad7af211e00faad"}, - {file = "debugpy-1.6.7-cp39-cp39-macosx_11_0_x86_64.whl", hash = "sha256:0679b7e1e3523bd7d7869447ec67b59728675aadfc038550a63a362b63029d2c"}, - {file = "debugpy-1.6.7-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:de86029696e1b3b4d0d49076b9eba606c226e33ae312a57a46dca14ff370894d"}, - {file = "debugpy-1.6.7-cp39-cp39-win32.whl", hash = "sha256:d71b31117779d9a90b745720c0eab54ae1da76d5b38c8026c654f4a066b0130a"}, - {file = "debugpy-1.6.7-cp39-cp39-win_amd64.whl", hash = "sha256:c0ff93ae90a03b06d85b2c529eca51ab15457868a377c4cc40a23ab0e4e552a3"}, - {file = "debugpy-1.6.7-py2.py3-none-any.whl", hash = "sha256:53f7a456bc50706a0eaabecf2d3ce44c4d5010e46dfc65b6b81a518b42866267"}, - {file = "debugpy-1.6.7.zip", hash = "sha256:c4c2f0810fa25323abfdfa36cbbbb24e5c3b1a42cb762782de64439c575d67f2"}, -] -decorator = [ - {file = "decorator-5.1.1-py3-none-any.whl", hash = "sha256:b8c3f85900b9dc423225913c5aace94729fe1fa9763b38939a95226f02d37186"}, - {file = "decorator-5.1.1.tar.gz", hash = "sha256:637996211036b6385ef91435e4fae22989472f9d571faba8927ba8253acbc330"}, -] -defusedxml = [ - {file = "defusedxml-0.7.1-py2.py3-none-any.whl", hash = "sha256:a352e7e428770286cc899e2542b6cdaedb2b4953ff269a210103ec58f6198a61"}, - {file = "defusedxml-0.7.1.tar.gz", hash = "sha256:1bb3032db185915b62d7c6209c5a8792be6a32ab2fedacc84e01b52c51aa3e69"}, -] -distlib = [ - {file = "distlib-0.3.6-py2.py3-none-any.whl", hash = "sha256:f35c4b692542ca110de7ef0bea44d73981caeb34ca0b9b6b2e6d7790dda8f80e"}, - {file = "distlib-0.3.6.tar.gz", hash = "sha256:14bad2d9b04d3a36127ac97f30b12a19268f211063d8f8ee4f47108896e11b46"}, -] -docutils = [ - {file = "docutils-0.18.1-py2.py3-none-any.whl", hash = "sha256:23010f129180089fbcd3bc08cfefccb3b890b0050e1ca00c867036e9d161b98c"}, - {file = "docutils-0.18.1.tar.gz", hash = "sha256:679987caf361a7539d76e584cbeddc311e3aee937877c87346f31debc63e9d06"}, -] -exceptiongroup = [ - {file = "exceptiongroup-1.1.1-py3-none-any.whl", hash = "sha256:232c37c63e4f682982c8b6459f33a8981039e5fb8756b2074364e5055c498c9e"}, - {file = "exceptiongroup-1.1.1.tar.gz", hash = "sha256:d484c3090ba2889ae2928419117447a14daf3c1231d5e30d0aae34f354f01785"}, -] -executing = [ - {file = "executing-1.2.0-py2.py3-none-any.whl", hash = "sha256:0314a69e37426e3608aada02473b4161d4caf5a4b244d1d0c48072b8fee7bacc"}, - {file = "executing-1.2.0.tar.gz", hash = "sha256:19da64c18d2d851112f09c287f8d3dbbdf725ab0e569077efb6cdcbd3497c107"}, -] -fastjsonschema = [ - {file = "fastjsonschema-2.18.0-py3-none-any.whl", hash = "sha256:128039912a11a807068a7c87d0da36660afbfd7202780db26c4aa7153cfdc799"}, - {file = "fastjsonschema-2.18.0.tar.gz", hash = "sha256:e820349dd16f806e4bd1467a138dced9def4bc7d6213a34295272a6cac95b5bd"}, -] -filelock = [ - {file = "filelock-3.10.7-py3-none-any.whl", hash = "sha256:bde48477b15fde2c7e5a0713cbe72721cb5a5ad32ee0b8f419907960b9d75536"}, - {file = "filelock-3.10.7.tar.gz", hash = "sha256:892be14aa8efc01673b5ed6589dbccb95f9a8596f0507e232626155495c18105"}, -] -fonttools = [ - {file = "fonttools-4.40.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:b802dcbf9bcff74672f292b2466f6589ab8736ce4dcf36f48eb994c2847c4b30"}, - {file = "fonttools-4.40.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:7f6e3fa3da923063c286320e728ba2270e49c73386e3a711aa680f4b0747d692"}, - {file = "fonttools-4.40.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5fdf60f8a5c6bcce7d024a33f7e4bc7921f5b74e8ea13bccd204f2c8b86f3470"}, - {file = "fonttools-4.40.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:91784e21a1a085fac07c6a407564f4a77feb471b5954c9ee55a4f9165151f6c1"}, - {file = "fonttools-4.40.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:05171f3c546f64d78569f10adc0de72561882352cac39ec7439af12304d8d8c0"}, - {file = "fonttools-4.40.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:7449e5e306f3a930a8944c85d0cbc8429cba13503372a1a40f23124d6fb09b58"}, - {file = "fonttools-4.40.0-cp310-cp310-win32.whl", hash = "sha256:bae8c13abbc2511e9a855d2142c0ab01178dd66b1a665798f357da0d06253e0d"}, - {file = "fonttools-4.40.0-cp310-cp310-win_amd64.whl", hash = "sha256:425b74a608427499b0e45e433c34ddc350820b6f25b7c8761963a08145157a66"}, - {file = "fonttools-4.40.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:00ab569b2a3e591e00425023ade87e8fef90380c1dde61be7691cb524ca5f743"}, - {file = "fonttools-4.40.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:18ea64ac43e94c9e0c23d7a9475f1026be0e25b10dda8f236fc956188761df97"}, - {file = "fonttools-4.40.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:022c4a16b412293e7f1ce21b8bab7a6f9d12c4ffdf171fdc67122baddb973069"}, - {file = "fonttools-4.40.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:530c5d35109f3e0cea2535742d6a3bc99c0786cf0cbd7bb2dc9212387f0d908c"}, - {file = "fonttools-4.40.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:5e00334c66f4e83535384cb5339526d01d02d77f142c23b2f97bd6a4f585497a"}, - {file = "fonttools-4.40.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:eb52c10fda31159c22c7ed85074e05f8b97da8773ea461706c273e31bcbea836"}, - {file = "fonttools-4.40.0-cp311-cp311-win32.whl", hash = "sha256:6a8d71b9a5c884c72741868e845c0e563c5d83dcaf10bb0ceeec3b4b2eb14c67"}, - {file = "fonttools-4.40.0-cp311-cp311-win_amd64.whl", hash = "sha256:15abb3d055c1b2dff9ce376b6c3db10777cb74b37b52b78f61657634fd348a0d"}, - {file = "fonttools-4.40.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:14037c31138fbd21847ad5e5441dfdde003e0a8f3feb5812a1a21fd1c255ffbd"}, - {file = "fonttools-4.40.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:94c915f6716589f78bc00fbc14c5b8de65cfd11ee335d32504f1ef234524cb24"}, - {file = "fonttools-4.40.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:37467cee0f32cada2ec08bc16c9c31f9b53ea54b2f5604bf25a1246b5f50593a"}, - {file = "fonttools-4.40.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:56d4d85f5374b45b08d2f928517d1e313ea71b4847240398decd0ab3ebbca885"}, - {file = "fonttools-4.40.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:8c4305b171b61040b1ee75d18f9baafe58bd3b798d1670078efe2c92436bfb63"}, - {file = "fonttools-4.40.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:a954b90d1473c85a22ecf305761d9fd89da93bbd31dae86e7dea436ad2cb5dc9"}, - {file = "fonttools-4.40.0-cp38-cp38-win32.whl", hash = "sha256:1bc4c5b147be8dbc5df9cc8ac5e93ee914ad030fe2a201cc8f02f499db71011d"}, - {file = "fonttools-4.40.0-cp38-cp38-win_amd64.whl", hash = "sha256:8a917828dbfdb1cbe50cf40eeae6fbf9c41aef9e535649ed8f4982b2ef65c091"}, - {file = "fonttools-4.40.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:882983279bf39afe4e945109772c2ffad2be2c90983d6559af8b75c19845a80a"}, - {file = "fonttools-4.40.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:c55f1b4109dbc3aeb496677b3e636d55ef46dc078c2a5e3f3db4e90f1c6d2907"}, - {file = "fonttools-4.40.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ec468c022d09f1817c691cf884feb1030ef6f1e93e3ea6831b0d8144c06480d1"}, - {file = "fonttools-4.40.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6d5adf4ba114f028fc3f5317a221fd8b0f4ef7a2e5524a2b1e0fd891b093791a"}, - {file = "fonttools-4.40.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:aa83b3f151bc63970f39b2b42a06097c5a22fd7ed9f7ba008e618de4503d3895"}, - {file = "fonttools-4.40.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:97d95b8301b62bdece1af943b88bcb3680fd385f88346a4a899ee145913b414a"}, - {file = "fonttools-4.40.0-cp39-cp39-win32.whl", hash = "sha256:1a003608400dd1cca3e089e8c94973c6b51a4fb1ef00ff6d7641617b9242e637"}, - {file = "fonttools-4.40.0-cp39-cp39-win_amd64.whl", hash = "sha256:7961575221e3da0841c75da53833272c520000d76f7f71274dbf43370f8a1065"}, - {file = "fonttools-4.40.0-py3-none-any.whl", hash = "sha256:200729d12461e2038700d31f0d49ad5a7b55855dec7525074979a06b46f88505"}, - {file = "fonttools-4.40.0.tar.gz", hash = "sha256:337b6e83d7ee73c40ea62407f2ce03b07c3459e213b6f332b94a69923b9e1cb9"}, -] -hypothesis = [ - {file = "hypothesis-6.70.1-py3-none-any.whl", hash = "sha256:839d26f4ed0e95b62b2fd9a4830e58fa71f7d0ec7a637e69b8cc65f5e7af6f22"}, - {file = "hypothesis-6.70.1.tar.gz", hash = "sha256:8d6c56350867d353488b8f90fc5f322e10a156cdab94fafa1ec8e149e4b24a0e"}, -] -identify = [ - {file = "identify-2.5.22-py2.py3-none-any.whl", hash = "sha256:f0faad595a4687053669c112004178149f6c326db71ee999ae4636685753ad2f"}, - {file = "identify-2.5.22.tar.gz", hash = "sha256:f7a93d6cf98e29bd07663c60728e7a4057615068d7a639d132dc883b2d54d31e"}, -] -idna = [ - {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"}, - {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"}, -] -imagesize = [ - {file = "imagesize-1.4.1-py2.py3-none-any.whl", hash = "sha256:0d8d18d08f840c19d0ee7ca1fd82490fdc3729b7ac93f49870406ddde8ef8d8b"}, - {file = "imagesize-1.4.1.tar.gz", hash = "sha256:69150444affb9cb0d5cc5a92b3676f0b2fb7cd9ae39e947a5e11a36b4497cd4a"}, -] -importlib-metadata = [ - {file = "importlib_metadata-6.1.0-py3-none-any.whl", hash = "sha256:ff80f3b5394912eb1b108fcfd444dc78b7f1f3e16b16188054bd01cb9cb86f09"}, - {file = "importlib_metadata-6.1.0.tar.gz", hash = "sha256:43ce9281e097583d758c2c708c4376371261a02c34682491a8e98352365aad20"}, -] -importlib-resources = [ - {file = "importlib_resources-5.12.0-py3-none-any.whl", hash = "sha256:7b1deeebbf351c7578e09bf2f63fa2ce8b5ffec296e0d349139d43cca061a81a"}, - {file = "importlib_resources-5.12.0.tar.gz", hash = "sha256:4be82589bf5c1d7999aedf2a45159d10cb3ca4f19b2271f8792bc8e6da7b22f6"}, -] -iniconfig = [ - {file = "iniconfig-2.0.0-py3-none-any.whl", hash = "sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374"}, - {file = "iniconfig-2.0.0.tar.gz", hash = "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3"}, -] -ipykernel = [ - {file = "ipykernel-6.23.1-py3-none-any.whl", hash = "sha256:77aeffab056c21d16f1edccdc9e5ccbf7d96eb401bd6703610a21be8b068aadc"}, - {file = "ipykernel-6.23.1.tar.gz", hash = "sha256:1aba0ae8453e15e9bc6b24e497ef6840114afcdb832ae597f32137fa19d42a6f"}, -] -ipython = [ - {file = "ipython-8.11.0-py3-none-any.whl", hash = "sha256:5b54478e459155a326bf5f42ee4f29df76258c0279c36f21d71ddb560f88b156"}, - {file = "ipython-8.11.0.tar.gz", hash = "sha256:735cede4099dbc903ee540307b9171fbfef4aa75cfcacc5a273b2cda2f02be04"}, -] -isodate = [ - {file = "isodate-0.6.1-py2.py3-none-any.whl", hash = "sha256:0751eece944162659049d35f4f549ed815792b38793f07cf73381c1c87cbed96"}, - {file = "isodate-0.6.1.tar.gz", hash = "sha256:48c5881de7e8b0a0d648cb024c8062dc84e7b840ed81e864c7614fd3c127bde9"}, -] -isort = [ - {file = "isort-5.12.0-py3-none-any.whl", hash = "sha256:f84c2818376e66cf843d497486ea8fed8700b340f308f076c6fb1229dff318b6"}, - {file = "isort-5.12.0.tar.gz", hash = "sha256:8bef7dde241278824a6d83f44a544709b065191b95b6e50894bdc722fcba0504"}, -] -jedi = [ - {file = "jedi-0.18.2-py2.py3-none-any.whl", hash = "sha256:203c1fd9d969ab8f2119ec0a3342e0b49910045abe6af0a3ae83a5764d54639e"}, - {file = "jedi-0.18.2.tar.gz", hash = "sha256:bae794c30d07f6d910d32a7048af09b5a39ed740918da923c6b780790ebac612"}, -] -jinja2 = [ - {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"}, - {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"}, -] -jsonschema = [ - {file = "jsonschema-4.18.4-py3-none-any.whl", hash = "sha256:971be834317c22daaa9132340a51c01b50910724082c2c1a2ac87eeec153a3fe"}, - {file = "jsonschema-4.18.4.tar.gz", hash = "sha256:fb3642735399fa958c0d2aad7057901554596c63349f4f6b283c493cf692a25d"}, -] -jsonschema-specifications = [ - {file = "jsonschema_specifications-2023.7.1-py3-none-any.whl", hash = "sha256:05adf340b659828a004220a9613be00fa3f223f2b82002e273dee62fd50524b1"}, - {file = "jsonschema_specifications-2023.7.1.tar.gz", hash = "sha256:c91a50404e88a1f6ba40636778e2ee08f6e24c5613fe4c53ac24578a5a7f72bb"}, -] -jupyter-client = [ - {file = "jupyter_client-8.2.0-py3-none-any.whl", hash = "sha256:b18219aa695d39e2ad570533e0d71fb7881d35a873051054a84ee2a17c4b7389"}, - {file = "jupyter_client-8.2.0.tar.gz", hash = "sha256:9fe233834edd0e6c0aa5f05ca2ab4bdea1842bfd2d8a932878212fc5301ddaf0"}, -] -jupyter-core = [ - {file = "jupyter_core-5.3.0-py3-none-any.whl", hash = "sha256:d4201af84559bc8c70cead287e1ab94aeef3c512848dde077b7684b54d67730d"}, - {file = "jupyter_core-5.3.0.tar.gz", hash = "sha256:6db75be0c83edbf1b7c9f91ec266a9a24ef945da630f3120e1a0046dc13713fc"}, -] -jupyterlab-pygments = [ - {file = "jupyterlab_pygments-0.2.2-py2.py3-none-any.whl", hash = "sha256:2405800db07c9f770863bcf8049a529c3dd4d3e28536638bd7c1c01d2748309f"}, - {file = "jupyterlab_pygments-0.2.2.tar.gz", hash = "sha256:7405d7fde60819d905a9fa8ce89e4cd830e318cdad22a0030f7a901da705585d"}, -] -kiwisolver = [ - {file = "kiwisolver-1.4.4-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:2f5e60fabb7343a836360c4f0919b8cd0d6dbf08ad2ca6b9cf90bf0c76a3c4f6"}, - {file = "kiwisolver-1.4.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:10ee06759482c78bdb864f4109886dff7b8a56529bc1609d4f1112b93fe6423c"}, - {file = "kiwisolver-1.4.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:c79ebe8f3676a4c6630fd3f777f3cfecf9289666c84e775a67d1d358578dc2e3"}, - {file = "kiwisolver-1.4.4-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:abbe9fa13da955feb8202e215c4018f4bb57469b1b78c7a4c5c7b93001699938"}, - {file = "kiwisolver-1.4.4-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:7577c1987baa3adc4b3c62c33bd1118c3ef5c8ddef36f0f2c950ae0b199e100d"}, - {file = "kiwisolver-1.4.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f8ad8285b01b0d4695102546b342b493b3ccc6781fc28c8c6a1bb63e95d22f09"}, - {file = "kiwisolver-1.4.4-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8ed58b8acf29798b036d347791141767ccf65eee7f26bde03a71c944449e53de"}, - {file = "kiwisolver-1.4.4-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a68b62a02953b9841730db7797422f983935aeefceb1679f0fc85cbfbd311c32"}, - {file = "kiwisolver-1.4.4-cp310-cp310-win32.whl", hash = "sha256:e92a513161077b53447160b9bd8f522edfbed4bd9759e4c18ab05d7ef7e49408"}, - {file = "kiwisolver-1.4.4-cp310-cp310-win_amd64.whl", hash = "sha256:3fe20f63c9ecee44560d0e7f116b3a747a5d7203376abeea292ab3152334d004"}, - {file = "kiwisolver-1.4.4-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:e0ea21f66820452a3f5d1655f8704a60d66ba1191359b96541eaf457710a5fc6"}, - {file = "kiwisolver-1.4.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:bc9db8a3efb3e403e4ecc6cd9489ea2bac94244f80c78e27c31dcc00d2790ac2"}, - {file = "kiwisolver-1.4.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:d5b61785a9ce44e5a4b880272baa7cf6c8f48a5180c3e81c59553ba0cb0821ca"}, - {file = "kiwisolver-1.4.4-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c2dbb44c3f7e6c4d3487b31037b1bdbf424d97687c1747ce4ff2895795c9bf69"}, - {file = "kiwisolver-1.4.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6295ecd49304dcf3bfbfa45d9a081c96509e95f4b9d0eb7ee4ec0530c4a96514"}, - {file = "kiwisolver-1.4.4-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4bd472dbe5e136f96a4b18f295d159d7f26fd399136f5b17b08c4e5f498cd494"}, - {file = "kiwisolver-1.4.4-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:bf7d9fce9bcc4752ca4a1b80aabd38f6d19009ea5cbda0e0856983cf6d0023f5"}, - {file = "kiwisolver-1.4.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:78d6601aed50c74e0ef02f4204da1816147a6d3fbdc8b3872d263338a9052c51"}, - {file = "kiwisolver-1.4.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:877272cf6b4b7e94c9614f9b10140e198d2186363728ed0f701c6eee1baec1da"}, - {file = "kiwisolver-1.4.4-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:db608a6757adabb32f1cfe6066e39b3706d8c3aa69bbc353a5b61edad36a5cb4"}, - {file = "kiwisolver-1.4.4-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:5853eb494c71e267912275e5586fe281444eb5e722de4e131cddf9d442615626"}, - {file = "kiwisolver-1.4.4-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:f0a1dbdb5ecbef0d34eb77e56fcb3e95bbd7e50835d9782a45df81cc46949750"}, - {file = "kiwisolver-1.4.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:283dffbf061a4ec60391d51e6155e372a1f7a4f5b15d59c8505339454f8989e4"}, - {file = "kiwisolver-1.4.4-cp311-cp311-win32.whl", hash = "sha256:d06adcfa62a4431d404c31216f0f8ac97397d799cd53800e9d3efc2fbb3cf14e"}, - {file = "kiwisolver-1.4.4-cp311-cp311-win_amd64.whl", hash = "sha256:e7da3fec7408813a7cebc9e4ec55afed2d0fd65c4754bc376bf03498d4e92686"}, - {file = "kiwisolver-1.4.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:62ac9cc684da4cf1778d07a89bf5f81b35834cb96ca523d3a7fb32509380cbf6"}, - {file = "kiwisolver-1.4.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:41dae968a94b1ef1897cb322b39360a0812661dba7c682aa45098eb8e193dbdf"}, - {file = "kiwisolver-1.4.4-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:02f79693ec433cb4b5f51694e8477ae83b3205768a6fb48ffba60549080e295b"}, - {file = "kiwisolver-1.4.4-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d0611a0a2a518464c05ddd5a3a1a0e856ccc10e67079bb17f265ad19ab3c7597"}, - {file = "kiwisolver-1.4.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:db5283d90da4174865d520e7366801a93777201e91e79bacbac6e6927cbceede"}, - {file = "kiwisolver-1.4.4-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:1041feb4cda8708ce73bb4dcb9ce1ccf49d553bf87c3954bdfa46f0c3f77252c"}, - {file = "kiwisolver-1.4.4-cp37-cp37m-win32.whl", hash = "sha256:a553dadda40fef6bfa1456dc4be49b113aa92c2a9a9e8711e955618cd69622e3"}, - {file = "kiwisolver-1.4.4-cp37-cp37m-win_amd64.whl", hash = "sha256:03baab2d6b4a54ddbb43bba1a3a2d1627e82d205c5cf8f4c924dc49284b87166"}, - {file = "kiwisolver-1.4.4-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:841293b17ad704d70c578f1f0013c890e219952169ce8a24ebc063eecf775454"}, - {file = "kiwisolver-1.4.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:f4f270de01dd3e129a72efad823da90cc4d6aafb64c410c9033aba70db9f1ff0"}, - {file = "kiwisolver-1.4.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:f9f39e2f049db33a908319cf46624a569b36983c7c78318e9726a4cb8923b26c"}, - {file = "kiwisolver-1.4.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c97528e64cb9ebeff9701e7938653a9951922f2a38bd847787d4a8e498cc83ae"}, - {file = "kiwisolver-1.4.4-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1d1573129aa0fd901076e2bfb4275a35f5b7aa60fbfb984499d661ec950320b0"}, - {file = "kiwisolver-1.4.4-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ad881edc7ccb9d65b0224f4e4d05a1e85cf62d73aab798943df6d48ab0cd79a1"}, - {file = "kiwisolver-1.4.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:b428ef021242344340460fa4c9185d0b1f66fbdbfecc6c63eff4b7c29fad429d"}, - {file = "kiwisolver-1.4.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:2e407cb4bd5a13984a6c2c0fe1845e4e41e96f183e5e5cd4d77a857d9693494c"}, - {file = "kiwisolver-1.4.4-cp38-cp38-win32.whl", hash = "sha256:75facbe9606748f43428fc91a43edb46c7ff68889b91fa31f53b58894503a191"}, - {file = "kiwisolver-1.4.4-cp38-cp38-win_amd64.whl", hash = "sha256:5bce61af018b0cb2055e0e72e7d65290d822d3feee430b7b8203d8a855e78766"}, - {file = "kiwisolver-1.4.4-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:8c808594c88a025d4e322d5bb549282c93c8e1ba71b790f539567932722d7bd8"}, - {file = "kiwisolver-1.4.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f0a71d85ecdd570ded8ac3d1c0f480842f49a40beb423bb8014539a9f32a5897"}, - {file = "kiwisolver-1.4.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:b533558eae785e33e8c148a8d9921692a9fe5aa516efbdff8606e7d87b9d5824"}, - {file = "kiwisolver-1.4.4-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:efda5fc8cc1c61e4f639b8067d118e742b812c930f708e6667a5ce0d13499e29"}, - {file = "kiwisolver-1.4.4-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:7c43e1e1206cd421cd92e6b3280d4385d41d7166b3ed577ac20444b6995a445f"}, - {file = "kiwisolver-1.4.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bc8d3bd6c72b2dd9decf16ce70e20abcb3274ba01b4e1c96031e0c4067d1e7cd"}, - {file = "kiwisolver-1.4.4-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4ea39b0ccc4f5d803e3337dd46bcce60b702be4d86fd0b3d7531ef10fd99a1ac"}, - {file = "kiwisolver-1.4.4-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:968f44fdbf6dd757d12920d63b566eeb4d5b395fd2d00d29d7ef00a00582aac9"}, - {file = "kiwisolver-1.4.4-cp39-cp39-win32.whl", hash = "sha256:da7e547706e69e45d95e116e6939488d62174e033b763ab1496b4c29b76fabea"}, - {file = "kiwisolver-1.4.4-cp39-cp39-win_amd64.whl", hash = "sha256:ba59c92039ec0a66103b1d5fe588fa546373587a7d68f5c96f743c3396afc04b"}, - {file = "kiwisolver-1.4.4-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:91672bacaa030f92fc2f43b620d7b337fd9a5af28b0d6ed3f77afc43c4a64b5a"}, - {file = "kiwisolver-1.4.4-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:787518a6789009c159453da4d6b683f468ef7a65bbde796bcea803ccf191058d"}, - {file = "kiwisolver-1.4.4-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:da152d8cdcab0e56e4f45eb08b9aea6455845ec83172092f09b0e077ece2cf7a"}, - {file = "kiwisolver-1.4.4-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:ecb1fa0db7bf4cff9dac752abb19505a233c7f16684c5826d1f11ebd9472b871"}, - {file = "kiwisolver-1.4.4-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:28bc5b299f48150b5f822ce68624e445040595a4ac3d59251703779836eceff9"}, - {file = "kiwisolver-1.4.4-pp38-pypy38_pp73-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:81e38381b782cc7e1e46c4e14cd997ee6040768101aefc8fa3c24a4cc58e98f8"}, - {file = "kiwisolver-1.4.4-pp38-pypy38_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:2a66fdfb34e05b705620dd567f5a03f239a088d5a3f321e7b6ac3239d22aa286"}, - {file = "kiwisolver-1.4.4-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:872b8ca05c40d309ed13eb2e582cab0c5a05e81e987ab9c521bf05ad1d5cf5cb"}, - {file = "kiwisolver-1.4.4-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:70e7c2e7b750585569564e2e5ca9845acfaa5da56ac46df68414f29fea97be9f"}, - {file = "kiwisolver-1.4.4-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:9f85003f5dfa867e86d53fac6f7e6f30c045673fa27b603c397753bebadc3008"}, - {file = "kiwisolver-1.4.4-pp39-pypy39_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2e307eb9bd99801f82789b44bb45e9f541961831c7311521b13a6c85afc09767"}, - {file = "kiwisolver-1.4.4-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b1792d939ec70abe76f5054d3f36ed5656021dcad1322d1cc996d4e54165cef9"}, - {file = "kiwisolver-1.4.4-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f6cb459eea32a4e2cf18ba5fcece2dbdf496384413bc1bae15583f19e567f3b2"}, - {file = "kiwisolver-1.4.4-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:36dafec3d6d6088d34e2de6b85f9d8e2324eb734162fba59d2ba9ed7a2043d5b"}, - {file = "kiwisolver-1.4.4.tar.gz", hash = "sha256:d41997519fcba4a1e46eb4a2fe31bc12f0ff957b2b81bac28db24744f333e955"}, -] -markdown-it-py = [ - {file = "markdown-it-py-2.2.0.tar.gz", hash = "sha256:7c9a5e412688bc771c67432cbfebcdd686c93ce6484913dccf06cb5a0bea35a1"}, - {file = "markdown_it_py-2.2.0-py3-none-any.whl", hash = "sha256:5a35f8d1870171d9acc47b99612dc146129b631baf04970128b568f190d0cc30"}, -] -markupsafe = [ - {file = "MarkupSafe-2.1.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:665a36ae6f8f20a4676b53224e33d456a6f5a72657d9c83c2aa00765072f31f7"}, - {file = "MarkupSafe-2.1.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:340bea174e9761308703ae988e982005aedf427de816d1afe98147668cc03036"}, - {file = "MarkupSafe-2.1.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:22152d00bf4a9c7c83960521fc558f55a1adbc0631fbb00a9471e097b19d72e1"}, - {file = "MarkupSafe-2.1.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:28057e985dace2f478e042eaa15606c7efccb700797660629da387eb289b9323"}, - {file = "MarkupSafe-2.1.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ca244fa73f50a800cf8c3ebf7fd93149ec37f5cb9596aa8873ae2c1d23498601"}, - {file = "MarkupSafe-2.1.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d9d971ec1e79906046aa3ca266de79eac42f1dbf3612a05dc9368125952bd1a1"}, - {file = "MarkupSafe-2.1.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:7e007132af78ea9df29495dbf7b5824cb71648d7133cf7848a2a5dd00d36f9ff"}, - {file = "MarkupSafe-2.1.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:7313ce6a199651c4ed9d7e4cfb4aa56fe923b1adf9af3b420ee14e6d9a73df65"}, - {file = "MarkupSafe-2.1.2-cp310-cp310-win32.whl", hash = "sha256:c4a549890a45f57f1ebf99c067a4ad0cb423a05544accaf2b065246827ed9603"}, - {file = "MarkupSafe-2.1.2-cp310-cp310-win_amd64.whl", hash = "sha256:835fb5e38fd89328e9c81067fd642b3593c33e1e17e2fdbf77f5676abb14a156"}, - {file = "MarkupSafe-2.1.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:2ec4f2d48ae59bbb9d1f9d7efb9236ab81429a764dedca114f5fdabbc3788013"}, - {file = "MarkupSafe-2.1.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:608e7073dfa9e38a85d38474c082d4281f4ce276ac0010224eaba11e929dd53a"}, - {file = "MarkupSafe-2.1.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:65608c35bfb8a76763f37036547f7adfd09270fbdbf96608be2bead319728fcd"}, - {file = "MarkupSafe-2.1.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f2bfb563d0211ce16b63c7cb9395d2c682a23187f54c3d79bfec33e6705473c6"}, - {file = "MarkupSafe-2.1.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:da25303d91526aac3672ee6d49a2f3db2d9502a4a60b55519feb1a4c7714e07d"}, - {file = "MarkupSafe-2.1.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:9cad97ab29dfc3f0249b483412c85c8ef4766d96cdf9dcf5a1e3caa3f3661cf1"}, - {file = "MarkupSafe-2.1.2-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:085fd3201e7b12809f9e6e9bc1e5c96a368c8523fad5afb02afe3c051ae4afcc"}, - {file = "MarkupSafe-2.1.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:1bea30e9bf331f3fef67e0a3877b2288593c98a21ccb2cf29b74c581a4eb3af0"}, - {file = "MarkupSafe-2.1.2-cp311-cp311-win32.whl", hash = "sha256:7df70907e00c970c60b9ef2938d894a9381f38e6b9db73c5be35e59d92e06625"}, - {file = "MarkupSafe-2.1.2-cp311-cp311-win_amd64.whl", hash = "sha256:e55e40ff0cc8cc5c07996915ad367fa47da6b3fc091fdadca7f5403239c5fec3"}, - {file = "MarkupSafe-2.1.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a6e40afa7f45939ca356f348c8e23048e02cb109ced1eb8420961b2f40fb373a"}, - {file = "MarkupSafe-2.1.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cf877ab4ed6e302ec1d04952ca358b381a882fbd9d1b07cccbfd61783561f98a"}, - {file = "MarkupSafe-2.1.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:63ba06c9941e46fa389d389644e2d8225e0e3e5ebcc4ff1ea8506dce646f8c8a"}, - {file = "MarkupSafe-2.1.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f1cd098434e83e656abf198f103a8207a8187c0fc110306691a2e94a78d0abb2"}, - {file = "MarkupSafe-2.1.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:55f44b440d491028addb3b88f72207d71eeebfb7b5dbf0643f7c023ae1fba619"}, - {file = "MarkupSafe-2.1.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:a6f2fcca746e8d5910e18782f976489939d54a91f9411c32051b4aab2bd7c513"}, - {file = "MarkupSafe-2.1.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:0b462104ba25f1ac006fdab8b6a01ebbfbce9ed37fd37fd4acd70c67c973e460"}, - {file = "MarkupSafe-2.1.2-cp37-cp37m-win32.whl", hash = "sha256:7668b52e102d0ed87cb082380a7e2e1e78737ddecdde129acadb0eccc5423859"}, - {file = "MarkupSafe-2.1.2-cp37-cp37m-win_amd64.whl", hash = "sha256:6d6607f98fcf17e534162f0709aaad3ab7a96032723d8ac8750ffe17ae5a0666"}, - {file = "MarkupSafe-2.1.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:a806db027852538d2ad7555b203300173dd1b77ba116de92da9afbc3a3be3eed"}, - {file = "MarkupSafe-2.1.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:a4abaec6ca3ad8660690236d11bfe28dfd707778e2442b45addd2f086d6ef094"}, - {file = "MarkupSafe-2.1.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f03a532d7dee1bed20bc4884194a16160a2de9ffc6354b3878ec9682bb623c54"}, - {file = "MarkupSafe-2.1.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4cf06cdc1dda95223e9d2d3c58d3b178aa5dacb35ee7e3bbac10e4e1faacb419"}, - {file = "MarkupSafe-2.1.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:22731d79ed2eb25059ae3df1dfc9cb1546691cc41f4e3130fe6bfbc3ecbbecfa"}, - {file = "MarkupSafe-2.1.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:f8ffb705ffcf5ddd0e80b65ddf7bed7ee4f5a441ea7d3419e861a12eaf41af58"}, - {file = "MarkupSafe-2.1.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:8db032bf0ce9022a8e41a22598eefc802314e81b879ae093f36ce9ddf39ab1ba"}, - {file = "MarkupSafe-2.1.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:2298c859cfc5463f1b64bd55cb3e602528db6fa0f3cfd568d3605c50678f8f03"}, - {file = "MarkupSafe-2.1.2-cp38-cp38-win32.whl", hash = "sha256:50c42830a633fa0cf9e7d27664637532791bfc31c731a87b202d2d8ac40c3ea2"}, - {file = "MarkupSafe-2.1.2-cp38-cp38-win_amd64.whl", hash = "sha256:bb06feb762bade6bf3c8b844462274db0c76acc95c52abe8dbed28ae3d44a147"}, - {file = "MarkupSafe-2.1.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:99625a92da8229df6d44335e6fcc558a5037dd0a760e11d84be2260e6f37002f"}, - {file = "MarkupSafe-2.1.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:8bca7e26c1dd751236cfb0c6c72d4ad61d986e9a41bbf76cb445f69488b2a2bd"}, - {file = "MarkupSafe-2.1.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:40627dcf047dadb22cd25ea7ecfe9cbf3bbbad0482ee5920b582f3809c97654f"}, - {file = "MarkupSafe-2.1.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:40dfd3fefbef579ee058f139733ac336312663c6706d1163b82b3003fb1925c4"}, - {file = "MarkupSafe-2.1.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:090376d812fb6ac5f171e5938e82e7f2d7adc2b629101cec0db8b267815c85e2"}, - {file = "MarkupSafe-2.1.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:2e7821bffe00aa6bd07a23913b7f4e01328c3d5cc0b40b36c0bd81d362faeb65"}, - {file = "MarkupSafe-2.1.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:c0a33bc9f02c2b17c3ea382f91b4db0e6cde90b63b296422a939886a7a80de1c"}, - {file = "MarkupSafe-2.1.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:b8526c6d437855442cdd3d87eede9c425c4445ea011ca38d937db299382e6fa3"}, - {file = "MarkupSafe-2.1.2-cp39-cp39-win32.whl", hash = "sha256:137678c63c977754abe9086a3ec011e8fd985ab90631145dfb9294ad09c102a7"}, - {file = "MarkupSafe-2.1.2-cp39-cp39-win_amd64.whl", hash = "sha256:0576fe974b40a400449768941d5d0858cc624e3249dfd1e0c33674e5c7ca7aed"}, - {file = "MarkupSafe-2.1.2.tar.gz", hash = "sha256:abcabc8c2b26036d62d4c746381a6f7cf60aafcc653198ad678306986b09450d"}, -] -matplotlib = [ - {file = "matplotlib-3.7.1-cp310-cp310-macosx_10_12_universal2.whl", hash = "sha256:95cbc13c1fc6844ab8812a525bbc237fa1470863ff3dace7352e910519e194b1"}, - {file = "matplotlib-3.7.1-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:08308bae9e91aca1ec6fd6dda66237eef9f6294ddb17f0d0b3c863169bf82353"}, - {file = "matplotlib-3.7.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:544764ba51900da4639c0f983b323d288f94f65f4024dc40ecb1542d74dc0500"}, - {file = "matplotlib-3.7.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:56d94989191de3fcc4e002f93f7f1be5da476385dde410ddafbb70686acf00ea"}, - {file = "matplotlib-3.7.1-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e99bc9e65901bb9a7ce5e7bb24af03675cbd7c70b30ac670aa263240635999a4"}, - {file = "matplotlib-3.7.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:eb7d248c34a341cd4c31a06fd34d64306624c8cd8d0def7abb08792a5abfd556"}, - {file = "matplotlib-3.7.1-cp310-cp310-win32.whl", hash = "sha256:ce463ce590f3825b52e9fe5c19a3c6a69fd7675a39d589e8b5fbe772272b3a24"}, - {file = "matplotlib-3.7.1-cp310-cp310-win_amd64.whl", hash = "sha256:3d7bc90727351fb841e4d8ae620d2d86d8ed92b50473cd2b42ce9186104ecbba"}, - {file = "matplotlib-3.7.1-cp311-cp311-macosx_10_12_universal2.whl", hash = "sha256:770a205966d641627fd5cf9d3cb4b6280a716522cd36b8b284a8eb1581310f61"}, - {file = "matplotlib-3.7.1-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:f67bfdb83a8232cb7a92b869f9355d677bce24485c460b19d01970b64b2ed476"}, - {file = "matplotlib-3.7.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:2bf092f9210e105f414a043b92af583c98f50050559616930d884387d0772aba"}, - {file = "matplotlib-3.7.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:89768d84187f31717349c6bfadc0e0d8c321e8eb34522acec8a67b1236a66332"}, - {file = "matplotlib-3.7.1-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:83111e6388dec67822e2534e13b243cc644c7494a4bb60584edbff91585a83c6"}, - {file = "matplotlib-3.7.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a867bf73a7eb808ef2afbca03bcdb785dae09595fbe550e1bab0cd023eba3de0"}, - {file = "matplotlib-3.7.1-cp311-cp311-win32.whl", hash = "sha256:fbdeeb58c0cf0595efe89c05c224e0a502d1aa6a8696e68a73c3efc6bc354304"}, - {file = "matplotlib-3.7.1-cp311-cp311-win_amd64.whl", hash = "sha256:c0bd19c72ae53e6ab979f0ac6a3fafceb02d2ecafa023c5cca47acd934d10be7"}, - {file = "matplotlib-3.7.1-cp38-cp38-macosx_10_12_universal2.whl", hash = "sha256:6eb88d87cb2c49af00d3bbc33a003f89fd9f78d318848da029383bfc08ecfbfb"}, - {file = "matplotlib-3.7.1-cp38-cp38-macosx_10_12_x86_64.whl", hash = "sha256:cf0e4f727534b7b1457898c4f4ae838af1ef87c359b76dcd5330fa31893a3ac7"}, - {file = "matplotlib-3.7.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:46a561d23b91f30bccfd25429c3c706afe7d73a5cc64ef2dfaf2b2ac47c1a5dc"}, - {file = "matplotlib-3.7.1-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:8704726d33e9aa8a6d5215044b8d00804561971163563e6e6591f9dcf64340cc"}, - {file = "matplotlib-3.7.1-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:4cf327e98ecf08fcbb82685acaf1939d3338548620ab8dfa02828706402c34de"}, - {file = "matplotlib-3.7.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:617f14ae9d53292ece33f45cba8503494ee199a75b44de7717964f70637a36aa"}, - {file = "matplotlib-3.7.1-cp38-cp38-win32.whl", hash = "sha256:7c9a4b2da6fac77bcc41b1ea95fadb314e92508bf5493ceff058e727e7ecf5b0"}, - {file = "matplotlib-3.7.1-cp38-cp38-win_amd64.whl", hash = "sha256:14645aad967684e92fc349493fa10c08a6da514b3d03a5931a1bac26e6792bd1"}, - {file = "matplotlib-3.7.1-cp39-cp39-macosx_10_12_universal2.whl", hash = "sha256:81a6b377ea444336538638d31fdb39af6be1a043ca5e343fe18d0f17e098770b"}, - {file = "matplotlib-3.7.1-cp39-cp39-macosx_10_12_x86_64.whl", hash = "sha256:28506a03bd7f3fe59cd3cd4ceb2a8d8a2b1db41afede01f66c42561b9be7b4b7"}, - {file = "matplotlib-3.7.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:8c587963b85ce41e0a8af53b9b2de8dddbf5ece4c34553f7bd9d066148dc719c"}, - {file = "matplotlib-3.7.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8bf26ade3ff0f27668989d98c8435ce9327d24cffb7f07d24ef609e33d582439"}, - {file = "matplotlib-3.7.1-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:def58098f96a05f90af7e92fd127d21a287068202aa43b2a93476170ebd99e87"}, - {file = "matplotlib-3.7.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f883a22a56a84dba3b588696a2b8a1ab0d2c3d41be53264115c71b0a942d8fdb"}, - {file = "matplotlib-3.7.1-cp39-cp39-win32.whl", hash = "sha256:4f99e1b234c30c1e9714610eb0c6d2f11809c9c78c984a613ae539ea2ad2eb4b"}, - {file = "matplotlib-3.7.1-cp39-cp39-win_amd64.whl", hash = "sha256:3ba2af245e36990facf67fde840a760128ddd71210b2ab6406e640188d69d136"}, - {file = "matplotlib-3.7.1-pp38-pypy38_pp73-macosx_10_12_x86_64.whl", hash = "sha256:3032884084f541163f295db8a6536e0abb0db464008fadca6c98aaf84ccf4717"}, - {file = "matplotlib-3.7.1-pp38-pypy38_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3a2cb34336110e0ed8bb4f650e817eed61fa064acbefeb3591f1b33e3a84fd96"}, - {file = "matplotlib-3.7.1-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b867e2f952ed592237a1828f027d332d8ee219ad722345b79a001f49df0936eb"}, - {file = "matplotlib-3.7.1-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:57bfb8c8ea253be947ccb2bc2d1bb3862c2bccc662ad1b4626e1f5e004557042"}, - {file = "matplotlib-3.7.1-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:438196cdf5dc8d39b50a45cb6e3f6274edbcf2254f85fa9b895bf85851c3a613"}, - {file = "matplotlib-3.7.1-pp39-pypy39_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:21e9cff1a58d42e74d01153360de92b326708fb205250150018a52c70f43c290"}, - {file = "matplotlib-3.7.1-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:75d4725d70b7c03e082bbb8a34639ede17f333d7247f56caceb3801cb6ff703d"}, - {file = "matplotlib-3.7.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:97cc368a7268141afb5690760921765ed34867ffb9655dd325ed207af85c7529"}, - {file = "matplotlib-3.7.1.tar.gz", hash = "sha256:7b73305f25eab4541bd7ee0b96d87e53ae9c9f1823be5659b806cd85786fe882"}, -] -matplotlib-inline = [ - {file = "matplotlib-inline-0.1.6.tar.gz", hash = "sha256:f887e5f10ba98e8d2b150ddcf4702c1e5f8b3a20005eb0f74bfdbd360ee6f304"}, - {file = "matplotlib_inline-0.1.6-py3-none-any.whl", hash = "sha256:f1f41aab5328aa5aaea9b16d083b128102f8712542f819fe7e6a420ff581b311"}, -] -mdit-py-plugins = [ - {file = "mdit-py-plugins-0.3.5.tar.gz", hash = "sha256:eee0adc7195e5827e17e02d2a258a2ba159944a0748f59c5099a4a27f78fcf6a"}, - {file = "mdit_py_plugins-0.3.5-py3-none-any.whl", hash = "sha256:ca9a0714ea59a24b2b044a1831f48d817dd0c817e84339f20e7889f392d77c4e"}, -] -mdurl = [ - {file = "mdurl-0.1.2-py3-none-any.whl", hash = "sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8"}, - {file = "mdurl-0.1.2.tar.gz", hash = "sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba"}, -] -mistune = [ - {file = "mistune-3.0.1-py3-none-any.whl", hash = "sha256:b9b3e438efbb57c62b5beb5e134dab664800bdf1284a7ee09e8b12b13eb1aac6"}, - {file = "mistune-3.0.1.tar.gz", hash = "sha256:e912116c13aa0944f9dc530db38eb88f6a77087ab128f49f84a48f4c05ea163c"}, -] -more-itertools = [ - {file = "more-itertools-9.1.0.tar.gz", hash = "sha256:cabaa341ad0389ea83c17a94566a53ae4c9d07349861ecb14dc6d0345cf9ac5d"}, - {file = "more_itertools-9.1.0-py3-none-any.whl", hash = "sha256:d2bc7f02446e86a68911e58ded76d6561eea00cddfb2a91e7019bbb586c799f3"}, -] -myst-parser = [ - {file = "myst-parser-0.18.1.tar.gz", hash = "sha256:79317f4bb2c13053dd6e64f9da1ba1da6cd9c40c8a430c447a7b146a594c246d"}, - {file = "myst_parser-0.18.1-py3-none-any.whl", hash = "sha256:61b275b85d9f58aa327f370913ae1bec26ebad372cc99f3ab85c8ec3ee8d9fb8"}, -] -nbclient = [ - {file = "nbclient-0.8.0-py3-none-any.whl", hash = "sha256:25e861299e5303a0477568557c4045eccc7a34c17fc08e7959558707b9ebe548"}, - {file = "nbclient-0.8.0.tar.gz", hash = "sha256:f9b179cd4b2d7bca965f900a2ebf0db4a12ebff2f36a711cb66861e4ae158e55"}, -] -nbconvert = [ - {file = "nbconvert-7.7.3-py3-none-any.whl", hash = "sha256:3022adadff3f86578a47fab7c2228bb3ca9c56a24345642a22f917f6168b48fc"}, - {file = "nbconvert-7.7.3.tar.gz", hash = "sha256:4a5996bf5f3cd16aa0431897ba1aa4c64842c2079f434b3dc6b8c4b252ef3355"}, -] -nbformat = [ - {file = "nbformat-5.9.2-py3-none-any.whl", hash = "sha256:1c5172d786a41b82bcfd0c23f9e6b6f072e8fb49c39250219e4acfff1efe89e9"}, - {file = "nbformat-5.9.2.tar.gz", hash = "sha256:5f98b5ba1997dff175e77e0c17d5c10a96eaed2cbd1de3533d1fc35d5e111192"}, -] -nbsphinx = [ - {file = "nbsphinx-0.9.2-py3-none-any.whl", hash = "sha256:2746680ece5ad3b0e980639d717a5041a1c1aafb416846b72dfaeecc306bc351"}, - {file = "nbsphinx-0.9.2.tar.gz", hash = "sha256:540db7f4066347f23d0650c4ae8e7d85334c69adf749e030af64c12e996ff88e"}, -] -neo4j = [ - {file = "neo4j-4.4.10.tar.gz", hash = "sha256:26db4f9c8f628e53bda62f15cf2a7bfac6e2073e962da761c7164b6b122fca44"}, -] -neo4j-utils = [ - {file = "neo4j-utils-0.0.7.tar.gz", hash = "sha256:c50e1e6cc3fd852dceadb93320718271afc6ae4efba662bde0cadd9d591ce031"}, - {file = "neo4j_utils-0.0.7-py3-none-any.whl", hash = "sha256:afb49258e60e9123c93dae99eef86fd5f8572997b5edaccaaae95b8826e02f42"}, -] -nest-asyncio = [ - {file = "nest_asyncio-1.5.6-py3-none-any.whl", hash = "sha256:b9a953fb40dceaa587d109609098db21900182b16440652454a146cffb06e8b8"}, - {file = "nest_asyncio-1.5.6.tar.gz", hash = "sha256:d267cc1ff794403f7df692964d1d2a3fa9418ffea2a3f6859a439ff482fef290"}, -] -networkx = [ - {file = "networkx-3.0-py3-none-any.whl", hash = "sha256:58058d66b1818043527244fab9d41a51fcd7dcc271748015f3c181b8a90c8e2e"}, - {file = "networkx-3.0.tar.gz", hash = "sha256:9a9992345353618ae98339c2b63d8201c381c2944f38a2ab49cb45a4c667e412"}, -] -nodeenv = [ - {file = "nodeenv-1.7.0-py2.py3-none-any.whl", hash = "sha256:27083a7b96a25f2f5e1d8cb4b6317ee8aeda3bdd121394e5ac54e498028a042e"}, - {file = "nodeenv-1.7.0.tar.gz", hash = "sha256:e0e7f7dfb85fc5394c6fe1e8fa98131a2473e04311a45afb6508f7cf1836fa2b"}, -] -numpy = [ - {file = "numpy-1.24.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:3c1104d3c036fb81ab923f507536daedc718d0ad5a8707c6061cdfd6d184e570"}, - {file = "numpy-1.24.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:202de8f38fc4a45a3eea4b63e2f376e5f2dc64ef0fa692838e31a808520efaf7"}, - {file = "numpy-1.24.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8535303847b89aa6b0f00aa1dc62867b5a32923e4d1681a35b5eef2d9591a463"}, - {file = "numpy-1.24.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2d926b52ba1367f9acb76b0df6ed21f0b16a1ad87c6720a1121674e5cf63e2b6"}, - {file = "numpy-1.24.3-cp310-cp310-win32.whl", hash = "sha256:f21c442fdd2805e91799fbe044a7b999b8571bb0ab0f7850d0cb9641a687092b"}, - {file = "numpy-1.24.3-cp310-cp310-win_amd64.whl", hash = "sha256:ab5f23af8c16022663a652d3b25dcdc272ac3f83c3af4c02eb8b824e6b3ab9d7"}, - {file = "numpy-1.24.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:9a7721ec204d3a237225db3e194c25268faf92e19338a35f3a224469cb6039a3"}, - {file = "numpy-1.24.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:d6cc757de514c00b24ae8cf5c876af2a7c3df189028d68c0cb4eaa9cd5afc2bf"}, - {file = "numpy-1.24.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:76e3f4e85fc5d4fd311f6e9b794d0c00e7002ec122be271f2019d63376f1d385"}, - {file = "numpy-1.24.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a1d3c026f57ceaad42f8231305d4653d5f05dc6332a730ae5c0bea3513de0950"}, - {file = "numpy-1.24.3-cp311-cp311-win32.whl", hash = "sha256:c91c4afd8abc3908e00a44b2672718905b8611503f7ff87390cc0ac3423fb096"}, - {file = "numpy-1.24.3-cp311-cp311-win_amd64.whl", hash = "sha256:5342cf6aad47943286afa6f1609cad9b4266a05e7f2ec408e2cf7aea7ff69d80"}, - {file = "numpy-1.24.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:7776ea65423ca6a15255ba1872d82d207bd1e09f6d0894ee4a64678dd2204078"}, - {file = "numpy-1.24.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:ae8d0be48d1b6ed82588934aaaa179875e7dc4f3d84da18d7eae6eb3f06c242c"}, - {file = "numpy-1.24.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ecde0f8adef7dfdec993fd54b0f78183051b6580f606111a6d789cd14c61ea0c"}, - {file = "numpy-1.24.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4749e053a29364d3452c034827102ee100986903263e89884922ef01a0a6fd2f"}, - {file = "numpy-1.24.3-cp38-cp38-win32.whl", hash = "sha256:d933fabd8f6a319e8530d0de4fcc2e6a61917e0b0c271fded460032db42a0fe4"}, - {file = "numpy-1.24.3-cp38-cp38-win_amd64.whl", hash = "sha256:56e48aec79ae238f6e4395886b5eaed058abb7231fb3361ddd7bfdf4eed54289"}, - {file = "numpy-1.24.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:4719d5aefb5189f50887773699eaf94e7d1e02bf36c1a9d353d9f46703758ca4"}, - {file = "numpy-1.24.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:0ec87a7084caa559c36e0a2309e4ecb1baa03b687201d0a847c8b0ed476a7187"}, - {file = "numpy-1.24.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ea8282b9bcfe2b5e7d491d0bf7f3e2da29700cec05b49e64d6246923329f2b02"}, - {file = "numpy-1.24.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:210461d87fb02a84ef243cac5e814aad2b7f4be953b32cb53327bb49fd77fbb4"}, - {file = "numpy-1.24.3-cp39-cp39-win32.whl", hash = "sha256:784c6da1a07818491b0ffd63c6bbe5a33deaa0e25a20e1b3ea20cf0e43f8046c"}, - {file = "numpy-1.24.3-cp39-cp39-win_amd64.whl", hash = "sha256:d5036197ecae68d7f491fcdb4df90082b0d4960ca6599ba2659957aafced7c17"}, - {file = "numpy-1.24.3-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:352ee00c7f8387b44d19f4cada524586f07379c0d49270f87233983bc5087ca0"}, - {file = "numpy-1.24.3-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1a7d6acc2e7524c9955e5c903160aa4ea083736fde7e91276b0e5d98e6332812"}, - {file = "numpy-1.24.3-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:35400e6a8d102fd07c71ed7dcadd9eb62ee9a6e84ec159bd48c28235bbb0f8e4"}, - {file = "numpy-1.24.3.tar.gz", hash = "sha256:ab344f1bf21f140adab8e47fdbc7c35a477dc01408791f8ba00d018dd0bc5155"}, -] -packaging = [ - {file = "packaging-23.0-py3-none-any.whl", hash = "sha256:714ac14496c3e68c99c29b00845f7a2b85f3bb6f1078fd9f72fd20f0570002b2"}, - {file = "packaging-23.0.tar.gz", hash = "sha256:b6ad297f8907de0fa2fe1ccbd26fdaf387f5f47c7275fedf8cce89f99446cf97"}, -] -pandas = [ - {file = "pandas-2.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:70a996a1d2432dadedbb638fe7d921c88b0cc4dd90374eab51bb33dc6c0c2a12"}, - {file = "pandas-2.0.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:909a72b52175590debbf1d0c9e3e6bce2f1833c80c76d80bd1aa09188be768e5"}, - {file = "pandas-2.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fe7914d8ddb2d54b900cec264c090b88d141a1eed605c9539a187dbc2547f022"}, - {file = "pandas-2.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0a514ae436b23a92366fbad8365807fc0eed15ca219690b3445dcfa33597a5cc"}, - {file = "pandas-2.0.1-cp310-cp310-win32.whl", hash = "sha256:12bd6618e3cc737c5200ecabbbb5eaba8ab645a4b0db508ceeb4004bb10b060e"}, - {file = "pandas-2.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:2b6fe5f7ce1cba0e74188c8473c9091ead9b293ef0a6794939f8cc7947057abd"}, - {file = "pandas-2.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:00959a04a1d7bbc63d75a768540fb20ecc9e65fd80744c930e23768345a362a7"}, - {file = "pandas-2.0.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:af2449e9e984dfad39276b885271ba31c5e0204ffd9f21f287a245980b0e4091"}, - {file = "pandas-2.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:910df06feaf9935d05247db6de452f6d59820e432c18a2919a92ffcd98f8f79b"}, - {file = "pandas-2.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6fa0067f2419f933101bdc6001bcea1d50812afbd367b30943417d67fbb99678"}, - {file = "pandas-2.0.1-cp311-cp311-win32.whl", hash = "sha256:7b8395d335b08bc8b050590da264f94a439b4770ff16bb51798527f1dd840388"}, - {file = "pandas-2.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:8db5a644d184a38e6ed40feeb12d410d7fcc36648443defe4707022da127fc35"}, - {file = "pandas-2.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:7bbf173d364130334e0159a9a034f573e8b44a05320995127cf676b85fd8ce86"}, - {file = "pandas-2.0.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:6c0853d487b6c868bf107a4b270a823746175b1932093b537b9b76c639fc6f7e"}, - {file = "pandas-2.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f25e23a03f7ad7211ffa30cb181c3e5f6d96a8e4cb22898af462a7333f8a74eb"}, - {file = "pandas-2.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e09a53a4fe8d6ae2149959a2d02e1ef2f4d2ceb285ac48f74b79798507e468b4"}, - {file = "pandas-2.0.1-cp38-cp38-win32.whl", hash = "sha256:a2564629b3a47b6aa303e024e3d84e850d36746f7e804347f64229f8c87416ea"}, - {file = "pandas-2.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:03e677c6bc9cfb7f93a8b617d44f6091613a5671ef2944818469be7b42114a00"}, - {file = "pandas-2.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:3d099ecaa5b9e977b55cd43cf842ec13b14afa1cfa51b7e1179d90b38c53ce6a"}, - {file = "pandas-2.0.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:a37ee35a3eb6ce523b2c064af6286c45ea1c7ff882d46e10d0945dbda7572753"}, - {file = "pandas-2.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:320b180d125c3842c5da5889183b9a43da4ebba375ab2ef938f57bf267a3c684"}, - {file = "pandas-2.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:18d22cb9043b6c6804529810f492ab09d638ddf625c5dea8529239607295cb59"}, - {file = "pandas-2.0.1-cp39-cp39-win32.whl", hash = "sha256:90d1d365d77d287063c5e339f49b27bd99ef06d10a8843cf00b1a49326d492c1"}, - {file = "pandas-2.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:99f7192d8b0e6daf8e0d0fd93baa40056684e4b4aaaef9ea78dff34168e1f2f0"}, - {file = "pandas-2.0.1.tar.gz", hash = "sha256:19b8e5270da32b41ebf12f0e7165efa7024492e9513fb46fb631c5022ae5709d"}, -] -pandocfilters = [ - {file = "pandocfilters-1.5.0-py2.py3-none-any.whl", hash = "sha256:33aae3f25fd1a026079f5d27bdd52496f0e0803b3469282162bafdcbdf6ef14f"}, - {file = "pandocfilters-1.5.0.tar.gz", hash = "sha256:0b679503337d233b4339a817bfc8c50064e2eff681314376a47cb582305a7a38"}, -] -parso = [ - {file = "parso-0.8.3-py2.py3-none-any.whl", hash = "sha256:c001d4636cd3aecdaf33cbb40aebb59b094be2a74c556778ef5576c175e19e75"}, - {file = "parso-0.8.3.tar.gz", hash = "sha256:8c07be290bb59f03588915921e29e8a50002acaf2cdc5fa0e0114f91709fafa0"}, -] -pexpect = [ - {file = "pexpect-4.8.0-py2.py3-none-any.whl", hash = "sha256:0b48a55dcb3c05f3329815901ea4fc1537514d6ba867a152b581d69ae3710937"}, - {file = "pexpect-4.8.0.tar.gz", hash = "sha256:fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c"}, -] -pickleshare = [ - {file = "pickleshare-0.7.5-py2.py3-none-any.whl", hash = "sha256:9649af414d74d4df115d5d718f82acb59c9d418196b7b4290ed47a12ce62df56"}, - {file = "pickleshare-0.7.5.tar.gz", hash = "sha256:87683d47965c1da65cdacaf31c8441d12b8044cdec9aca500cd78fc2c683afca"}, -] -pillow = [ - {file = "Pillow-9.5.0-cp310-cp310-macosx_10_10_x86_64.whl", hash = "sha256:ace6ca218308447b9077c14ea4ef381ba0b67ee78d64046b3f19cf4e1139ad16"}, - {file = "Pillow-9.5.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:d3d403753c9d5adc04d4694d35cf0391f0f3d57c8e0030aac09d7678fa8030aa"}, - {file = "Pillow-9.5.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5ba1b81ee69573fe7124881762bb4cd2e4b6ed9dd28c9c60a632902fe8db8b38"}, - {file = "Pillow-9.5.0-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fe7e1c262d3392afcf5071df9afa574544f28eac825284596ac6db56e6d11062"}, - {file = "Pillow-9.5.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8f36397bf3f7d7c6a3abdea815ecf6fd14e7fcd4418ab24bae01008d8d8ca15e"}, - {file = "Pillow-9.5.0-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:252a03f1bdddce077eff2354c3861bf437c892fb1832f75ce813ee94347aa9b5"}, - {file = "Pillow-9.5.0-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:85ec677246533e27770b0de5cf0f9d6e4ec0c212a1f89dfc941b64b21226009d"}, - {file = "Pillow-9.5.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b416f03d37d27290cb93597335a2f85ed446731200705b22bb927405320de903"}, - {file = "Pillow-9.5.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:1781a624c229cb35a2ac31cc4a77e28cafc8900733a864870c49bfeedacd106a"}, - {file = "Pillow-9.5.0-cp310-cp310-win32.whl", hash = "sha256:8507eda3cd0608a1f94f58c64817e83ec12fa93a9436938b191b80d9e4c0fc44"}, - {file = "Pillow-9.5.0-cp310-cp310-win_amd64.whl", hash = "sha256:d3c6b54e304c60c4181da1c9dadf83e4a54fd266a99c70ba646a9baa626819eb"}, - {file = "Pillow-9.5.0-cp311-cp311-macosx_10_10_x86_64.whl", hash = "sha256:7ec6f6ce99dab90b52da21cf0dc519e21095e332ff3b399a357c187b1a5eee32"}, - {file = "Pillow-9.5.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:560737e70cb9c6255d6dcba3de6578a9e2ec4b573659943a5e7e4af13f298f5c"}, - {file = "Pillow-9.5.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:96e88745a55b88a7c64fa49bceff363a1a27d9a64e04019c2281049444a571e3"}, - {file = "Pillow-9.5.0-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d9c206c29b46cfd343ea7cdfe1232443072bbb270d6a46f59c259460db76779a"}, - {file = "Pillow-9.5.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cfcc2c53c06f2ccb8976fb5c71d448bdd0a07d26d8e07e321c103416444c7ad1"}, - {file = "Pillow-9.5.0-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:a0f9bb6c80e6efcde93ffc51256d5cfb2155ff8f78292f074f60f9e70b942d99"}, - {file = "Pillow-9.5.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:8d935f924bbab8f0a9a28404422da8af4904e36d5c33fc6f677e4c4485515625"}, - {file = "Pillow-9.5.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:fed1e1cf6a42577953abbe8e6cf2fe2f566daebde7c34724ec8803c4c0cda579"}, - {file = "Pillow-9.5.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:c1170d6b195555644f0616fd6ed929dfcf6333b8675fcca044ae5ab110ded296"}, - {file = "Pillow-9.5.0-cp311-cp311-win32.whl", hash = "sha256:54f7102ad31a3de5666827526e248c3530b3a33539dbda27c6843d19d72644ec"}, - {file = "Pillow-9.5.0-cp311-cp311-win_amd64.whl", hash = "sha256:cfa4561277f677ecf651e2b22dc43e8f5368b74a25a8f7d1d4a3a243e573f2d4"}, - {file = "Pillow-9.5.0-cp311-cp311-win_arm64.whl", hash = "sha256:965e4a05ef364e7b973dd17fc765f42233415974d773e82144c9bbaaaea5d089"}, - {file = "Pillow-9.5.0-cp312-cp312-win32.whl", hash = "sha256:22baf0c3cf0c7f26e82d6e1adf118027afb325e703922c8dfc1d5d0156bb2eeb"}, - {file = "Pillow-9.5.0-cp312-cp312-win_amd64.whl", hash = "sha256:432b975c009cf649420615388561c0ce7cc31ce9b2e374db659ee4f7d57a1f8b"}, - {file = "Pillow-9.5.0-cp37-cp37m-macosx_10_10_x86_64.whl", hash = "sha256:5d4ebf8e1db4441a55c509c4baa7a0587a0210f7cd25fcfe74dbbce7a4bd1906"}, - {file = "Pillow-9.5.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:375f6e5ee9620a271acb6820b3d1e94ffa8e741c0601db4c0c4d3cb0a9c224bf"}, - {file = "Pillow-9.5.0-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:99eb6cafb6ba90e436684e08dad8be1637efb71c4f2180ee6b8f940739406e78"}, - {file = "Pillow-9.5.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2dfaaf10b6172697b9bceb9a3bd7b951819d1ca339a5ef294d1f1ac6d7f63270"}, - {file = "Pillow-9.5.0-cp37-cp37m-manylinux_2_28_aarch64.whl", hash = "sha256:763782b2e03e45e2c77d7779875f4432e25121ef002a41829d8868700d119392"}, - {file = "Pillow-9.5.0-cp37-cp37m-manylinux_2_28_x86_64.whl", hash = "sha256:35f6e77122a0c0762268216315bf239cf52b88865bba522999dc38f1c52b9b47"}, - {file = "Pillow-9.5.0-cp37-cp37m-win32.whl", hash = "sha256:aca1c196f407ec7cf04dcbb15d19a43c507a81f7ffc45b690899d6a76ac9fda7"}, - {file = "Pillow-9.5.0-cp37-cp37m-win_amd64.whl", hash = "sha256:322724c0032af6692456cd6ed554bb85f8149214d97398bb80613b04e33769f6"}, - {file = "Pillow-9.5.0-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:a0aa9417994d91301056f3d0038af1199eb7adc86e646a36b9e050b06f526597"}, - {file = "Pillow-9.5.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:f8286396b351785801a976b1e85ea88e937712ee2c3ac653710a4a57a8da5d9c"}, - {file = "Pillow-9.5.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c830a02caeb789633863b466b9de10c015bded434deb3ec87c768e53752ad22a"}, - {file = "Pillow-9.5.0-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fbd359831c1657d69bb81f0db962905ee05e5e9451913b18b831febfe0519082"}, - {file = "Pillow-9.5.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f8fc330c3370a81bbf3f88557097d1ea26cd8b019d6433aa59f71195f5ddebbf"}, - {file = "Pillow-9.5.0-cp38-cp38-manylinux_2_28_aarch64.whl", hash = "sha256:7002d0797a3e4193c7cdee3198d7c14f92c0836d6b4a3f3046a64bd1ce8df2bf"}, - {file = "Pillow-9.5.0-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:229e2c79c00e85989a34b5981a2b67aa079fd08c903f0aaead522a1d68d79e51"}, - {file = "Pillow-9.5.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:9adf58f5d64e474bed00d69bcd86ec4bcaa4123bfa70a65ce72e424bfb88ed96"}, - {file = "Pillow-9.5.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:662da1f3f89a302cc22faa9f14a262c2e3951f9dbc9617609a47521c69dd9f8f"}, - {file = "Pillow-9.5.0-cp38-cp38-win32.whl", hash = "sha256:6608ff3bf781eee0cd14d0901a2b9cc3d3834516532e3bd673a0a204dc8615fc"}, - {file = "Pillow-9.5.0-cp38-cp38-win_amd64.whl", hash = "sha256:e49eb4e95ff6fd7c0c402508894b1ef0e01b99a44320ba7d8ecbabefddcc5569"}, - {file = "Pillow-9.5.0-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:482877592e927fd263028c105b36272398e3e1be3269efda09f6ba21fd83ec66"}, - {file = "Pillow-9.5.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:3ded42b9ad70e5f1754fb7c2e2d6465a9c842e41d178f262e08b8c85ed8a1d8e"}, - {file = "Pillow-9.5.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c446d2245ba29820d405315083d55299a796695d747efceb5717a8b450324115"}, - {file = "Pillow-9.5.0-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8aca1152d93dcc27dc55395604dcfc55bed5f25ef4c98716a928bacba90d33a3"}, - {file = "Pillow-9.5.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:608488bdcbdb4ba7837461442b90ea6f3079397ddc968c31265c1e056964f1ef"}, - {file = "Pillow-9.5.0-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:60037a8db8750e474af7ffc9faa9b5859e6c6d0a50e55c45576bf28be7419705"}, - {file = "Pillow-9.5.0-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:07999f5834bdc404c442146942a2ecadd1cb6292f5229f4ed3b31e0a108746b1"}, - {file = "Pillow-9.5.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:a127ae76092974abfbfa38ca2d12cbeddcdeac0fb71f9627cc1135bedaf9d51a"}, - {file = "Pillow-9.5.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:489f8389261e5ed43ac8ff7b453162af39c3e8abd730af8363587ba64bb2e865"}, - {file = "Pillow-9.5.0-cp39-cp39-win32.whl", hash = "sha256:9b1af95c3a967bf1da94f253e56b6286b50af23392a886720f563c547e48e964"}, - {file = "Pillow-9.5.0-cp39-cp39-win_amd64.whl", hash = "sha256:77165c4a5e7d5a284f10a6efaa39a0ae8ba839da344f20b111d62cc932fa4e5d"}, - {file = "Pillow-9.5.0-pp38-pypy38_pp73-macosx_10_10_x86_64.whl", hash = "sha256:833b86a98e0ede388fa29363159c9b1a294b0905b5128baf01db683672f230f5"}, - {file = "Pillow-9.5.0-pp38-pypy38_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:aaf305d6d40bd9632198c766fb64f0c1a83ca5b667f16c1e79e1661ab5060140"}, - {file = "Pillow-9.5.0-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0852ddb76d85f127c135b6dd1f0bb88dbb9ee990d2cd9aa9e28526c93e794fba"}, - {file = "Pillow-9.5.0-pp38-pypy38_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:91ec6fe47b5eb5a9968c79ad9ed78c342b1f97a091677ba0e012701add857829"}, - {file = "Pillow-9.5.0-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:cb841572862f629b99725ebaec3287fc6d275be9b14443ea746c1dd325053cbd"}, - {file = "Pillow-9.5.0-pp39-pypy39_pp73-macosx_10_10_x86_64.whl", hash = "sha256:c380b27d041209b849ed246b111b7c166ba36d7933ec6e41175fd15ab9eb1572"}, - {file = "Pillow-9.5.0-pp39-pypy39_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7c9af5a3b406a50e313467e3565fc99929717f780164fe6fbb7704edba0cebbe"}, - {file = "Pillow-9.5.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5671583eab84af046a397d6d0ba25343c00cd50bce03787948e0fff01d4fd9b1"}, - {file = "Pillow-9.5.0-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:84a6f19ce086c1bf894644b43cd129702f781ba5751ca8572f08aa40ef0ab7b7"}, - {file = "Pillow-9.5.0-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:1e7723bd90ef94eda669a3c2c19d549874dd5badaeefabefd26053304abe5799"}, - {file = "Pillow-9.5.0.tar.gz", hash = "sha256:bf548479d336726d7a0eceb6e767e179fbde37833ae42794602631a070d630f1"}, -] -platformdirs = [ - {file = "platformdirs-3.2.0-py3-none-any.whl", hash = "sha256:ebe11c0d7a805086e99506aa331612429a72ca7cd52a1f0d277dc4adc20cb10e"}, - {file = "platformdirs-3.2.0.tar.gz", hash = "sha256:d5b638ca397f25f979350ff789db335903d7ea010ab28903f57b27e1b16c2b08"}, -] -pluggy = [ - {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"}, - {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"}, -] -pooch = [ - {file = "pooch-1.7.0-py3-none-any.whl", hash = "sha256:74258224fc33d58f53113cf955e8d51bf01386b91492927d0d1b6b341a765ad7"}, - {file = "pooch-1.7.0.tar.gz", hash = "sha256:f174a1041b6447f0eef8860f76d17f60ed2f857dc0efa387a7f08228af05d998"}, -] -pre-commit = [ - {file = "pre_commit-3.2.1-py2.py3-none-any.whl", hash = "sha256:a06a7fcce7f420047a71213c175714216498b49ebc81fe106f7716ca265f5bb6"}, - {file = "pre_commit-3.2.1.tar.gz", hash = "sha256:b5aee7d75dbba21ee161ba641b01e7ae10c5b91967ebf7b2ab0dfae12d07e1f1"}, -] -prompt-toolkit = [ - {file = "prompt_toolkit-3.0.38-py3-none-any.whl", hash = "sha256:45ea77a2f7c60418850331366c81cf6b5b9cf4c7fd34616f733c5427e6abbb1f"}, - {file = "prompt_toolkit-3.0.38.tar.gz", hash = "sha256:23ac5d50538a9a38c8bde05fecb47d0b403ecd0662857a86f886f798563d5b9b"}, -] -psutil = [ - {file = "psutil-5.9.5-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:be8929ce4313f9f8146caad4272f6abb8bf99fc6cf59344a3167ecd74f4f203f"}, - {file = "psutil-5.9.5-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:ab8ed1a1d77c95453db1ae00a3f9c50227ebd955437bcf2a574ba8adbf6a74d5"}, - {file = "psutil-5.9.5-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:4aef137f3345082a3d3232187aeb4ac4ef959ba3d7c10c33dd73763fbc063da4"}, - {file = "psutil-5.9.5-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:ea8518d152174e1249c4f2a1c89e3e6065941df2fa13a1ab45327716a23c2b48"}, - {file = "psutil-5.9.5-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:acf2aef9391710afded549ff602b5887d7a2349831ae4c26be7c807c0a39fac4"}, - {file = "psutil-5.9.5-cp27-none-win32.whl", hash = "sha256:5b9b8cb93f507e8dbaf22af6a2fd0ccbe8244bf30b1baad6b3954e935157ae3f"}, - {file = "psutil-5.9.5-cp27-none-win_amd64.whl", hash = "sha256:8c5f7c5a052d1d567db4ddd231a9d27a74e8e4a9c3f44b1032762bd7b9fdcd42"}, - {file = "psutil-5.9.5-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:3c6f686f4225553615612f6d9bc21f1c0e305f75d7d8454f9b46e901778e7217"}, - {file = "psutil-5.9.5-cp36-abi3-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7a7dd9997128a0d928ed4fb2c2d57e5102bb6089027939f3b722f3a210f9a8da"}, - {file = "psutil-5.9.5-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:89518112647f1276b03ca97b65cc7f64ca587b1eb0278383017c2a0dcc26cbe4"}, - {file = "psutil-5.9.5-cp36-abi3-win32.whl", hash = "sha256:104a5cc0e31baa2bcf67900be36acde157756b9c44017b86b2c049f11957887d"}, - {file = "psutil-5.9.5-cp36-abi3-win_amd64.whl", hash = "sha256:b258c0c1c9d145a1d5ceffab1134441c4c5113b2417fafff7315a917a026c3c9"}, - {file = "psutil-5.9.5-cp38-abi3-macosx_11_0_arm64.whl", hash = "sha256:c607bb3b57dc779d55e1554846352b4e358c10fff3abf3514a7a6601beebdb30"}, - {file = "psutil-5.9.5.tar.gz", hash = "sha256:5410638e4df39c54d957fc51ce03048acd8e6d60abc0f5107af51e5fb566eb3c"}, -] -ptyprocess = [ - {file = "ptyprocess-0.7.0-py2.py3-none-any.whl", hash = "sha256:4b41f3967fce3af57cc7e94b888626c18bf37a083e3651ca8feeb66d492fef35"}, - {file = "ptyprocess-0.7.0.tar.gz", hash = "sha256:5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220"}, -] -pure-eval = [ - {file = "pure_eval-0.2.2-py3-none-any.whl", hash = "sha256:01eaab343580944bc56080ebe0a674b39ec44a945e6d09ba7db3cb8cec289350"}, - {file = "pure_eval-0.2.2.tar.gz", hash = "sha256:2b45320af6dfaa1750f543d714b6d1c520a1688dec6fd24d339063ce0aaa9ac3"}, -] -pycparser = [ - {file = "pycparser-2.21-py2.py3-none-any.whl", hash = "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9"}, - {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"}, -] -pygments = [ - {file = "Pygments-2.14.0-py3-none-any.whl", hash = "sha256:fa7bd7bd2771287c0de303af8bfdfc731f51bd2c6a47ab69d117138893b82717"}, - {file = "Pygments-2.14.0.tar.gz", hash = "sha256:b3ed06a9e8ac9a9aae5a6f5dbe78a8a58655d17b43b93c078f094ddc476ae297"}, -] -pyparsing = [ - {file = "pyparsing-3.0.9-py3-none-any.whl", hash = "sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc"}, - {file = "pyparsing-3.0.9.tar.gz", hash = "sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb"}, -] -pyproject-api = [ - {file = "pyproject_api-1.5.1-py3-none-any.whl", hash = "sha256:4698a3777c2e0f6b624f8a4599131e2a25376d90fe8d146d7ac74c67c6f97c43"}, - {file = "pyproject_api-1.5.1.tar.gz", hash = "sha256:435f46547a9ff22cf4208ee274fca3e2869aeb062a4834adfc99a4dd64af3cf9"}, -] -pytest = [ - {file = "pytest-7.2.2-py3-none-any.whl", hash = "sha256:130328f552dcfac0b1cec75c12e3f005619dc5f874f0a06e8ff7263f0ee6225e"}, - {file = "pytest-7.2.2.tar.gz", hash = "sha256:c99ab0c73aceb050f68929bc93af19ab6db0558791c6a0715723abe9d0ade9d4"}, -] -pytest-cov = [ - {file = "pytest-cov-3.0.0.tar.gz", hash = "sha256:e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470"}, - {file = "pytest_cov-3.0.0-py3-none-any.whl", hash = "sha256:578d5d15ac4a25e5f961c938b85a05b09fdaae9deef3bb6de9a6e766622ca7a6"}, -] -python-dateutil = [ - {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"}, - {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"}, -] -pytz = [ - {file = "pytz-2023.3-py2.py3-none-any.whl", hash = "sha256:a151b3abb88eda1d4e34a9814df37de2a80e301e68ba0fd856fb9b46bfbbbffb"}, - {file = "pytz-2023.3.tar.gz", hash = "sha256:1d8ce29db189191fb55338ee6d0387d82ab59f3d00eac103412d64e0ebd0c588"}, -] -pywin32 = [ - {file = "pywin32-306-cp310-cp310-win32.whl", hash = "sha256:06d3420a5155ba65f0b72f2699b5bacf3109f36acbe8923765c22938a69dfc8d"}, - {file = "pywin32-306-cp310-cp310-win_amd64.whl", hash = "sha256:84f4471dbca1887ea3803d8848a1616429ac94a4a8d05f4bc9c5dcfd42ca99c8"}, - {file = "pywin32-306-cp311-cp311-win32.whl", hash = "sha256:e65028133d15b64d2ed8f06dd9fbc268352478d4f9289e69c190ecd6818b6407"}, - {file = "pywin32-306-cp311-cp311-win_amd64.whl", hash = "sha256:a7639f51c184c0272e93f244eb24dafca9b1855707d94c192d4a0b4c01e1100e"}, - {file = "pywin32-306-cp311-cp311-win_arm64.whl", hash = "sha256:70dba0c913d19f942a2db25217d9a1b726c278f483a919f1abfed79c9cf64d3a"}, - {file = "pywin32-306-cp312-cp312-win32.whl", hash = "sha256:383229d515657f4e3ed1343da8be101000562bf514591ff383ae940cad65458b"}, - {file = "pywin32-306-cp312-cp312-win_amd64.whl", hash = "sha256:37257794c1ad39ee9be652da0462dc2e394c8159dfd913a8a4e8eb6fd346da0e"}, - {file = "pywin32-306-cp312-cp312-win_arm64.whl", hash = "sha256:5821ec52f6d321aa59e2db7e0a35b997de60c201943557d108af9d4ae1ec7040"}, - {file = "pywin32-306-cp37-cp37m-win32.whl", hash = "sha256:1c73ea9a0d2283d889001998059f5eaaba3b6238f767c9cf2833b13e6a685f65"}, - {file = "pywin32-306-cp37-cp37m-win_amd64.whl", hash = "sha256:72c5f621542d7bdd4fdb716227be0dd3f8565c11b280be6315b06ace35487d36"}, - {file = "pywin32-306-cp38-cp38-win32.whl", hash = "sha256:e4c092e2589b5cf0d365849e73e02c391c1349958c5ac3e9d5ccb9a28e017b3a"}, - {file = "pywin32-306-cp38-cp38-win_amd64.whl", hash = "sha256:e8ac1ae3601bee6ca9f7cb4b5363bf1c0badb935ef243c4733ff9a393b1690c0"}, - {file = "pywin32-306-cp39-cp39-win32.whl", hash = "sha256:e25fd5b485b55ac9c057f67d94bc203f3f6595078d1fb3b458c9c28b7153a802"}, - {file = "pywin32-306-cp39-cp39-win_amd64.whl", hash = "sha256:39b61c15272833b5c329a2989999dcae836b1eed650252ab1b7bfbe1d59f30f4"}, -] -pyyaml = [ - {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"}, - {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"}, - {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"}, - {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b"}, - {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"}, - {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"}, - {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"}, - {file = "PyYAML-6.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d4b0ba9512519522b118090257be113b9468d804b19d63c71dbcf4a48fa32358"}, - {file = "PyYAML-6.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:81957921f441d50af23654aa6c5e5eaf9b06aba7f0a19c18a538dc7ef291c5a1"}, - {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:afa17f5bc4d1b10afd4466fd3a44dc0e245382deca5b3c353d8b757f9e3ecb8d"}, - {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dbad0e9d368bb989f4515da330b88a057617d16b6a8245084f1b05400f24609f"}, - {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:432557aa2c09802be39460360ddffd48156e30721f5e8d917f01d31694216782"}, - {file = "PyYAML-6.0-cp311-cp311-win32.whl", hash = "sha256:bfaef573a63ba8923503d27530362590ff4f576c626d86a9fed95822a8255fd7"}, - {file = "PyYAML-6.0-cp311-cp311-win_amd64.whl", hash = "sha256:01b45c0191e6d66c470b6cf1b9531a771a83c1c4208272ead47a3ae4f2f603bf"}, - {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"}, - {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"}, - {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"}, - {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4"}, - {file = "PyYAML-6.0-cp36-cp36m-win32.whl", hash = "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293"}, - {file = "PyYAML-6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57"}, - {file = "PyYAML-6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c"}, - {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0"}, - {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4"}, - {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9"}, - {file = "PyYAML-6.0-cp37-cp37m-win32.whl", hash = "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737"}, - {file = "PyYAML-6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d"}, - {file = "PyYAML-6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b"}, - {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba"}, - {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34"}, - {file = "PyYAML-6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287"}, - {file = "PyYAML-6.0-cp38-cp38-win32.whl", hash = "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78"}, - {file = "PyYAML-6.0-cp38-cp38-win_amd64.whl", hash = "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07"}, - {file = "PyYAML-6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b"}, - {file = "PyYAML-6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174"}, - {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803"}, - {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3"}, - {file = "PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0"}, - {file = "PyYAML-6.0-cp39-cp39-win32.whl", hash = "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb"}, - {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"}, - {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"}, -] -pyzmq = [ - {file = "pyzmq-25.1.0-cp310-cp310-macosx_10_15_universal2.whl", hash = "sha256:1a6169e69034eaa06823da6a93a7739ff38716142b3596c180363dee729d713d"}, - {file = "pyzmq-25.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:19d0383b1f18411d137d891cab567de9afa609b214de68b86e20173dc624c101"}, - {file = "pyzmq-25.1.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f1e931d9a92f628858a50f5bdffdfcf839aebe388b82f9d2ccd5d22a38a789dc"}, - {file = "pyzmq-25.1.0-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:97d984b1b2f574bc1bb58296d3c0b64b10e95e7026f8716ed6c0b86d4679843f"}, - {file = "pyzmq-25.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:154bddda2a351161474b36dba03bf1463377ec226a13458725183e508840df89"}, - {file = "pyzmq-25.1.0-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:cb6d161ae94fb35bb518b74bb06b7293299c15ba3bc099dccd6a5b7ae589aee3"}, - {file = "pyzmq-25.1.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:90146ab578931e0e2826ee39d0c948d0ea72734378f1898939d18bc9c823fcf9"}, - {file = "pyzmq-25.1.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:831ba20b660b39e39e5ac8603e8193f8fce1ee03a42c84ade89c36a251449d80"}, - {file = "pyzmq-25.1.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:3a522510e3434e12aff80187144c6df556bb06fe6b9d01b2ecfbd2b5bfa5c60c"}, - {file = "pyzmq-25.1.0-cp310-cp310-win32.whl", hash = "sha256:be24a5867b8e3b9dd5c241de359a9a5217698ff616ac2daa47713ba2ebe30ad1"}, - {file = "pyzmq-25.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:5693dcc4f163481cf79e98cf2d7995c60e43809e325b77a7748d8024b1b7bcba"}, - {file = "pyzmq-25.1.0-cp311-cp311-macosx_10_15_universal2.whl", hash = "sha256:13bbe36da3f8aaf2b7ec12696253c0bf6ffe05f4507985a8844a1081db6ec22d"}, - {file = "pyzmq-25.1.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:69511d604368f3dc58d4be1b0bad99b61ee92b44afe1cd9b7bd8c5e34ea8248a"}, - {file = "pyzmq-25.1.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4a983c8694667fd76d793ada77fd36c8317e76aa66eec75be2653cef2ea72883"}, - {file = "pyzmq-25.1.0-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:332616f95eb400492103ab9d542b69d5f0ff628b23129a4bc0a2fd48da6e4e0b"}, - {file = "pyzmq-25.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:58416db767787aedbfd57116714aad6c9ce57215ffa1c3758a52403f7c68cff5"}, - {file = "pyzmq-25.1.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:cad9545f5801a125f162d09ec9b724b7ad9b6440151b89645241d0120e119dcc"}, - {file = "pyzmq-25.1.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:d6128d431b8dfa888bf51c22a04d48bcb3d64431caf02b3cb943269f17fd2994"}, - {file = "pyzmq-25.1.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:2b15247c49d8cbea695b321ae5478d47cffd496a2ec5ef47131a9e79ddd7e46c"}, - {file = "pyzmq-25.1.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:442d3efc77ca4d35bee3547a8e08e8d4bb88dadb54a8377014938ba98d2e074a"}, - {file = "pyzmq-25.1.0-cp311-cp311-win32.whl", hash = "sha256:65346f507a815a731092421d0d7d60ed551a80d9b75e8b684307d435a5597425"}, - {file = "pyzmq-25.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:8b45d722046fea5a5694cba5d86f21f78f0052b40a4bbbbf60128ac55bfcc7b6"}, - {file = "pyzmq-25.1.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f45808eda8b1d71308c5416ef3abe958f033fdbb356984fabbfc7887bed76b3f"}, - {file = "pyzmq-25.1.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8b697774ea8273e3c0460cf0bba16cd85ca6c46dfe8b303211816d68c492e132"}, - {file = "pyzmq-25.1.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:b324fa769577fc2c8f5efcd429cef5acbc17d63fe15ed16d6dcbac2c5eb00849"}, - {file = "pyzmq-25.1.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:5873d6a60b778848ce23b6c0ac26c39e48969823882f607516b91fb323ce80e5"}, - {file = "pyzmq-25.1.0-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:f0d9e7ba6a815a12c8575ba7887da4b72483e4cfc57179af10c9b937f3f9308f"}, - {file = "pyzmq-25.1.0-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:414b8beec76521358b49170db7b9967d6974bdfc3297f47f7d23edec37329b00"}, - {file = "pyzmq-25.1.0-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:01f06f33e12497dca86353c354461f75275a5ad9eaea181ac0dc1662da8074fa"}, - {file = "pyzmq-25.1.0-cp36-cp36m-win32.whl", hash = "sha256:b5a07c4f29bf7cb0164664ef87e4aa25435dcc1f818d29842118b0ac1eb8e2b5"}, - {file = "pyzmq-25.1.0-cp36-cp36m-win_amd64.whl", hash = "sha256:968b0c737797c1809ec602e082cb63e9824ff2329275336bb88bd71591e94a90"}, - {file = "pyzmq-25.1.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:47b915ba666c51391836d7ed9a745926b22c434efa76c119f77bcffa64d2c50c"}, - {file = "pyzmq-25.1.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5af31493663cf76dd36b00dafbc839e83bbca8a0662931e11816d75f36155897"}, - {file = "pyzmq-25.1.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:5489738a692bc7ee9a0a7765979c8a572520d616d12d949eaffc6e061b82b4d1"}, - {file = "pyzmq-25.1.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:1fc56a0221bdf67cfa94ef2d6ce5513a3d209c3dfd21fed4d4e87eca1822e3a3"}, - {file = "pyzmq-25.1.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:75217e83faea9edbc29516fc90c817bc40c6b21a5771ecb53e868e45594826b0"}, - {file = "pyzmq-25.1.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:3830be8826639d801de9053cf86350ed6742c4321ba4236e4b5568528d7bfed7"}, - {file = "pyzmq-25.1.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:3575699d7fd7c9b2108bc1c6128641a9a825a58577775ada26c02eb29e09c517"}, - {file = "pyzmq-25.1.0-cp37-cp37m-win32.whl", hash = "sha256:95bd3a998d8c68b76679f6b18f520904af5204f089beebb7b0301d97704634dd"}, - {file = "pyzmq-25.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:dbc466744a2db4b7ca05589f21ae1a35066afada2f803f92369f5877c100ef62"}, - {file = "pyzmq-25.1.0-cp38-cp38-macosx_10_15_universal2.whl", hash = "sha256:3bed53f7218490c68f0e82a29c92335daa9606216e51c64f37b48eb78f1281f4"}, - {file = "pyzmq-25.1.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:eb52e826d16c09ef87132c6e360e1879c984f19a4f62d8a935345deac43f3c12"}, - {file = "pyzmq-25.1.0-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:ddbef8b53cd16467fdbfa92a712eae46dd066aa19780681a2ce266e88fbc7165"}, - {file = "pyzmq-25.1.0-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:9301cf1d7fc1ddf668d0abbe3e227fc9ab15bc036a31c247276012abb921b5ff"}, - {file = "pyzmq-25.1.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7e23a8c3b6c06de40bdb9e06288180d630b562db8ac199e8cc535af81f90e64b"}, - {file = "pyzmq-25.1.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:4a82faae00d1eed4809c2f18b37f15ce39a10a1c58fe48b60ad02875d6e13d80"}, - {file = "pyzmq-25.1.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:c8398a1b1951aaa330269c35335ae69744be166e67e0ebd9869bdc09426f3871"}, - {file = "pyzmq-25.1.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:d40682ac60b2a613d36d8d3a0cd14fbdf8e7e0618fbb40aa9fa7b796c9081584"}, - {file = "pyzmq-25.1.0-cp38-cp38-win32.whl", hash = "sha256:33d5c8391a34d56224bccf74f458d82fc6e24b3213fc68165c98b708c7a69325"}, - {file = "pyzmq-25.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:c66b7ff2527e18554030319b1376d81560ca0742c6e0b17ff1ee96624a5f1afd"}, - {file = "pyzmq-25.1.0-cp39-cp39-macosx_10_15_universal2.whl", hash = "sha256:af56229ea6527a849ac9fb154a059d7e32e77a8cba27e3e62a1e38d8808cb1a5"}, - {file = "pyzmq-25.1.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:bdca18b94c404af6ae5533cd1bc310c4931f7ac97c148bbfd2cd4bdd62b96253"}, - {file = "pyzmq-25.1.0-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0b6b42f7055bbc562f63f3df3b63e3dd1ebe9727ff0f124c3aa7bcea7b3a00f9"}, - {file = "pyzmq-25.1.0-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:4c2fc7aad520a97d64ffc98190fce6b64152bde57a10c704b337082679e74f67"}, - {file = "pyzmq-25.1.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:be86a26415a8b6af02cd8d782e3a9ae3872140a057f1cadf0133de685185c02b"}, - {file = "pyzmq-25.1.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:851fb2fe14036cfc1960d806628b80276af5424db09fe5c91c726890c8e6d943"}, - {file = "pyzmq-25.1.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:2a21fec5c3cea45421a19ccbe6250c82f97af4175bc09de4d6dd78fb0cb4c200"}, - {file = "pyzmq-25.1.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:bad172aba822444b32eae54c2d5ab18cd7dee9814fd5c7ed026603b8cae2d05f"}, - {file = "pyzmq-25.1.0-cp39-cp39-win32.whl", hash = "sha256:4d67609b37204acad3d566bb7391e0ecc25ef8bae22ff72ebe2ad7ffb7847158"}, - {file = "pyzmq-25.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:71c7b5896e40720d30cd77a81e62b433b981005bbff0cb2f739e0f8d059b5d99"}, - {file = "pyzmq-25.1.0-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:4cb27ef9d3bdc0c195b2dc54fcb8720e18b741624686a81942e14c8b67cc61a6"}, - {file = "pyzmq-25.1.0-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0c4fc2741e0513b5d5a12fe200d6785bbcc621f6f2278893a9ca7bed7f2efb7d"}, - {file = "pyzmq-25.1.0-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:fc34fdd458ff77a2a00e3c86f899911f6f269d393ca5675842a6e92eea565bae"}, - {file = "pyzmq-25.1.0-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8751f9c1442624da391bbd92bd4b072def6d7702a9390e4479f45c182392ff78"}, - {file = "pyzmq-25.1.0-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:6581e886aec3135964a302a0f5eb68f964869b9efd1dbafdebceaaf2934f8a68"}, - {file = "pyzmq-25.1.0-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:5482f08d2c3c42b920e8771ae8932fbaa0a67dff925fc476996ddd8155a170f3"}, - {file = "pyzmq-25.1.0-pp38-pypy38_pp73-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:5e7fbcafa3ea16d1de1f213c226005fea21ee16ed56134b75b2dede5a2129e62"}, - {file = "pyzmq-25.1.0-pp38-pypy38_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:adecf6d02b1beab8d7c04bc36f22bb0e4c65a35eb0b4750b91693631d4081c70"}, - {file = "pyzmq-25.1.0-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f6d39e42a0aa888122d1beb8ec0d4ddfb6c6b45aecb5ba4013c27e2f28657765"}, - {file = "pyzmq-25.1.0-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:7018289b402ebf2b2c06992813523de61d4ce17bd514c4339d8f27a6f6809492"}, - {file = "pyzmq-25.1.0-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:9e68ae9864d260b18f311b68d29134d8776d82e7f5d75ce898b40a88df9db30f"}, - {file = "pyzmq-25.1.0-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e21cc00e4debe8f54c3ed7b9fcca540f46eee12762a9fa56feb8512fd9057161"}, - {file = "pyzmq-25.1.0-pp39-pypy39_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2f666ae327a6899ff560d741681fdcdf4506f990595201ed39b44278c471ad98"}, - {file = "pyzmq-25.1.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2f5efcc29056dfe95e9c9db0dfbb12b62db9c4ad302f812931b6d21dd04a9119"}, - {file = "pyzmq-25.1.0-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:48e5e59e77c1a83162ab3c163fc01cd2eebc5b34560341a67421b09be0891287"}, - {file = "pyzmq-25.1.0-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:108c96ebbd573d929740d66e4c3d1bdf31d5cde003b8dc7811a3c8c5b0fc173b"}, - {file = "pyzmq-25.1.0.tar.gz", hash = "sha256:80c41023465d36280e801564a69cbfce8ae85ff79b080e1913f6e90481fb8957"}, -] -rdflib = [ - {file = "rdflib-6.3.2-py3-none-any.whl", hash = "sha256:36b4e74a32aa1e4fa7b8719876fb192f19ecd45ff932ea5ebbd2e417a0247e63"}, - {file = "rdflib-6.3.2.tar.gz", hash = "sha256:72af591ff704f4caacea7ecc0c5a9056b8553e0489dd4f35a9bc52dbd41522e0"}, -] -referencing = [ - {file = "referencing-0.30.0-py3-none-any.whl", hash = "sha256:c257b08a399b6c2f5a3510a50d28ab5dbc7bbde049bcaf954d43c446f83ab548"}, - {file = "referencing-0.30.0.tar.gz", hash = "sha256:47237742e990457f7512c7d27486394a9aadaf876cbfaa4be65b27b4f4d47c6b"}, -] -requests = [ - {file = "requests-2.28.2-py3-none-any.whl", hash = "sha256:64299f4909223da747622c030b781c0d7811e359c37124b4bd368fb8c6518baa"}, - {file = "requests-2.28.2.tar.gz", hash = "sha256:98b1b2782e3c6c4904938b84c0eb932721069dfdb9134313beff7c83c2df24bf"}, -] -rpds-py = [ - {file = "rpds_py-0.9.2-cp310-cp310-macosx_10_7_x86_64.whl", hash = "sha256:ab6919a09c055c9b092798ce18c6c4adf49d24d4d9e43a92b257e3f2548231e7"}, - {file = "rpds_py-0.9.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:d55777a80f78dd09410bd84ff8c95ee05519f41113b2df90a69622f5540c4f8b"}, - {file = "rpds_py-0.9.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a216b26e5af0a8e265d4efd65d3bcec5fba6b26909014effe20cd302fd1138fa"}, - {file = "rpds_py-0.9.2-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:29cd8bfb2d716366a035913ced99188a79b623a3512292963d84d3e06e63b496"}, - {file = "rpds_py-0.9.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:44659b1f326214950a8204a248ca6199535e73a694be8d3e0e869f820767f12f"}, - {file = "rpds_py-0.9.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:745f5a43fdd7d6d25a53ab1a99979e7f8ea419dfefebcab0a5a1e9095490ee5e"}, - {file = "rpds_py-0.9.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a987578ac5214f18b99d1f2a3851cba5b09f4a689818a106c23dbad0dfeb760f"}, - {file = "rpds_py-0.9.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:bf4151acb541b6e895354f6ff9ac06995ad9e4175cbc6d30aaed08856558201f"}, - {file = "rpds_py-0.9.2-cp310-cp310-musllinux_1_2_aarch64.whl", hash = "sha256:03421628f0dc10a4119d714a17f646e2837126a25ac7a256bdf7c3943400f67f"}, - {file = "rpds_py-0.9.2-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:13b602dc3e8dff3063734f02dcf05111e887f301fdda74151a93dbbc249930fe"}, - {file = "rpds_py-0.9.2-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:fae5cb554b604b3f9e2c608241b5d8d303e410d7dfb6d397c335f983495ce7f6"}, - {file = "rpds_py-0.9.2-cp310-none-win32.whl", hash = "sha256:47c5f58a8e0c2c920cc7783113df2fc4ff12bf3a411d985012f145e9242a2764"}, - {file = "rpds_py-0.9.2-cp310-none-win_amd64.whl", hash = "sha256:4ea6b73c22d8182dff91155af018b11aac9ff7eca085750455c5990cb1cfae6e"}, - {file = "rpds_py-0.9.2-cp311-cp311-macosx_10_7_x86_64.whl", hash = "sha256:e564d2238512c5ef5e9d79338ab77f1cbbda6c2d541ad41b2af445fb200385e3"}, - {file = "rpds_py-0.9.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f411330a6376fb50e5b7a3e66894e4a39e60ca2e17dce258d53768fea06a37bd"}, - {file = "rpds_py-0.9.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0e7521f5af0233e89939ad626b15278c71b69dc1dfccaa7b97bd4cdf96536bb7"}, - {file = "rpds_py-0.9.2-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:8d3335c03100a073883857e91db9f2e0ef8a1cf42dc0369cbb9151c149dbbc1b"}, - {file = "rpds_py-0.9.2-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d25b1c1096ef0447355f7293fbe9ad740f7c47ae032c2884113f8e87660d8f6e"}, - {file = "rpds_py-0.9.2-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6a5d3fbd02efd9cf6a8ffc2f17b53a33542f6b154e88dd7b42ef4a4c0700fdad"}, - {file = "rpds_py-0.9.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c5934e2833afeaf36bd1eadb57256239785f5af0220ed8d21c2896ec4d3a765f"}, - {file = "rpds_py-0.9.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:095b460e117685867d45548fbd8598a8d9999227e9061ee7f012d9d264e6048d"}, - {file = "rpds_py-0.9.2-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:91378d9f4151adc223d584489591dbb79f78814c0734a7c3bfa9c9e09978121c"}, - {file = "rpds_py-0.9.2-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:24a81c177379300220e907e9b864107614b144f6c2a15ed5c3450e19cf536fae"}, - {file = "rpds_py-0.9.2-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:de0b6eceb46141984671802d412568d22c6bacc9b230174f9e55fc72ef4f57de"}, - {file = "rpds_py-0.9.2-cp311-none-win32.whl", hash = "sha256:700375326ed641f3d9d32060a91513ad668bcb7e2cffb18415c399acb25de2ab"}, - {file = "rpds_py-0.9.2-cp311-none-win_amd64.whl", hash = "sha256:0766babfcf941db8607bdaf82569ec38107dbb03c7f0b72604a0b346b6eb3298"}, - {file = "rpds_py-0.9.2-cp312-cp312-macosx_10_7_x86_64.whl", hash = "sha256:b1440c291db3f98a914e1afd9d6541e8fc60b4c3aab1a9008d03da4651e67386"}, - {file = "rpds_py-0.9.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:0f2996fbac8e0b77fd67102becb9229986396e051f33dbceada3debaacc7033f"}, - {file = "rpds_py-0.9.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9f30d205755566a25f2ae0382944fcae2f350500ae4df4e795efa9e850821d82"}, - {file = "rpds_py-0.9.2-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:159fba751a1e6b1c69244e23ba6c28f879a8758a3e992ed056d86d74a194a0f3"}, - {file = "rpds_py-0.9.2-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a1f044792e1adcea82468a72310c66a7f08728d72a244730d14880cd1dabe36b"}, - {file = "rpds_py-0.9.2-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9251eb8aa82e6cf88510530b29eef4fac825a2b709baf5b94a6094894f252387"}, - {file = "rpds_py-0.9.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:01899794b654e616c8625b194ddd1e5b51ef5b60ed61baa7a2d9c2ad7b2a4238"}, - {file = "rpds_py-0.9.2-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:b0c43f8ae8f6be1d605b0465671124aa8d6a0e40f1fb81dcea28b7e3d87ca1e1"}, - {file = "rpds_py-0.9.2-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:207f57c402d1f8712618f737356e4b6f35253b6d20a324d9a47cb9f38ee43a6b"}, - {file = "rpds_py-0.9.2-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:b52e7c5ae35b00566d244ffefba0f46bb6bec749a50412acf42b1c3f402e2c90"}, - {file = "rpds_py-0.9.2-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:978fa96dbb005d599ec4fd9ed301b1cc45f1a8f7982d4793faf20b404b56677d"}, - {file = "rpds_py-0.9.2-cp38-cp38-macosx_10_7_x86_64.whl", hash = "sha256:6aa8326a4a608e1c28da191edd7c924dff445251b94653988efb059b16577a4d"}, - {file = "rpds_py-0.9.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:aad51239bee6bff6823bbbdc8ad85136c6125542bbc609e035ab98ca1e32a192"}, - {file = "rpds_py-0.9.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4bd4dc3602370679c2dfb818d9c97b1137d4dd412230cfecd3c66a1bf388a196"}, - {file = "rpds_py-0.9.2-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:dd9da77c6ec1f258387957b754f0df60766ac23ed698b61941ba9acccd3284d1"}, - {file = "rpds_py-0.9.2-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:190ca6f55042ea4649ed19c9093a9be9d63cd8a97880106747d7147f88a49d18"}, - {file = "rpds_py-0.9.2-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:876bf9ed62323bc7dcfc261dbc5572c996ef26fe6406b0ff985cbcf460fc8a4c"}, - {file = "rpds_py-0.9.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fa2818759aba55df50592ecbc95ebcdc99917fa7b55cc6796235b04193eb3c55"}, - {file = "rpds_py-0.9.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:9ea4d00850ef1e917815e59b078ecb338f6a8efda23369677c54a5825dbebb55"}, - {file = "rpds_py-0.9.2-cp38-cp38-musllinux_1_2_aarch64.whl", hash = "sha256:5855c85eb8b8a968a74dc7fb014c9166a05e7e7a8377fb91d78512900aadd13d"}, - {file = "rpds_py-0.9.2-cp38-cp38-musllinux_1_2_i686.whl", hash = "sha256:14c408e9d1a80dcb45c05a5149e5961aadb912fff42ca1dd9b68c0044904eb32"}, - {file = "rpds_py-0.9.2-cp38-cp38-musllinux_1_2_x86_64.whl", hash = "sha256:65a0583c43d9f22cb2130c7b110e695fff834fd5e832a776a107197e59a1898e"}, - {file = "rpds_py-0.9.2-cp38-none-win32.whl", hash = "sha256:71f2f7715935a61fa3e4ae91d91b67e571aeb5cb5d10331ab681256bda2ad920"}, - {file = "rpds_py-0.9.2-cp38-none-win_amd64.whl", hash = "sha256:674c704605092e3ebbbd13687b09c9f78c362a4bc710343efe37a91457123044"}, - {file = "rpds_py-0.9.2-cp39-cp39-macosx_10_7_x86_64.whl", hash = "sha256:07e2c54bef6838fa44c48dfbc8234e8e2466d851124b551fc4e07a1cfeb37260"}, - {file = "rpds_py-0.9.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:f7fdf55283ad38c33e35e2855565361f4bf0abd02470b8ab28d499c663bc5d7c"}, - {file = "rpds_py-0.9.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:890ba852c16ace6ed9f90e8670f2c1c178d96510a21b06d2fa12d8783a905193"}, - {file = "rpds_py-0.9.2-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:50025635ba8b629a86d9d5474e650da304cb46bbb4d18690532dd79341467846"}, - {file = "rpds_py-0.9.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:517cbf6e67ae3623c5127206489d69eb2bdb27239a3c3cc559350ef52a3bbf0b"}, - {file = "rpds_py-0.9.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0836d71ca19071090d524739420a61580f3f894618d10b666cf3d9a1688355b1"}, - {file = "rpds_py-0.9.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9c439fd54b2b9053717cca3de9583be6584b384d88d045f97d409f0ca867d80f"}, - {file = "rpds_py-0.9.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:f68996a3b3dc9335037f82754f9cdbe3a95db42bde571d8c3be26cc6245f2324"}, - {file = "rpds_py-0.9.2-cp39-cp39-musllinux_1_2_aarch64.whl", hash = "sha256:7d68dc8acded354c972116f59b5eb2e5864432948e098c19fe6994926d8e15c3"}, - {file = "rpds_py-0.9.2-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:f963c6b1218b96db85fc37a9f0851eaf8b9040aa46dec112611697a7023da535"}, - {file = "rpds_py-0.9.2-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:5a46859d7f947061b4010e554ccd1791467d1b1759f2dc2ec9055fa239f1bc26"}, - {file = "rpds_py-0.9.2-cp39-none-win32.whl", hash = "sha256:e07e5dbf8a83c66783a9fe2d4566968ea8c161199680e8ad38d53e075df5f0d0"}, - {file = "rpds_py-0.9.2-cp39-none-win_amd64.whl", hash = "sha256:682726178138ea45a0766907957b60f3a1bf3acdf212436be9733f28b6c5af3c"}, - {file = "rpds_py-0.9.2-pp310-pypy310_pp73-macosx_10_7_x86_64.whl", hash = "sha256:196cb208825a8b9c8fc360dc0f87993b8b260038615230242bf18ec84447c08d"}, - {file = "rpds_py-0.9.2-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:c7671d45530fcb6d5e22fd40c97e1e1e01965fc298cbda523bb640f3d923b387"}, - {file = "rpds_py-0.9.2-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:83b32f0940adec65099f3b1c215ef7f1d025d13ff947975a055989cb7fd019a4"}, - {file = "rpds_py-0.9.2-pp310-pypy310_pp73-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:7f67da97f5b9eac838b6980fc6da268622e91f8960e083a34533ca710bec8611"}, - {file = "rpds_py-0.9.2-pp310-pypy310_pp73-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:03975db5f103997904c37e804e5f340c8fdabbb5883f26ee50a255d664eed58c"}, - {file = "rpds_py-0.9.2-pp310-pypy310_pp73-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:987b06d1cdb28f88a42e4fb8a87f094e43f3c435ed8e486533aea0bf2e53d931"}, - {file = "rpds_py-0.9.2-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c861a7e4aef15ff91233751619ce3a3d2b9e5877e0fcd76f9ea4f6847183aa16"}, - {file = "rpds_py-0.9.2-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:02938432352359805b6da099c9c95c8a0547fe4b274ce8f1a91677401bb9a45f"}, - {file = "rpds_py-0.9.2-pp310-pypy310_pp73-musllinux_1_2_aarch64.whl", hash = "sha256:ef1f08f2a924837e112cba2953e15aacfccbbfcd773b4b9b4723f8f2ddded08e"}, - {file = "rpds_py-0.9.2-pp310-pypy310_pp73-musllinux_1_2_i686.whl", hash = "sha256:35da5cc5cb37c04c4ee03128ad59b8c3941a1e5cd398d78c37f716f32a9b7f67"}, - {file = "rpds_py-0.9.2-pp310-pypy310_pp73-musllinux_1_2_x86_64.whl", hash = "sha256:141acb9d4ccc04e704e5992d35472f78c35af047fa0cfae2923835d153f091be"}, - {file = "rpds_py-0.9.2-pp38-pypy38_pp73-macosx_10_7_x86_64.whl", hash = "sha256:79f594919d2c1a0cc17d1988a6adaf9a2f000d2e1048f71f298b056b1018e872"}, - {file = "rpds_py-0.9.2-pp38-pypy38_pp73-macosx_11_0_arm64.whl", hash = "sha256:a06418fe1155e72e16dddc68bb3780ae44cebb2912fbd8bb6ff9161de56e1798"}, - {file = "rpds_py-0.9.2-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8b2eb034c94b0b96d5eddb290b7b5198460e2d5d0c421751713953a9c4e47d10"}, - {file = "rpds_py-0.9.2-pp38-pypy38_pp73-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:8b08605d248b974eb02f40bdcd1a35d3924c83a2a5e8f5d0fa5af852c4d960af"}, - {file = "rpds_py-0.9.2-pp38-pypy38_pp73-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a0805911caedfe2736935250be5008b261f10a729a303f676d3d5fea6900c96a"}, - {file = "rpds_py-0.9.2-pp38-pypy38_pp73-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ab2299e3f92aa5417d5e16bb45bb4586171c1327568f638e8453c9f8d9e0f020"}, - {file = "rpds_py-0.9.2-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8c8d7594e38cf98d8a7df25b440f684b510cf4627fe038c297a87496d10a174f"}, - {file = "rpds_py-0.9.2-pp38-pypy38_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:8b9ec12ad5f0a4625db34db7e0005be2632c1013b253a4a60e8302ad4d462afd"}, - {file = "rpds_py-0.9.2-pp38-pypy38_pp73-musllinux_1_2_aarch64.whl", hash = "sha256:1fcdee18fea97238ed17ab6478c66b2095e4ae7177e35fb71fbe561a27adf620"}, - {file = "rpds_py-0.9.2-pp38-pypy38_pp73-musllinux_1_2_i686.whl", hash = "sha256:933a7d5cd4b84f959aedeb84f2030f0a01d63ae6cf256629af3081cf3e3426e8"}, - {file = "rpds_py-0.9.2-pp38-pypy38_pp73-musllinux_1_2_x86_64.whl", hash = "sha256:686ba516e02db6d6f8c279d1641f7067ebb5dc58b1d0536c4aaebb7bf01cdc5d"}, - {file = "rpds_py-0.9.2-pp39-pypy39_pp73-macosx_10_7_x86_64.whl", hash = "sha256:0173c0444bec0a3d7d848eaeca2d8bd32a1b43f3d3fde6617aac3731fa4be05f"}, - {file = "rpds_py-0.9.2-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:d576c3ef8c7b2d560e301eb33891d1944d965a4d7a2eacb6332eee8a71827db6"}, - {file = "rpds_py-0.9.2-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ed89861ee8c8c47d6beb742a602f912b1bb64f598b1e2f3d758948721d44d468"}, - {file = "rpds_py-0.9.2-pp39-pypy39_pp73-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:1054a08e818f8e18910f1bee731583fe8f899b0a0a5044c6e680ceea34f93876"}, - {file = "rpds_py-0.9.2-pp39-pypy39_pp73-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:99e7c4bb27ff1aab90dcc3e9d37ee5af0231ed98d99cb6f5250de28889a3d502"}, - {file = "rpds_py-0.9.2-pp39-pypy39_pp73-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c545d9d14d47be716495076b659db179206e3fd997769bc01e2d550eeb685596"}, - {file = "rpds_py-0.9.2-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9039a11bca3c41be5a58282ed81ae422fa680409022b996032a43badef2a3752"}, - {file = "rpds_py-0.9.2-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:fb39aca7a64ad0c9490adfa719dbeeb87d13be137ca189d2564e596f8ba32c07"}, - {file = "rpds_py-0.9.2-pp39-pypy39_pp73-musllinux_1_2_aarch64.whl", hash = "sha256:2d8b3b3a2ce0eaa00c5bbbb60b6713e94e7e0becab7b3db6c5c77f979e8ed1f1"}, - {file = "rpds_py-0.9.2-pp39-pypy39_pp73-musllinux_1_2_i686.whl", hash = "sha256:99b1c16f732b3a9971406fbfe18468592c5a3529585a45a35adbc1389a529a03"}, - {file = "rpds_py-0.9.2-pp39-pypy39_pp73-musllinux_1_2_x86_64.whl", hash = "sha256:c27ee01a6c3223025f4badd533bea5e87c988cb0ba2811b690395dfe16088cfe"}, - {file = "rpds_py-0.9.2.tar.gz", hash = "sha256:8d70e8f14900f2657c249ea4def963bed86a29b81f81f5b76b5a9215680de945"}, -] -setuptools = [ - {file = "setuptools-67.6.1-py3-none-any.whl", hash = "sha256:e728ca814a823bf7bf60162daf9db95b93d532948c4c0bea762ce62f60189078"}, - {file = "setuptools-67.6.1.tar.gz", hash = "sha256:257de92a9d50a60b8e22abfcbb771571fde0dbf3ec234463212027a4eeecbe9a"}, -] -setuptools-scm = [ - {file = "setuptools_scm-7.1.0-py3-none-any.whl", hash = "sha256:73988b6d848709e2af142aa48c986ea29592bbcfca5375678064708205253d8e"}, - {file = "setuptools_scm-7.1.0.tar.gz", hash = "sha256:6c508345a771aad7d56ebff0e70628bf2b0ec7573762be9960214730de278f27"}, -] -six = [ - {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, - {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"}, -] -snowballstemmer = [ - {file = "snowballstemmer-2.2.0-py2.py3-none-any.whl", hash = "sha256:c8e1716e83cc398ae16824e5572ae04e0d9fc2c6b985fb0f900f5f0c96ecba1a"}, - {file = "snowballstemmer-2.2.0.tar.gz", hash = "sha256:09b16deb8547d3412ad7b590689584cd0fe25ec8db3be37788be3810cbf19cb1"}, -] -sortedcontainers = [ - {file = "sortedcontainers-2.4.0-py2.py3-none-any.whl", hash = "sha256:a163dcaede0f1c021485e957a39245190e74249897e2ae4b2aa38595db237ee0"}, - {file = "sortedcontainers-2.4.0.tar.gz", hash = "sha256:25caa5a06cc30b6b83d11423433f65d1f9d76c4c6a0c90e3379eaa43b9bfdb88"}, -] -soupsieve = [ - {file = "soupsieve-2.4.1-py3-none-any.whl", hash = "sha256:1c1bfee6819544a3447586c889157365a27e10d88cde3ad3da0cf0ddf646feb8"}, - {file = "soupsieve-2.4.1.tar.gz", hash = "sha256:89d12b2d5dfcd2c9e8c22326da9d9aa9cb3dfab0a83a024f05704076ee8d35ea"}, -] -sphinx = [ - {file = "Sphinx-5.3.0.tar.gz", hash = "sha256:51026de0a9ff9fc13c05d74913ad66047e104f56a129ff73e174eb5c3ee794b5"}, - {file = "sphinx-5.3.0-py3-none-any.whl", hash = "sha256:060ca5c9f7ba57a08a1219e547b269fadf125ae25b06b9fa7f66768efb652d6d"}, -] -sphinx-autodoc-typehints = [ - {file = "sphinx_autodoc_typehints-1.22-py3-none-any.whl", hash = "sha256:ef4a8b9d52de66065aa7d3adfabf5a436feb8a2eff07c2ddc31625d8807f2b69"}, - {file = "sphinx_autodoc_typehints-1.22.tar.gz", hash = "sha256:71fca2d5eee9b034204e4c686ab20b4d8f5eb9409396216bcae6c87c38e18ea6"}, -] -sphinx-design = [ - {file = "sphinx_design-0.3.0-py3-none-any.whl", hash = "sha256:823c1dd74f31efb3285ec2f1254caefed29d762a40cd676f58413a1e4ed5cc96"}, - {file = "sphinx_design-0.3.0.tar.gz", hash = "sha256:7183fa1fae55b37ef01bda5125a21ee841f5bbcbf59a35382be598180c4cefba"}, -] -sphinx-last-updated-by-git = [ - {file = "sphinx-last-updated-by-git-0.3.4.tar.gz", hash = "sha256:6fd4ed156b64cdc1513ed25c5c4ea6b621271be2a4322292a52379ef64ab73b5"}, - {file = "sphinx_last_updated_by_git-0.3.4-py3-none-any.whl", hash = "sha256:633db0377a6d7ac38d73d80dfa0fdadecc1995b33f3d828eca2e372beae132be"}, -] -sphinx-rtd-theme = [ - {file = "sphinx_rtd_theme-1.2.0-py2.py3-none-any.whl", hash = "sha256:f823f7e71890abe0ac6aaa6013361ea2696fc8d3e1fa798f463e82bdb77eeff2"}, - {file = "sphinx_rtd_theme-1.2.0.tar.gz", hash = "sha256:a0d8bd1a2ed52e0b338cbe19c4b2eef3c5e7a048769753dac6a9f059c7b641b8"}, -] -sphinxcontrib-applehelp = [ - {file = "sphinxcontrib-applehelp-1.0.4.tar.gz", hash = "sha256:828f867945bbe39817c210a1abfd1bc4895c8b73fcaade56d45357a348a07d7e"}, - {file = "sphinxcontrib_applehelp-1.0.4-py3-none-any.whl", hash = "sha256:29d341f67fb0f6f586b23ad80e072c8e6ad0b48417db2bde114a4c9746feb228"}, -] -sphinxcontrib-devhelp = [ - {file = "sphinxcontrib-devhelp-1.0.2.tar.gz", hash = "sha256:ff7f1afa7b9642e7060379360a67e9c41e8f3121f2ce9164266f61b9f4b338e4"}, - {file = "sphinxcontrib_devhelp-1.0.2-py2.py3-none-any.whl", hash = "sha256:8165223f9a335cc1af7ffe1ed31d2871f325254c0423bc0c4c7cd1c1e4734a2e"}, -] -sphinxcontrib-htmlhelp = [ - {file = "sphinxcontrib-htmlhelp-2.0.1.tar.gz", hash = "sha256:0cbdd302815330058422b98a113195c9249825d681e18f11e8b1f78a2f11efff"}, - {file = "sphinxcontrib_htmlhelp-2.0.1-py3-none-any.whl", hash = "sha256:c38cb46dccf316c79de6e5515e1770414b797162b23cd3d06e67020e1d2a6903"}, -] -sphinxcontrib-jquery = [ - {file = "sphinxcontrib-jquery-4.1.tar.gz", hash = "sha256:1620739f04e36a2c779f1a131a2dfd49b2fd07351bf1968ced074365933abc7a"}, - {file = "sphinxcontrib_jquery-4.1-py2.py3-none-any.whl", hash = "sha256:f936030d7d0147dd026a4f2b5a57343d233f1fc7b363f68b3d4f1cb0993878ae"}, -] -sphinxcontrib-jsmath = [ - {file = "sphinxcontrib-jsmath-1.0.1.tar.gz", hash = "sha256:a9925e4a4587247ed2191a22df5f6970656cb8ca2bd6284309578f2153e0c4b8"}, - {file = "sphinxcontrib_jsmath-1.0.1-py2.py3-none-any.whl", hash = "sha256:2ec2eaebfb78f3f2078e73666b1415417a116cc848b72e5172e596c871103178"}, -] -sphinxcontrib-qthelp = [ - {file = "sphinxcontrib-qthelp-1.0.3.tar.gz", hash = "sha256:4c33767ee058b70dba89a6fc5c1892c0d57a54be67ddd3e7875a18d14cba5a72"}, - {file = "sphinxcontrib_qthelp-1.0.3-py2.py3-none-any.whl", hash = "sha256:bd9fc24bcb748a8d51fd4ecaade681350aa63009a347a8c14e637895444dfab6"}, -] -sphinxcontrib-serializinghtml = [ - {file = "sphinxcontrib-serializinghtml-1.1.5.tar.gz", hash = "sha256:aa5f6de5dfdf809ef505c4895e51ef5c9eac17d0f287933eb49ec495280b6952"}, - {file = "sphinxcontrib_serializinghtml-1.1.5-py2.py3-none-any.whl", hash = "sha256:352a9a00ae864471d3a7ead8d7d79f5fc0b57e8b3f95e9867eb9eb28999b92fd"}, -] -sphinxext-opengraph = [ - {file = "sphinxext-opengraph-0.8.2.tar.gz", hash = "sha256:45a693b6704052c426576f0a1f630649c55b4188bc49eb63e9587e24a923db39"}, - {file = "sphinxext_opengraph-0.8.2-py3-none-any.whl", hash = "sha256:6a05bdfe5176d9dd0a1d58a504f17118362ab976631213cd36fb44c4c40544c9"}, -] -stack-data = [ - {file = "stack_data-0.6.2-py3-none-any.whl", hash = "sha256:cbb2a53eb64e5785878201a97ed7c7b94883f48b87bfb0bbe8b623c74679e4a8"}, - {file = "stack_data-0.6.2.tar.gz", hash = "sha256:32d2dd0376772d01b6cb9fc996f3c8b57a357089dec328ed4b6553d037eaf815"}, -] -stringcase = [ - {file = "stringcase-1.2.0.tar.gz", hash = "sha256:48a06980661908efe8d9d34eab2b6c13aefa2163b3ced26972902e3bdfd87008"}, -] -tinycss2 = [ - {file = "tinycss2-1.2.1-py3-none-any.whl", hash = "sha256:2b80a96d41e7c3914b8cda8bc7f705a4d9c49275616e886103dd839dfc847847"}, - {file = "tinycss2-1.2.1.tar.gz", hash = "sha256:8cff3a8f066c2ec677c06dbc7b45619804a6938478d9d73c284b29d14ecb0627"}, -] -toml = [ - {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"}, - {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"}, -] -tomli = [ - {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"}, - {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"}, -] -tornado = [ - {file = "tornado-6.3.2-cp38-abi3-macosx_10_9_universal2.whl", hash = "sha256:c367ab6c0393d71171123ca5515c61ff62fe09024fa6bf299cd1339dc9456829"}, - {file = "tornado-6.3.2-cp38-abi3-macosx_10_9_x86_64.whl", hash = "sha256:b46a6ab20f5c7c1cb949c72c1994a4585d2eaa0be4853f50a03b5031e964fc7c"}, - {file = "tornado-6.3.2-cp38-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c2de14066c4a38b4ecbbcd55c5cc4b5340eb04f1c5e81da7451ef555859c833f"}, - {file = "tornado-6.3.2-cp38-abi3-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:05615096845cf50a895026f749195bf0b10b8909f9be672f50b0fe69cba368e4"}, - {file = "tornado-6.3.2-cp38-abi3-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5b17b1cf5f8354efa3d37c6e28fdfd9c1c1e5122f2cb56dac121ac61baa47cbe"}, - {file = "tornado-6.3.2-cp38-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:29e71c847a35f6e10ca3b5c2990a52ce38b233019d8e858b755ea6ce4dcdd19d"}, - {file = "tornado-6.3.2-cp38-abi3-musllinux_1_1_i686.whl", hash = "sha256:834ae7540ad3a83199a8da8f9f2d383e3c3d5130a328889e4cc991acc81e87a0"}, - {file = "tornado-6.3.2-cp38-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:6a0848f1aea0d196a7c4f6772197cbe2abc4266f836b0aac76947872cd29b411"}, - {file = "tornado-6.3.2-cp38-abi3-win32.whl", hash = "sha256:7efcbcc30b7c654eb6a8c9c9da787a851c18f8ccd4a5a3a95b05c7accfa068d2"}, - {file = "tornado-6.3.2-cp38-abi3-win_amd64.whl", hash = "sha256:0c325e66c8123c606eea33084976c832aa4e766b7dff8aedd7587ea44a604cdf"}, - {file = "tornado-6.3.2.tar.gz", hash = "sha256:4b927c4f19b71e627b13f3db2324e4ae660527143f9e1f2e2fb404f3a187e2ba"}, -] -tox = [ - {file = "tox-4.4.8-py3-none-any.whl", hash = "sha256:12fe562b8992ea63b1e92556b7e28600cd1b70c9e01ce08984f60ce2d32c243c"}, - {file = "tox-4.4.8.tar.gz", hash = "sha256:524640254de8b0f03facbdc6b7c18a35700592e3ada0ede42f509b3504b745ff"}, -] -tqdm = [ - {file = "tqdm-4.65.0-py3-none-any.whl", hash = "sha256:c4f53a17fe37e132815abceec022631be8ffe1b9381c2e6e30aa70edc99e9671"}, - {file = "tqdm-4.65.0.tar.gz", hash = "sha256:1871fb68a86b8fb3b59ca4cdd3dcccbc7e6d613eeed31f4c332531977b89beb5"}, -] -traitlets = [ - {file = "traitlets-5.9.0-py3-none-any.whl", hash = "sha256:9e6ec080259b9a5940c797d58b613b5e31441c2257b87c2e795c5228ae80d2d8"}, - {file = "traitlets-5.9.0.tar.gz", hash = "sha256:f6cde21a9c68cf756af02035f72d5a723bf607e862e7be33ece505abf4a3bad9"}, -] -treelib = [ - {file = "treelib-1.6.4-py3-none-any.whl", hash = "sha256:4218f7dded2448dfa6a335888bf68a28430660163e7faf18c6128ec4477d34c0"}, - {file = "treelib-1.6.4.tar.gz", hash = "sha256:1a2e838f6b99e2690bc3d992d5a1f04cdb4af6564bd7688883c23d17257bbb2a"}, -] -typing-extensions = [ - {file = "typing_extensions-4.5.0-py3-none-any.whl", hash = "sha256:fb33085c39dd998ac16d1431ebc293a8b3eedd00fd4a32de0ff79002c19511b4"}, - {file = "typing_extensions-4.5.0.tar.gz", hash = "sha256:5cb5f4a79139d699607b3ef622a1dedafa84e115ab0024e0d9c044a9479ca7cb"}, -] -tzdata = [ - {file = "tzdata-2023.3-py2.py3-none-any.whl", hash = "sha256:7e65763eef3120314099b6939b5546db7adce1e7d6f2e179e3df563c70511eda"}, - {file = "tzdata-2023.3.tar.gz", hash = "sha256:11ef1e08e54acb0d4f95bdb1be05da659673de4acbd21bf9c69e94cc5e907a3a"}, -] -urllib3 = [ - {file = "urllib3-1.26.15-py2.py3-none-any.whl", hash = "sha256:aa751d169e23c7479ce47a0cb0da579e3ede798f994f5816a74e4f4500dcea42"}, - {file = "urllib3-1.26.15.tar.gz", hash = "sha256:8a388717b9476f934a21484e8c8e61875ab60644d29b9b39e11e4b9dc1c6b305"}, -] -virtualenv = [ - {file = "virtualenv-20.21.0-py3-none-any.whl", hash = "sha256:31712f8f2a17bd06234fa97fdf19609e789dd4e3e4bf108c3da71d710651adbc"}, - {file = "virtualenv-20.21.0.tar.gz", hash = "sha256:f50e3e60f990a0757c9b68333c9fdaa72d7188caa417f96af9e52407831a3b68"}, -] -wcwidth = [ - {file = "wcwidth-0.2.6-py2.py3-none-any.whl", hash = "sha256:795b138f6875577cd91bba52baf9e445cd5118fd32723b460e30a0af30ea230e"}, - {file = "wcwidth-0.2.6.tar.gz", hash = "sha256:a5220780a404dbe3353789870978e472cfe477761f06ee55077256e509b156d0"}, -] -webencodings = [ - {file = "webencodings-0.5.1-py2.py3-none-any.whl", hash = "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78"}, - {file = "webencodings-0.5.1.tar.gz", hash = "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"}, -] -yapf = [ - {file = "yapf-0.32.0-py2.py3-none-any.whl", hash = "sha256:8fea849025584e486fd06d6ba2bed717f396080fd3cc236ba10cb97c4c51cf32"}, - {file = "yapf-0.32.0.tar.gz", hash = "sha256:a3f5085d37ef7e3e004c4ba9f9b3e40c54ff1901cd111f05145ae313a7c67d1b"}, -] -zipp = [ - {file = "zipp-3.15.0-py3-none-any.whl", hash = "sha256:48904fc76a60e542af151aded95726c1a5c34ed43ab4134b597665c86d7ad556"}, - {file = "zipp-3.15.0.tar.gz", hash = "sha256:112929ad649da941c23de50f356a2b5570c954b65150642bccdd66bf194d224b"}, -] +content-hash = "8b48ed8cc2182d2d3f1ca914ceac77222be5325c77d1713a226d09d22a1cdf98" diff --git a/pyproject.toml b/pyproject.toml index b5bce8c5..c156d329 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -58,6 +58,7 @@ ipykernel = "^6.23.1" sphinxext-opengraph = "^0.8.2" coverage-badge = "^1.1.0" nbsphinx = "^0.9.2" +black = "^23.9.1" [build-system] requires = ["poetry-core>=1.0.0"] diff --git a/test/test_core.py b/test/test_core.py index ea08b5b8..7c223bd2 100644 --- a/test/test_core.py +++ b/test/test_core.py @@ -16,9 +16,9 @@ def test_log_missing_types(core, translator): assert core.log_missing_input_labels() == None core._translator.notype = {"a": 1, "b": 2} - mt = core.log_missing_input_labels() + real_missing_types = core.log_missing_input_labels() - assert mt.get("a") == 1 and mt.get("b") == 2 + assert real_missing_types.get("a") == 1 and real_missing_types.get("b") == 2 @pytest.mark.parametrize("l", [4], scope="function") diff --git a/test/test_deduplicate.py b/test/test_deduplicate.py index 68b00c7a..a1f0beea 100644 --- a/test/test_deduplicate.py +++ b/test/test_deduplicate.py @@ -48,9 +48,9 @@ def test_get_duplicate_nodes(_get_nodes): for node in nodes: dedup.node_seen(node) - d = dedup.get_duplicate_nodes() - types = d[0] - ids = d[1] + duplicates = dedup.get_duplicate_nodes() + types = duplicates[0] + ids = duplicates[1] assert "protein" in types assert "p1" in ids @@ -104,9 +104,9 @@ def test_get_duplicate_edges(_get_edges): for edge in edges: dedup.edge_seen(edge) - d = dedup.get_duplicate_edges() - types = d[0] - ids = d[1] + duplicates = dedup.get_duplicate_edges() + types = duplicates[0] + ids = duplicates[1] assert "Is_Mutated_In" in types assert ("mrel2") in ids diff --git a/test/test_driver.py b/test/test_driver.py index 2273ed3d..ee8a3383 100644 --- a/test/test_driver.py +++ b/test/test_driver.py @@ -22,29 +22,29 @@ def test_increment_version(driver): driver._driver.query(query) driver._update_meta_graph() - r, summary = driver._driver.query( + result, summary = driver._driver.query( "MATCH (n:BioCypher) " "RETURN n", ) - assert len(r) == 2 + assert len(result) == 2 @pytest.mark.requires_neo4j def test_explain(driver): query = "MATCH (n) WITH n LIMIT 25 MATCH (n)--(m)--(f) RETURN n, m, f" - e = driver._driver.explain(query) - t = e[0] + explanation = driver._driver.explain(query) + text = explanation[0] - assert "args" in t and "identifiers" in t + assert "args" in text and "identifiers" in text @pytest.mark.requires_neo4j def test_profile(driver): query = "MATCH (n) RETURN n LIMIT 100" - p = driver._driver.profile(query) - t = p[0] + profile = driver._driver.profile(query) + text = profile[0] - assert "args" in t and "identifiers" in t + assert "args" in text and "identifiers" in text @pytest.mark.requires_neo4j @@ -61,24 +61,26 @@ def test_add_invalid_biocypher_node(driver): @pytest.mark.requires_neo4j def test_add_single_biocypher_node(driver): # neo4j database needs to be running! - n = BioCypherNode(node_id="test_id1", node_label="Test") - driver.add_biocypher_nodes(n) - r, summary = driver._driver.query( + node = BioCypherNode(node_id="test_id1", node_label="Test") + driver.add_biocypher_nodes(node) + result, summary = driver._driver.query( "MATCH (n:Test) " "WITH n, n.id AS id " "RETURN id ", ) - assert r[0]["id"] == "test_id1" + assert result[0]["id"] == "test_id1" @pytest.mark.requires_neo4j def test_add_biocypher_node_list(driver): # neo4j database needs to be running! - n1 = BioCypherNode(node_id="test_id1", node_label="Test") - n2 = BioCypherNode(node_id="test_id2", node_label="Test") - driver.add_biocypher_nodes([n1, n2]) - r, summary = driver._driver.query( + node_1 = BioCypherNode(node_id="test_id1", node_label="Test") + node_2 = BioCypherNode(node_id="test_id2", node_label="Test") + driver.add_biocypher_nodes([node_1, node_2]) + result, summary = driver._driver.query( "MATCH (n:Test) " "WITH n, n.id AS id " "RETURN id ", ) - assert set([r[0]["id"], r[1]["id"]]) == set(["test_id1", "test_id2"]) + assert set([result[0]["id"], result[1]["id"]]) == set( + ["test_id1", "test_id2"] + ) @pytest.mark.requires_neo4j @@ -89,14 +91,14 @@ def gen(nodes): for g in nodes: yield BioCypherNode(g[0], g[1]) - g = gen([("test_id1", "Test"), ("test_id2", "Test")]) + node_generator = gen([("test_id1", "Test"), ("test_id2", "Test")]) - driver.add_biocypher_nodes(g) - r, summary = driver._driver.query( + driver.add_biocypher_nodes(node_generator) + result, summary = driver._driver.query( "MATCH (n:Test) " "WITH n, n.id AS id " "RETURN id ", ) - ids = [n["id"] for n in r] + ids = [n["id"] for n in result] assert "test_id1" in ids assert "test_id2" in ids @@ -104,27 +106,27 @@ def gen(nodes): @pytest.mark.requires_neo4j def test_add_specific_id_node(driver): - n = BioCypherNode(node_id="CHAT", node_label="Gene", preferred_id="hgnc") - driver.add_biocypher_nodes(n) + node = BioCypherNode(node_id="CHAT", node_label="Gene", preferred_id="hgnc") + driver.add_biocypher_nodes(node) - r, summary = driver._driver.query( + result, summary = driver._driver.query( "MATCH (n:Gene) " "RETURN n", ) - assert r[0]["n"].get("id") == "CHAT" - assert r[0]["n"].get("preferred_id") == "hgnc" + assert result[0]["n"].get("id") == "CHAT" + assert result[0]["n"].get("preferred_id") == "hgnc" @pytest.mark.requires_neo4j def test_add_generic_id_node(driver): - n = BioCypherNode(node_id="CHAT", node_label="Gene", preferred_id="HGNC") - driver.add_biocypher_nodes(n) + node = BioCypherNode(node_id="CHAT", node_label="Gene", preferred_id="HGNC") + driver.add_biocypher_nodes(node) - r, summary = driver._driver.query( + result, summary = driver._driver.query( "MATCH (n:Gene) " "RETURN n", ) - assert r[0]["n"].get("id") is not None + assert result[0]["n"].get("id") is not None @pytest.mark.requires_neo4j @@ -137,21 +139,21 @@ def test_add_invalid_biocypher_edge(driver): @pytest.mark.requires_neo4j def test_add_single_biocypher_edge_explicit_node_creation(driver): # neo4j database needs to be running! - n1 = BioCypherNode("src", "Test") - n2 = BioCypherNode("tar", "Test") - driver.add_biocypher_nodes([n1, n2]) + node_1 = BioCypherNode("src", "Test") + node_2 = BioCypherNode("tar", "Test") + driver.add_biocypher_nodes([node_1, node_2]) - e = BioCypherEdge("src", "tar", "Test") - driver.add_biocypher_edges(e) - r, summary = driver._driver.query( + edge = BioCypherEdge("src", "tar", "Test") + driver.add_biocypher_edges(edge) + result, summary = driver._driver.query( "MATCH (n1)-[r:Test]->(n2) " "WITH n1, n2, n1.id AS id1, n2.id AS id2, type(r) AS label " "RETURN id1, id2, label", ) assert ( - r[0]["id1"] == "src" - and r[0]["id2"] == "tar" - and r[0]["label"] == "Test" + result[0]["id1"] == "src" + and result[0]["id2"] == "tar" + and result[0]["label"] == "Test" ) @@ -161,54 +163,54 @@ def test_add_single_biocypher_edge_missing_nodes(driver): # merging on non-existing nodes creates them without labels; what is # the desired behaviour here? do we only want to MATCH? - e = BioCypherEdge("src", "tar", "Test") - driver.add_biocypher_edges(e) - r, summary = driver._driver.query( + edge = BioCypherEdge("src", "tar", "Test") + driver.add_biocypher_edges(edge) + result, summary = driver._driver.query( "MATCH (n1)-[r:Test]->(n2) " "WITH n1, n2, n1.id AS id1, n2.id AS id2, type(r) AS label " "RETURN id1, id2, label", ) assert ( - r[0]["id1"] == "src" - and r[0]["id2"] == "tar" - and r[0]["label"] == "Test" + result[0]["id1"] == "src" + and result[0]["id2"] == "tar" + and result[0]["label"] == "Test" ) @pytest.mark.requires_neo4j def test_add_biocypher_edge_list(driver): # neo4j database needs to be running! - n1 = BioCypherNode("src", "Test") - n2 = BioCypherNode("tar1", "Test") - n3 = BioCypherNode("tar2", "Test") - driver.add_biocypher_nodes([n1, n2, n3]) + node_1 = BioCypherNode("src", "Test") + node_2 = BioCypherNode("tar1", "Test") + node_3 = BioCypherNode("tar2", "Test") + driver.add_biocypher_nodes([node_1, node_2, node_3]) # edge list - e1 = BioCypherEdge("src", "tar1", "Test1") - e2 = BioCypherEdge("src", "tar2", "Test2") - driver.add_biocypher_edges([e1, e2]) - r, summary = driver._driver.query( + edge_1 = BioCypherEdge("src", "tar1", "Test1") + edge_2 = BioCypherEdge("src", "tar2", "Test2") + driver.add_biocypher_edges([edge_1, edge_2]) + result, summary = driver._driver.query( "MATCH (n3)<-[r2:Test2]-(n1)-[r1:Test1]->(n2) " "WITH n1, n2, n3, n1.id AS id1, n2.id AS id2, n3.id AS id3, " "type(r1) AS label1, type(r2) AS label2 " "RETURN id1, id2, id3, label1, label2", ) assert ( - r[0]["id1"] == "src" - and r[0]["id2"] == "tar1" - and r[0]["id3"] == "tar2" - and r[0]["label1"] == "Test1" - and r[0]["label2"] == "Test2" + result[0]["id1"] == "src" + and result[0]["id2"] == "tar1" + and result[0]["id3"] == "tar2" + and result[0]["label1"] == "Test1" + and result[0]["label2"] == "Test2" ) @pytest.mark.requires_neo4j def test_add_biocypher_edge_generator(driver): # neo4j database needs to be running! - n1 = BioCypherNode("src", "Test") - n2 = BioCypherNode("tar1", "Test") - n3 = BioCypherNode("tar2", "Test") - driver.add_biocypher_nodes([n1, n2, n3]) + node_1 = BioCypherNode("src", "Test") + node_2 = BioCypherNode("tar1", "Test") + node_3 = BioCypherNode("tar2", "Test") + driver.add_biocypher_nodes([node_1, node_2, node_3]) # generator def gen(edges): @@ -220,39 +222,41 @@ def gen(edges): ) # edge list - e1 = BioCypherEdge("src", "tar1", "Test1") - e2 = BioCypherEdge("src", "tar2", "Test2") - g = gen([e1, e2]) + edge_1 = BioCypherEdge("src", "tar1", "Test1") + edge_2 = BioCypherEdge("src", "tar2", "Test2") + edge_generator = gen([edge_1, edge_2]) - driver.add_biocypher_edges(g) - r, summary = driver._driver.query( + driver.add_biocypher_edges(edge_generator) + result, summary = driver._driver.query( "MATCH (n3)<-[r2:Test2]-(n1)-[r1:Test1]->(n2) " "WITH n1, n2, n3, n1.id AS id1, n2.id AS id2, n3.id AS id3, " "type(r1) AS label1, type(r2) AS label2 " "RETURN id1, id2, id3, label1, label2", ) assert ( - r[0]["id1"] == "src" - and r[0]["id2"] == "tar1" - and r[0]["id3"] == "tar2" - and r[0]["label1"] == "Test1" - and r[0]["label2"] == "Test2" + result[0]["id1"] == "src" + and result[0]["id2"] == "tar1" + and result[0]["id3"] == "tar2" + and result[0]["label1"] == "Test1" + and result[0]["label2"] == "Test2" ) @pytest.mark.requires_neo4j def test_add_biocypher_interaction_as_BioCypherRelAsNode_list(driver): # neo4j database needs to be running! - i1 = BioCypherNode("int1", "Int1") - i2 = BioCypherNode("int2", "Int2") - driver.add_biocypher_nodes([i1, i2]) - e1 = BioCypherEdge("src", "int1", "is_source_of") - e2 = BioCypherEdge("tar", "int1", "is_target_of") - e3 = BioCypherEdge("src", "int2", "is_source_of") - e4 = BioCypherEdge("tar", "int2", "is_target_of") - r1, r2 = BioCypherRelAsNode(i1, e1, e2), BioCypherRelAsNode(i2, e3, e4) - driver.add_biocypher_edges([r1, r2]) - r, summary = driver._driver.query( + interaction_node_1 = BioCypherNode("int1", "Int1") + interaction_node_2 = BioCypherNode("int2", "Int2") + driver.add_biocypher_nodes([interaction_node_1, interaction_node_2]) + edge_1 = BioCypherEdge("src", "int1", "is_source_of") + edge_2 = BioCypherEdge("tar", "int1", "is_target_of") + edge_3 = BioCypherEdge("src", "int2", "is_source_of") + edge_4 = BioCypherEdge("tar", "int2", "is_target_of") + relationship_1, relationship_2 = BioCypherRelAsNode( + interaction_node_1, edge_1, edge_2 + ), BioCypherRelAsNode(interaction_node_2, edge_3, edge_4) + driver.add_biocypher_edges([relationship_1, relationship_2]) + result, summary = driver._driver.query( "MATCH (n2)-[e4:is_target_of]->(i2:Int2)<-[e3:is_source_of]-" "(n1)-[e1:is_source_of]->(i1:Int1)<-[e2:is_target_of]-(n2)" "WITH n1, n2, i1, i2, n1.id AS id1, n2.id AS id2, " @@ -262,36 +266,38 @@ def test_add_biocypher_interaction_as_BioCypherRelAsNode_list(driver): "RETURN id1, id2, id3, id4, label1, label2, label3, label4", ) assert ( - r[0]["id1"] == "src" - and r[0]["id2"] == "tar" - and r[0]["id3"] == "int1" - and r[0]["id4"] == "int2" - and r[0]["label1"] == "is_source_of" - and r[0]["label2"] == "is_target_of" - and r[0]["label3"] == "is_source_of" - and r[0]["label4"] == "is_target_of" + result[0]["id1"] == "src" + and result[0]["id2"] == "tar" + and result[0]["id3"] == "int1" + and result[0]["id4"] == "int2" + and result[0]["label1"] == "is_source_of" + and result[0]["label2"] == "is_target_of" + and result[0]["label3"] == "is_source_of" + and result[0]["label4"] == "is_target_of" ) @pytest.mark.requires_neo4j def test_add_biocypher_interaction_as_BioCypherRelAsNode_generator(driver): # neo4j database needs to be running! - i1 = BioCypherNode("int1", "Int1") - i2 = BioCypherNode("int2", "Int2") - driver.add_biocypher_nodes([i1, i2]) - e1 = BioCypherEdge("src", "int1", "is_source_of") - e2 = BioCypherEdge("tar", "int1", "is_target_of") - e3 = BioCypherEdge("src", "int2", "is_source_of") - e4 = BioCypherEdge("tar", "int2", "is_target_of") - r1, r2 = BioCypherRelAsNode(i1, e1, e2), BioCypherRelAsNode(i2, e3, e4) - relasnode_list = [r1, r2] + interaction_node_1 = BioCypherNode("int1", "Int1") + interaction_node_2 = BioCypherNode("int2", "Int2") + driver.add_biocypher_nodes([interaction_node_1, interaction_node_2]) + edge_1 = BioCypherEdge("src", "int1", "is_source_of") + edge_2 = BioCypherEdge("tar", "int1", "is_target_of") + edge_3 = BioCypherEdge("src", "int2", "is_source_of") + edge_4 = BioCypherEdge("tar", "int2", "is_target_of") + relationship_1, relationship_2 = BioCypherRelAsNode( + interaction_node_1, edge_1, edge_2 + ), BioCypherRelAsNode(interaction_node_2, edge_3, edge_4) + relasnode_list = [relationship_1, relationship_2] def gen(lis): for tup in lis: yield tup driver.add_biocypher_edges(gen(relasnode_list)) - r, summary = driver._driver.query( + result, summary = driver._driver.query( "MATCH (n2)-[e4:is_target_of]->(i2:Int2)<-[e3:is_source_of]-" "(n1)-[e1:is_source_of]->(i1:Int1)<-[e2:is_target_of]-(n2)" "WITH n1, n2, i1, i2, n1.id AS id1, n2.id AS id2, " @@ -301,14 +307,14 @@ def gen(lis): "RETURN id1, id2, id3, id4, label1, label2, label3, label4", ) assert ( - r[0]["id1"] == "src" - and r[0]["id2"] == "tar" - and r[0]["id3"] == "int1" - and r[0]["id4"] == "int2" - and r[0]["label1"] == "is_source_of" - and r[0]["label2"] == "is_target_of" - and r[0]["label3"] == "is_source_of" - and r[0]["label4"] == "is_target_of" + result[0]["id1"] == "src" + and result[0]["id2"] == "tar" + and result[0]["id3"] == "int1" + and result[0]["id4"] == "int2" + and result[0]["label1"] == "is_source_of" + and result[0]["label2"] == "is_target_of" + and result[0]["label3"] == "is_source_of" + and result[0]["label4"] == "is_target_of" ) diff --git a/test/test_integration.py b/test/test_integration.py index ea038118..e632f94f 100644 --- a/test/test_integration.py +++ b/test/test_integration.py @@ -15,20 +15,23 @@ def node_gen(nodes): path = core._output_directory - p_csv = os.path.join(path, "Protein-part000.csv") - m_csv = os.path.join(path, "MicroRNA-part000.csv") + protein_csv = os.path.join(path, "Protein-part000.csv") + micro_rna_csv = os.path.join(path, "MicroRNA-part000.csv") - with open(p_csv) as f: - pr = f.read() + with open(protein_csv) as f: + protein_data = f.read() - with open(m_csv) as f: - mi = f.read() + with open(micro_rna_csv) as f: + micro_rna_data = f.read() assert passed - assert "p1;'StringProperty1';4.0;9606;'gene1|gene2';'p1';'uniprot'" in pr - assert "BiologicalEntity" in pr - assert "m1;'StringProperty1';9606;'m1';'mirbase'" in mi - assert "ChemicalEntity" in mi + assert ( + "p1;'StringProperty1';4.0;9606;'gene1|gene2';'p1';'uniprot'" + in protein_data + ) + assert "BiologicalEntity" in protein_data + assert "m1;'StringProperty1';9606;'m1';'mirbase'" in micro_rna_data + assert "ChemicalEntity" in micro_rna_data def test_show_ontology_structure_kwargs(core): diff --git a/test/test_misc.py b/test/test_misc.py index 85e63e9d..e971489a 100644 --- a/test/test_misc.py +++ b/test/test_misc.py @@ -33,9 +33,9 @@ def test_tree_vis(): def test_tree_vis_from_networkx(): - G = nx.DiGraph(inheritance_tree) + graph = nx.DiGraph(inheritance_tree) - tree_vis = create_tree_visualisation(G) + tree_vis = create_tree_visualisation(graph) assert tree_vis.DEPTH == 1 assert tree_vis.WIDTH == 2 diff --git a/test/test_ontology.py b/test/test_ontology.py index a40d1d02..3e9ebb96 100644 --- a/test/test_ontology.py +++ b/test/test_ontology.py @@ -124,10 +124,10 @@ def test_show_full_ontology(hybrid_ontology): def test_write_ontology(hybrid_ontology, tmp_path): passed = hybrid_ontology.show_ontology_structure(to_disk=tmp_path) - f = os.path.join(tmp_path, "ontology_structure.graphml") + file_path = os.path.join(tmp_path, "ontology_structure.graphml") assert passed - assert os.path.isfile(f) + assert os.path.isfile(file_path) def test_disconnected_exception(disconnected_mapping): diff --git a/test/test_translate.py b/test/test_translate.py index bf113158..ebd44ecb 100644 --- a/test/test_translate.py +++ b/test/test_translate.py @@ -29,16 +29,16 @@ def test_translate_nodes(translator): ("REACT:25520", "reactome", {}), ("agpl:001524", "agpl", {}), ] - t = translator.translate_nodes(id_type) + translated_nodes = translator.translate_nodes(id_type) - assert all(type(n) == BioCypherNode for n in t) + assert all(type(n) == BioCypherNode for n in translated_nodes) - t = translator.translate_nodes(id_type) - assert next(t).get_label() == "protein" - assert next(t).get_label() == "microRNA" - assert next(t).get_label() == "complex" - assert next(t).get_label() == "reactome.pathway" - assert next(t).get_label() == "altered gene product level" + translated_nodes = translator.translate_nodes(id_type) + assert next(translated_nodes).get_label() == "protein" + assert next(translated_nodes).get_label() == "microRNA" + assert next(translated_nodes).get_label() == "complex" + assert next(translated_nodes).get_label() == "reactome.pathway" + assert next(translated_nodes).get_label() == "altered gene product level" def test_specific_and_generic_ids(translator): @@ -52,14 +52,16 @@ def test_specific_and_generic_ids(translator): ), ("REACT:25520", "reactome", {}), ] - t = list(translator.translate_nodes(id_type)) + translated_nodes = list(translator.translate_nodes(id_type)) - assert t[0].get_id() == "CHAT" - assert t[0].get_properties().get("preferred_id") == "hgnc" - assert t[0].get_properties().get("id") == "CHAT" - assert t[1].get_id() == "REACT:25520" - assert t[1].get_properties().get("preferred_id") == "reactome" - assert t[1].get_properties().get("id") == "REACT:25520" + assert translated_nodes[0].get_id() == "CHAT" + assert translated_nodes[0].get_properties().get("preferred_id") == "hgnc" + assert translated_nodes[0].get_properties().get("id") == "CHAT" + assert translated_nodes[1].get_id() == "REACT:25520" + assert ( + translated_nodes[1].get_properties().get("preferred_id") == "reactome" + ) + assert translated_nodes[1].get_properties().get("id") == "REACT:25520" def test_translate_edges(translator): @@ -73,11 +75,11 @@ def test_translate_edges(translator): def gen_edges(): yield from src_tar_type_edge - t = translator.translate_edges(gen_edges()) + translated_edges = translator.translate_edges(gen_edges()) - assert type(next(t)) == BioCypherEdge - assert next(t).get_label() == "PERTURBED_IN_DISEASE" - assert next(t).get_label() == "phosphorylation" + assert type(next(translated_edges)) == BioCypherEdge + assert next(translated_edges).get_label() == "PERTURBED_IN_DISEASE" + assert next(translated_edges).get_label() == "phosphorylation" # node type association (defined in `schema_config.yaml`) src_tar_type_node = [ @@ -107,23 +109,23 @@ def gen_edges(): }, ), ] - t = translator.translate_edges(src_tar_type_node) - t = list(t) + translated_edges = translator.translate_edges(src_tar_type_node) + translated_edges = list(translated_edges) - n1 = t[0] - n2 = t[1] - n3 = t[2] + node_1 = translated_edges[0] + node_2 = translated_edges[1] + node_3 = translated_edges[2] - assert n1.get_source_edge().get_label() == "IS_PART_OF" - assert n2.get_source_edge().get_label() == "IS_PART_OF" - assert n3.get_target_edge().get_label() == "IS_TARGET_OF" + assert node_1.get_source_edge().get_label() == "IS_PART_OF" + assert node_2.get_source_edge().get_label() == "IS_PART_OF" + assert node_3.get_target_edge().get_label() == "IS_TARGET_OF" assert ( - type(n1.get_node()) == BioCypherNode - and type(n1.get_source_edge()) == BioCypherEdge - and type(n1.get_target_edge()) == BioCypherEdge + type(node_1.get_node()) == BioCypherNode + and type(node_1.get_source_edge()) == BioCypherEdge + and type(node_1.get_target_edge()) == BioCypherEdge ) - assert n3.get_node().get_id() == "G15258_G16347_True_-1" - assert n3.get_source_edge().get_source_id() == "G15258" + assert node_3.get_node().get_id() == "G15258_G16347_True_-1" + assert node_3.get_source_edge().get_source_id() == "G15258" # def test_biolink_adapter(version_node, translator): @@ -191,21 +193,29 @@ def test_merge_multiple_inputs_node(ontology_mapping, translator): }, ), ] - t = list(translator.translate_nodes(id_type)) + translated_nodes = list(translator.translate_nodes(id_type)) - assert t + assert translated_nodes # check unique node type assert not any( - [s for s in ontology_mapping.extended_schema.keys() if ".gene" in s] + [ + schema + for schema in ontology_mapping.extended_schema.keys() + if ".gene" in schema + ] ) assert any( - [s for s in ontology_mapping.extended_schema.keys() if ".pathway" in s] + [ + schema + for schema in ontology_mapping.extended_schema.keys() + if ".pathway" in schema + ] ) # check translator.translate_nodes for unique return type - assert all([type(n) == BioCypherNode for n in t]) - assert all([n.get_label() == "gene" for n in t]) + assert all([type(node) == BioCypherNode for node in translated_nodes]) + assert all([node.get_label() == "gene" for node in translated_nodes]) def test_implicit_inheritance_node(translator): @@ -222,11 +232,11 @@ def test_implicit_inheritance_node(translator): ), ] - t = list(translator.translate_nodes(id_type)) + translated_nodes = list(translator.translate_nodes(id_type)) - assert all([type(n) == BioCypherNode for n in t]) - assert t[0].get_label() == "intact.snRNA sequence" - assert t[1].get_label() == "rnacentral.snRNA sequence" + assert all([type(n) == BioCypherNode for n in translated_nodes]) + assert translated_nodes[0].get_label() == "intact.snRNA sequence" + assert translated_nodes[1].get_label() == "rnacentral.snRNA sequence" def test_merge_multiple_inputs_edge(ontology_mapping, translator): @@ -254,27 +264,32 @@ def test_merge_multiple_inputs_edge(ontology_mapping, translator): }, ), ] - t = list(translator.translate_edges(src_tar_type)) + translated_edges = list(translator.translate_edges(src_tar_type)) # check unique edge type assert not any( [ - s - for s in ontology_mapping.extended_schema.keys() - if ".gene to disease association" in s + schema + for schema in ontology_mapping.extended_schema.keys() + if ".gene to disease association" in schema ], ) assert any( [ - s - for s in ontology_mapping.extended_schema.keys() - if ".sequence variant" in s + schema + for schema in ontology_mapping.extended_schema.keys() + if ".sequence variant" in schema ], ) # check translator.translate_nodes for unique return type - assert all([type(e) == BioCypherEdge for e in t]) - assert all([e.get_label() == "PERTURBED_IN_DISEASE" for e in t]) + assert all([type(edge) == BioCypherEdge for edge in translated_edges]) + assert all( + [ + edge.get_label() == "PERTURBED_IN_DISEASE" + for edge in translated_edges + ] + ) def test_implicit_inheritance_edge(translator): @@ -294,14 +309,15 @@ def test_implicit_inheritance_edge(translator): {}, ), ] - t = list(translator.translate_edges(src_tar_type)) + translated_edges = list(translator.translate_edges(src_tar_type)) - assert all([type(e) == BioCypherEdge for e in t]) + assert all([type(edge) == BioCypherEdge for edge in translated_edges]) assert ( - t[0].get_label() == "known.sequence variant.variant to gene association" + translated_edges[0].get_label() + == "known.sequence variant.variant to gene association" ) assert ( - t[1].get_label() + translated_edges[1].get_label() == "somatic.sequence variant.variant to gene association" ) @@ -362,13 +378,13 @@ def test_properties_from_config(translator): }, ), ] - t = translator.translate_nodes(id_type) + translated_edges = translator.translate_nodes(id_type) - r = list(t) + translated_edges_as_list = list(translated_edges) assert ( - "name" in r[0].get_properties().keys() - and "name" in r[1].get_properties().keys() - and "test" not in r[2].get_properties().keys() + "name" in translated_edges_as_list[0].get_properties().keys() + and "name" in translated_edges_as_list[1].get_properties().keys() + and "test" not in translated_edges_as_list[2].get_properties().keys() ) src_tar_type = [ @@ -396,18 +412,18 @@ def test_properties_from_config(translator): ), ] - t = translator.translate_edges(src_tar_type) + translated_edges = translator.translate_edges(src_tar_type) - r = list(t) + translated_edges_as_list = list(translated_edges) assert ( - "directional" in r[0].get_properties().keys() - and "directional" in r[1].get_properties().keys() - and "curated" in r[1].get_properties().keys() - and "score" in r[0].get_properties().keys() - and "score" in r[1].get_properties().keys() - and "test" not in r[1].get_properties().keys() - and "id" not in r[0].get_properties().keys() - and "id" not in r[1].get_properties().keys() + "directional" in translated_edges_as_list[0].get_properties().keys() + and "directional" in translated_edges_as_list[1].get_properties().keys() + and "curated" in translated_edges_as_list[1].get_properties().keys() + and "score" in translated_edges_as_list[0].get_properties().keys() + and "score" in translated_edges_as_list[1].get_properties().keys() + and "test" not in translated_edges_as_list[1].get_properties().keys() + and "id" not in translated_edges_as_list[0].get_properties().keys() + and "id" not in translated_edges_as_list[1].get_properties().keys() ) @@ -429,13 +445,14 @@ def test_exclude_properties(translator): }, ), ] - t = translator.translate_nodes(id_type) + translated_nodes = translator.translate_nodes(id_type) - r = list(t) + translated_nodes_as_list = list(translated_nodes) assert ( - "taxon" in r[0].get_properties().keys() - and "taxon" in r[1].get_properties().keys() - and "accession" not in r[0].get_properties().keys() + "taxon" in translated_nodes_as_list[0].get_properties().keys() + and "taxon" in translated_nodes_as_list[1].get_properties().keys() + and "accession" + not in translated_nodes_as_list[0].get_properties().keys() ) src_tar_type = [ @@ -460,15 +477,16 @@ def test_exclude_properties(translator): ), ] - t = translator.translate_edges(src_tar_type) + translated_nodes = translator.translate_edges(src_tar_type) - r = list(t) + translated_nodes_as_list = list(translated_nodes) assert ( - "directional" in r[0].get_properties().keys() - and "directional" in r[1].get_properties().keys() - and "score" in r[0].get_properties().keys() - and "score" in r[1].get_properties().keys() - and "accession" not in r[1].get_properties().keys() + "directional" in translated_nodes_as_list[0].get_properties().keys() + and "directional" in translated_nodes_as_list[1].get_properties().keys() + and "score" in translated_nodes_as_list[0].get_properties().keys() + and "score" in translated_nodes_as_list[1].get_properties().keys() + and "accession" + not in translated_nodes_as_list[1].get_properties().keys() ) @@ -513,7 +531,7 @@ def test_reverse_translate_query(translator): def test_log_missing_nodes(translator): - tn = translator.translate_nodes( + translated_nodes = translator.translate_nodes( [ ( "G49205", @@ -527,39 +545,39 @@ def test_log_missing_nodes(translator): ], ) - tn = list(tn) + translated_nodes = list(translated_nodes) - m = translator.get_missing_biolink_types() - assert m.get("missing_protein") == 2 - assert m.get("missing_pathway") == 1 + missing_types = translator.get_missing_biolink_types() + assert missing_types.get("missing_protein") == 2 + assert missing_types.get("missing_pathway") == 1 def test_strict_mode_error(translator): translator.strict_mode = True - n1 = ( + node_1 = ( "n2", "Test", {"prop": "val", "source": "test", "licence": "test", "version": "test"}, ) - assert list(translator.translate_nodes([n1])) is not None + assert list(translator.translate_nodes([node_1])) is not None # test 'license' instead of 'licence' - n2 = ( + node_2 = ( "n2", "Test", {"prop": "val", "source": "test", "license": "test", "version": "test"}, ) - assert list(translator.translate_nodes([n2])) is not None + assert list(translator.translate_nodes([node_2])) is not None - n3 = ("n1", "Test", {"prop": "val"}) + node_3 = ("n1", "Test", {"prop": "val"}) with pytest.raises(ValueError): - list(translator.translate_nodes([n1, n2, n3])) + list(translator.translate_nodes([node_1, node_2, node_3])) - e1 = ( + edge_1 = ( "n1", "n2", "Test", @@ -571,18 +589,18 @@ def test_strict_mode_error(translator): }, ) - assert list(translator.translate_edges([e1])) is not None + assert list(translator.translate_edges([edge_1])) is not None - e2 = ("n1", "n2", "Test", {"prop": "val"}) + edge_2 = ("n1", "n2", "Test", {"prop": "val"}) with pytest.raises(ValueError): - list(translator.translate_edges([e1, e2])) + list(translator.translate_edges([edge_1, edge_2])) def test_strict_mode_property_filter(translator): translator.strict_mode = True - p1 = ( + protein_1 = ( "p1", "protein", { @@ -593,8 +611,8 @@ def test_strict_mode_property_filter(translator): }, ) - l = list(translator.translate_nodes([p1])) + translated_protein_node = list(translator.translate_nodes([protein_1])) - assert "source" in l[0].get_properties().keys() - assert "licence" in l[0].get_properties().keys() - assert "version" in l[0].get_properties().keys() + assert "source" in translated_protein_node[0].get_properties().keys() + assert "licence" in translated_protein_node[0].get_properties().keys() + assert "version" in translated_protein_node[0].get_properties().keys() diff --git a/test/test_write_arango.py b/test/test_write_arango.py index d3639b2b..d2d560a7 100644 --- a/test/test_write_arango.py +++ b/test/test_write_arango.py @@ -14,75 +14,81 @@ def test_arango_write_data_headers_import_call( edges = _get_edges - p1 = bw_arango.write_nodes(nodes[:4]) - p2 = bw_arango.write_nodes(nodes[4:]) - p3 = bw_arango.write_edges(edges[:4]) - p4 = bw_arango.write_edges(edges[4:]) + protein_1 = bw_arango.write_nodes(nodes[:4]) + protein_2 = bw_arango.write_nodes(nodes[4:]) + protein_3 = bw_arango.write_edges(edges[:4]) + protein_4 = bw_arango.write_edges(edges[4:]) - assert all([p1, p2, p3, p4]) + assert all([protein_1, protein_2, protein_3, protein_4]) bw_arango.write_import_call() tmp_path = bw_arango.outdir - ph_csv = os.path.join(tmp_path, "Protein-header.csv") - pp_1_csv = os.path.join(tmp_path, "Protein-part000.csv") - pp_2_csv = os.path.join(tmp_path, "Protein-part001.csv") - mh_csv = os.path.join(tmp_path, "MicroRNA-header.csv") - mp_1_csv = os.path.join(tmp_path, "MicroRNA-part000.csv") - mp_2_csv = os.path.join(tmp_path, "MicroRNA-part001.csv") - dh_csv = os.path.join(tmp_path, "PERTURBED_IN_DISEASE-header.csv") - dp_1_csv = os.path.join(tmp_path, "PERTURBED_IN_DISEASE-part000.csv") - dp_2_csv = os.path.join(tmp_path, "PERTURBED_IN_DISEASE-part001.csv") - muh_csv = os.path.join(tmp_path, "Is_Mutated_In-header.csv") - mup_1_csv = os.path.join(tmp_path, "Is_Mutated_In-part000.csv") - mup_2_csv = os.path.join(tmp_path, "Is_Mutated_In-part001.csv") + protein_header_csv = os.path.join(tmp_path, "Protein-header.csv") + protein_data_1_csv = os.path.join(tmp_path, "Protein-part000.csv") + protein_data_2_csv = os.path.join(tmp_path, "Protein-part001.csv") + micro_rna_header_csv = os.path.join(tmp_path, "MicroRNA-header.csv") + micro_rna_data_1_csv = os.path.join(tmp_path, "MicroRNA-part000.csv") + micro_rna_data_2_csv = os.path.join(tmp_path, "MicroRNA-part001.csv") + disease_header_csv = os.path.join( + tmp_path, "PERTURBED_IN_DISEASE-header.csv" + ) + disease_data_1_csv = os.path.join( + tmp_path, "PERTURBED_IN_DISEASE-part000.csv" + ) + disease_data_2_csv = os.path.join( + tmp_path, "PERTURBED_IN_DISEASE-part001.csv" + ) + mutation_header_csv = os.path.join(tmp_path, "Is_Mutated_In-header.csv") + mutation_data_1_csv = os.path.join(tmp_path, "Is_Mutated_In-part000.csv") + mutation_data_2_csv = os.path.join(tmp_path, "Is_Mutated_In-part001.csv") call_csv = os.path.join(tmp_path, "arangodb-import-call.sh") - with open(ph_csv) as f: - ph = f.read() - with open(pp_1_csv) as f: - pp_1 = f.readlines() - with open(pp_2_csv) as f: - pp_2 = f.readlines() - with open(mh_csv) as f: - mh = f.read() - with open(mp_1_csv) as f: - mp_1 = f.readlines() - with open(mp_2_csv) as f: - mp_2 = f.readlines() - with open(dh_csv) as f: - dh = f.read() - with open(dp_1_csv) as f: - dp_1 = f.readlines() - with open(dp_2_csv) as f: - dp_2 = f.readlines() - with open(muh_csv) as f: - muh = f.read() - with open(mup_1_csv) as f: - mup_1 = f.readlines() - with open(mup_2_csv) as f: - mup_2 = f.readlines() + with open(protein_header_csv) as f: + protein_header = f.read() + with open(protein_data_1_csv) as f: + protein_data_1 = f.readlines() + with open(protein_data_2_csv) as f: + protein_data_2 = f.readlines() + with open(micro_rna_header_csv) as f: + micro_rna_header = f.read() + with open(micro_rna_data_1_csv) as f: + micro_rna_data_1 = f.readlines() + with open(micro_rna_data_2_csv) as f: + micro_rna_data_2 = f.readlines() + with open(disease_header_csv) as f: + disease_header = f.read() + with open(disease_data_1_csv) as f: + disease_data_1 = f.readlines() + with open(disease_data_2_csv) as f: + disease_data_2 = f.readlines() + with open(mutation_header_csv) as f: + mutation_header = f.read() + with open(mutation_data_1_csv) as f: + mutation_data_1 = f.readlines() + with open(mutation_data_2_csv) as f: + mutation_data_2 = f.readlines() with open(call_csv) as f: call = f.read() - assert ph == "_key,name,score,taxon,genes,id,preferred_id" - assert mh == "_key,name,taxon,id,preferred_id" - assert "_from" in dh - assert "_key" in dh - assert "_to" in dh - assert "_from" in muh - assert "_key" in muh - assert "_to" in muh + assert protein_header == "_key,name,score,taxon,genes,id,preferred_id" + assert micro_rna_header == "_key,name,taxon,id,preferred_id" + assert "_from" in disease_header + assert "_key" in disease_header + assert "_to" in disease_header + assert "_from" in mutation_header + assert "_key" in mutation_header + assert "_to" in mutation_header assert ( - len(pp_1) - == len(pp_2) - == len(mp_1) - == len(mp_2) - == len(dp_1) - == len(dp_2) - == len(mup_1) - == len(mup_2) + len(protein_data_1) + == len(protein_data_2) + == len(micro_rna_data_1) + == len(micro_rna_data_2) + == len(disease_data_1) + == len(disease_data_2) + == len(mutation_data_1) + == len(mutation_data_2) == 2 ) assert "arangoimp --type csv" in call diff --git a/test/test_write_neo4j.py b/test/test_write_neo4j.py index 6269d7bc..44722015 100644 --- a/test/test_write_neo4j.py +++ b/test/test_write_neo4j.py @@ -19,30 +19,30 @@ def test_neo4j_writer_and_output_dir(bw): def test_create_import_call(bw): mixed = [] - le = 4 - for i in range(le): - n = BioCypherNode( + number_of_items = 4 + for i in range(number_of_items): + node = BioCypherNode( f"i{i+1}", "post translational interaction", ) - e1 = BioCypherEdge( + edge_1 = BioCypherEdge( source_id=f"i{i+1}", target_id=f"p{i+1}", relationship_label="IS_SOURCE_OF", ) - e2 = BioCypherEdge( + edge_2 = BioCypherEdge( source_id=f"i{i}", target_id=f"p{i+2}", relationship_label="IS_TARGET_OF", ) - mixed.append(BioCypherRelAsNode(n, e1, e2)) + mixed.append(BioCypherRelAsNode(node, edge_1, edge_2)) - e3 = BioCypherEdge( + edge_3 = BioCypherEdge( source_id=f"p{i+1}", target_id=f"p{i+1}", relationship_label="PERTURBED_IN_DISEASE", ) - mixed.append(e3) + mixed.append(edge_3) def gen(lis): yield from lis @@ -87,42 +87,42 @@ def test_neo4j_write_node_data_headers_import_call(bw, _get_nodes): tmp_path = bw.outdir - p_csv = os.path.join(tmp_path, "Protein-header.csv") - m_csv = os.path.join(tmp_path, "MicroRNA-header.csv") - call = os.path.join(tmp_path, "neo4j-admin-import-call.sh") + protein_header_csv = os.path.join(tmp_path, "Protein-header.csv") + micro_rna_header_csv = os.path.join(tmp_path, "MicroRNA-header.csv") + import_call_path = os.path.join(tmp_path, "neo4j-admin-import-call.sh") - with open(p_csv) as f: - p = f.read() - with open(m_csv) as f: - m = f.read() - with open(call) as f: - c = f.read() + with open(protein_header_csv) as f: + protein_header = f.read() + with open(micro_rna_header_csv) as f: + micro_rna_header = f.read() + with open(import_call_path) as f: + call = f.read() assert ( - p + protein_header == ":ID;name;score:double;taxon:long;genes:string[];id;preferred_id;:LABEL" ) - assert m == ":ID;name;taxon:long;id;preferred_id;:LABEL" - assert "bin/neo4j-admin import" in c - assert "--database=neo4j" in c - assert '--delimiter=";"' in c - assert "--force=true" in c - assert '--nodes="' in c - assert "Protein-header.csv" in c - assert 'Protein-part.*"' in c - assert "MicroRNA-header.csv" in c - assert 'MicroRNA-part.*"' in c + assert micro_rna_header == ":ID;name;taxon:long;id;preferred_id;:LABEL" + assert "bin/neo4j-admin import" in call + assert "--database=neo4j" in call + assert '--delimiter=";"' in call + assert "--force=true" in call + assert '--nodes="' in call + assert "Protein-header.csv" in call + assert 'Protein-part.*"' in call + assert "MicroRNA-header.csv" in call + assert 'MicroRNA-part.*"' in call # custom import call executable path bw.import_call_bin_prefix = "custom/path/" - os.remove(call) + os.remove(import_call_path) bw.write_import_call() - with open(call) as f: - c = f.read() + with open(import_call_path) as f: + call = f.read() - assert "custom/path/neo4j-admin import" in c + assert "custom/path/neo4j-admin import" in call # custom file prefix # TODO @@ -145,13 +145,13 @@ def test_write_hybrid_ontology_nodes(bw): tmp_path = bw.outdir - h_csv = os.path.join(tmp_path, "AlteredGeneProductLevel-header.csv") - p_csv = os.path.join(tmp_path, "AlteredGeneProductLevel-part000.csv") + header_csv = os.path.join(tmp_path, "AlteredGeneProductLevel-header.csv") + data_csv = os.path.join(tmp_path, "AlteredGeneProductLevel-part000.csv") - with open(h_csv) as f: + with open(header_csv) as f: header = f.read() - with open(p_csv) as f: + with open(data_csv) as f: part = f.read() assert header == ":ID;id;preferred_id;:LABEL" @@ -163,7 +163,7 @@ def test_write_hybrid_ontology_nodes(bw): def test_property_types(bw): nodes = [] for i in range(4): - bnp = BioCypherNode( + biocypher_node_protein = BioCypherNode( node_id=f"p{i+1}", node_label="protein", properties={ @@ -173,19 +173,19 @@ def test_property_types(bw): "genes": ["gene1", "gene2"], }, ) - nodes.append(bnp) + nodes.append(biocypher_node_protein) passed = bw.write_nodes(nodes, batch_size=1e6) tmp_path = bw.outdir - d_csv = os.path.join(tmp_path, "Protein-part000.csv") - h_csv = os.path.join(tmp_path, "Protein-header.csv") + data_csv = os.path.join(tmp_path, "Protein-part000.csv") + header_csv = os.path.join(tmp_path, "Protein-header.csv") - with open(d_csv) as f: + with open(data_csv) as f: data = f.read() - with open(h_csv) as f: + with open(header_csv) as f: header = f.read() assert passed @@ -205,20 +205,22 @@ def test_write_node_data_from_list(bw, _get_nodes): tmp_path = bw.outdir - p_csv = os.path.join(tmp_path, "Protein-part000.csv") - m_csv = os.path.join(tmp_path, "MicroRNA-part000.csv") + protein_csv = os.path.join(tmp_path, "Protein-part000.csv") + micro_rna_csv = os.path.join(tmp_path, "MicroRNA-part000.csv") - with open(p_csv) as f: - pr = f.read() + with open(protein_csv) as f: + protein = f.read() - with open(m_csv) as f: - mi = f.read() + with open(micro_rna_csv) as f: + micro_rna = f.read() assert passed - assert "p1;'StringProperty1';4.0;9606;'gene1|gene2';'p1';'uniprot'" in pr - assert "BiologicalEntity" in pr - assert "m1;'StringProperty1';9606;'m1';'mirbase'" in mi - assert "ChemicalEntity" in mi + assert ( + "p1;'StringProperty1';4.0;9606;'gene1|gene2';'p1';'uniprot'" in protein + ) + assert "BiologicalEntity" in protein + assert "m1;'StringProperty1';9606;'m1';'mirbase'" in micro_rna + assert "ChemicalEntity" in micro_rna @pytest.mark.parametrize("l", [4], scope="module") @@ -232,27 +234,29 @@ def node_gen(nodes): tmp_path = bw.outdir - p_csv = os.path.join(tmp_path, "Protein-part000.csv") - m_csv = os.path.join(tmp_path, "MicroRNA-part000.csv") + protein_csv = os.path.join(tmp_path, "Protein-part000.csv") + micro_rna_csv = os.path.join(tmp_path, "MicroRNA-part000.csv") - with open(p_csv) as f: - pr = f.read() + with open(protein_csv) as f: + protein = f.read() - with open(m_csv) as f: - mi = f.read() + with open(micro_rna_csv) as f: + micro_rna = f.read() assert passed - assert "p1;'StringProperty1';4.0;9606;'gene1|gene2';'p1';'uniprot'" in pr - assert "BiologicalEntity" in pr - assert "m1;'StringProperty1';9606;'m1';'mirbase'" in mi - assert "ChemicalEntity" in mi + assert ( + "p1;'StringProperty1';4.0;9606;'gene1|gene2';'p1';'uniprot'" in protein + ) + assert "BiologicalEntity" in protein + assert "m1;'StringProperty1';9606;'m1';'mirbase'" in micro_rna + assert "ChemicalEntity" in micro_rna def test_write_node_data_from_gen_no_props(bw): nodes = [] - le = 4 - for i in range(le): - bnp = BioCypherNode( + number_of_items = 4 + for i in range(number_of_items): + biocypher_node_protein = BioCypherNode( node_id=f"p{i+1}", node_label="protein", properties={ @@ -262,12 +266,12 @@ def test_write_node_data_from_gen_no_props(bw): "genes": ["gene1", "gene2"], }, ) - nodes.append(bnp) - bnm = BioCypherNode( + nodes.append(biocypher_node_protein) + biocypher_node_micro_rna = BioCypherNode( node_id=f"m{i+1}", node_label="microRNA", ) - nodes.append(bnm) + nodes.append(biocypher_node_micro_rna) def node_gen(nodes): yield from nodes @@ -277,20 +281,20 @@ def node_gen(nodes): tmp_path = bw.outdir assert os.path.exists(tmp_path) - p_csv = os.path.join(tmp_path, "Protein-part000.csv") - m_csv = os.path.join(tmp_path, "MicroRNA-part000.csv") + protein_csv = os.path.join(tmp_path, "Protein-part000.csv") + micro_rna_csv = os.path.join(tmp_path, "MicroRNA-part000.csv") - with open(p_csv) as f: - pr = f.read() + with open(protein_csv) as f: + protein = f.read() - with open(m_csv) as f: - mi = f.read() + with open(micro_rna_csv) as f: + micro_rna = f.read() assert passed - assert "p1;'StringProperty1';4.0;9606;'gene1|gene2';'p1';'id'" in pr - assert "BiologicalEntity" in pr - assert "m1;'m1';'id'" in mi - assert "ChemicalEntity" in mi + assert "p1;'StringProperty1';4.0;9606;'gene1|gene2';'p1';'id'" in protein + assert "BiologicalEntity" in protein + assert "m1;'m1';'id'" in micro_rna + assert "ChemicalEntity" in micro_rna @pytest.mark.parametrize("l", [int(1e4 + 4)], scope="module") @@ -307,22 +311,22 @@ def node_gen(nodes): tmp_path = bw.outdir - p0_csv = os.path.join(tmp_path, "Protein-part000.csv") - m0_csv = os.path.join(tmp_path, "MicroRNA-part000.csv") - p1_csv = os.path.join(tmp_path, "Protein-part001.csv") - m1_csv = os.path.join(tmp_path, "MicroRNA-part001.csv") + protein_0_csv = os.path.join(tmp_path, "Protein-part000.csv") + micro_rna_0_csv = os.path.join(tmp_path, "MicroRNA-part000.csv") + protein_1_csv = os.path.join(tmp_path, "Protein-part001.csv") + micro_rna_1_csv = os.path.join(tmp_path, "MicroRNA-part001.csv") - pr_lines = sum(1 for _ in open(p0_csv)) - mi_lines = sum(1 for _ in open(m0_csv)) - pr_lines1 = sum(1 for _ in open(p1_csv)) - mi_lines1 = sum(1 for _ in open(m1_csv)) + protein_lines = sum(1 for _ in open(protein_0_csv)) + micro_rna_lines = sum(1 for _ in open(micro_rna_0_csv)) + protein_lines1 = sum(1 for _ in open(protein_1_csv)) + micro_rna_lines1 = sum(1 for _ in open(micro_rna_1_csv)) assert ( passed - and pr_lines == 1e4 - and mi_lines == 1e4 - and pr_lines1 == 4 - and mi_lines1 == 4 + and protein_lines == 1e4 + and micro_rna_lines == 1e4 + and protein_lines1 == 4 + and micro_rna_lines1 == 4 ) @@ -330,7 +334,7 @@ def node_gen(nodes): def test_too_many_properties(bw, _get_nodes): nodes = _get_nodes - bn1 = BioCypherNode( + biocypher_node_1 = BioCypherNode( node_id="p0", node_label="protein", properties={ @@ -340,7 +344,7 @@ def test_too_many_properties(bw, _get_nodes): "p4": "StringProperty4", }, ) - nodes.append(bn1) + nodes.append(biocypher_node_1) def node_gen(nodes): yield from nodes @@ -357,12 +361,12 @@ def node_gen(nodes): def test_not_enough_properties(bw, _get_nodes): nodes = _get_nodes - bn1 = BioCypherNode( + biocypher_node_1 = BioCypherNode( node_id="p0", node_label="protein", properties={"p1": "StringProperty1"}, ) - nodes.append(bn1) + nodes.append(biocypher_node_1) def node_gen(nodes): yield from nodes @@ -374,9 +378,9 @@ def node_gen(nodes): tmp_path = bw.outdir - p0_csv = os.path.join(tmp_path, "Protein-part000.csv") + protein_0_csv = os.path.join(tmp_path, "Protein-part000.csv") - assert not passed and not isfile(p0_csv) + assert not passed and not isfile(protein_0_csv) def test_write_none_type_property_and_order_invariance(bw): @@ -384,7 +388,7 @@ def test_write_none_type_property_and_order_invariance(bw): # schema_config.yaml nodes = [] - bnp1 = BioCypherNode( + biocypher_node_protein_1 = BioCypherNode( node_id=f"p1", node_label="protein", properties={ @@ -394,7 +398,7 @@ def test_write_none_type_property_and_order_invariance(bw): "genes": None, }, ) - bnp2 = BioCypherNode( + biocypher_node_protein_2 = BioCypherNode( node_id=f"p2", node_label="protein", properties={ @@ -404,7 +408,7 @@ def test_write_none_type_property_and_order_invariance(bw): "taxon": 9606, }, ) - bnm = BioCypherNode( + biocypher_node_micro_rna = BioCypherNode( node_id=f"m1", node_label="microRNA", properties={ @@ -412,9 +416,9 @@ def test_write_none_type_property_and_order_invariance(bw): "taxon": 9606, }, ) - nodes.append(bnp1) - nodes.append(bnp2) - nodes.append(bnm) + nodes.append(biocypher_node_protein_1) + nodes.append(biocypher_node_protein_2) + nodes.append(biocypher_node_micro_rna) def node_gen(nodes): yield from nodes @@ -426,13 +430,13 @@ def node_gen(nodes): tmp_path = bw.outdir - p0_csv = os.path.join(tmp_path, "Protein-part000.csv") - with open(p0_csv) as f: - p = f.read() + protein_0_csv = os.path.join(tmp_path, "Protein-part000.csv") + with open(protein_0_csv) as f: + protein = f.read() assert passed - assert "p1;;1;9606;;'p1';'id'" in p - assert "BiologicalEntity" in p + assert "p1;;1;9606;;'p1';'id'" in protein + assert "BiologicalEntity" in protein @pytest.mark.parametrize("l", [int(1e4)], scope="module") @@ -449,31 +453,31 @@ def node_gen(nodes): tmp_path = bw.outdir - p0_csv = os.path.join(tmp_path, "Protein-part000.csv") - m0_csv = os.path.join(tmp_path, "MicroRNA-part000.csv") - p1_csv = os.path.join(tmp_path, "Protein-part001.csv") - m1_csv = os.path.join(tmp_path, "MicroRNA-part001.csv") + protein_0_csv = os.path.join(tmp_path, "Protein-part000.csv") + micro_rna_0_csv = os.path.join(tmp_path, "MicroRNA-part000.csv") + protein_1_csv = os.path.join(tmp_path, "Protein-part001.csv") + micro_rna_1_csv = os.path.join(tmp_path, "MicroRNA-part001.csv") - pr_lines = sum(1 for _ in open(p0_csv)) - mi_lines = sum(1 for _ in open(m0_csv)) + protein_lines = sum(1 for _ in open(protein_0_csv)) + micro_rna_lines = sum(1 for _ in open(micro_rna_0_csv)) - ph_csv = os.path.join(tmp_path, "Protein-header.csv") - mh_csv = os.path.join(tmp_path, "MicroRNA-header.csv") + protein_header_csv = os.path.join(tmp_path, "Protein-header.csv") + micro_rna_header_csv = os.path.join(tmp_path, "MicroRNA-header.csv") - with open(ph_csv) as f: - p = f.read() - with open(mh_csv) as f: - m = f.read() + with open(protein_header_csv) as f: + protein = f.read() + with open(micro_rna_header_csv) as f: + micro_rna = f.read() assert ( passed - and pr_lines == 1e4 - and mi_lines == 1e4 - and not isfile(p1_csv) - and not isfile(m1_csv) - and p + and protein_lines == 1e4 + and micro_rna_lines == 1e4 + and not isfile(protein_1_csv) + and not isfile(micro_rna_1_csv) + and protein == ":ID;name;score:double;taxon:long;genes:string[];id;preferred_id;:LABEL" - and m == ":ID;name;taxon:long;id;preferred_id;:LABEL" + and micro_rna == ":ID;name;taxon:long;id;preferred_id;:LABEL" ) @@ -492,37 +496,37 @@ def edge_gen(edges): imi_csv = os.path.join(tmp_path, "Is_Mutated_In-part000.csv") with open(pid_csv) as f: - l = f.read() + perturbed_in_disease = f.read() with open(imi_csv) as f: - c = f.read() + is_mutated_in = f.read() assert passed - assert "p0;" in l - assert "prel0;" in l - assert "'T253';" in l - assert "4;" in l - assert "p1;" in l - assert "PERTURBED_IN_DISEASE" in l - assert "p1;" in l - assert "prel1;" in l - assert "'T253';" in l - assert "4;" in l - assert "p2;" in l - assert "PERTURBED_IN_DISEASE" in l - assert "\n" in l - assert "m0;" in c - assert "mrel0;" in c - assert "'3-UTR';" in c - assert "1;" in c - assert "p1;" in c - assert "Is_Mutated_In" in c - assert "m1;" in c - assert "mrel1;" in c - assert "'3-UTR';" in c - assert "1;" in c - assert "p2;" in c - assert "Is_Mutated_In" in c - assert "\n" in c + assert "p0;" in perturbed_in_disease + assert "prel0;" in perturbed_in_disease + assert "'T253';" in perturbed_in_disease + assert "4;" in perturbed_in_disease + assert "p1;" in perturbed_in_disease + assert "PERTURBED_IN_DISEASE" in perturbed_in_disease + assert "p1;" in perturbed_in_disease + assert "prel1;" in perturbed_in_disease + assert "'T253';" in perturbed_in_disease + assert "4;" in perturbed_in_disease + assert "p2;" in perturbed_in_disease + assert "PERTURBED_IN_DISEASE" in perturbed_in_disease + assert "\n" in perturbed_in_disease + assert "m0;" in is_mutated_in + assert "mrel0;" in is_mutated_in + assert "'3-UTR';" in is_mutated_in + assert "1;" in is_mutated_in + assert "p1;" in is_mutated_in + assert "Is_Mutated_In" in is_mutated_in + assert "m1;" in is_mutated_in + assert "mrel1;" in is_mutated_in + assert "'3-UTR';" in is_mutated_in + assert "1;" in is_mutated_in + assert "p2;" in is_mutated_in + assert "Is_Mutated_In" in is_mutated_in + assert "\n" in is_mutated_in @pytest.mark.parametrize("l", [int(1e4 + 4)], scope="module") @@ -536,22 +540,30 @@ def edge_gen(edges): tmp_path = bw.outdir - apl0_csv = os.path.join(tmp_path, "PERTURBED_IN_DISEASE-part000.csv") - ips0_csv = os.path.join(tmp_path, "Is_Mutated_In-part000.csv") - apl1_csv = os.path.join(tmp_path, "PERTURBED_IN_DISEASE-part001.csv") - ips1_csv = os.path.join(tmp_path, "Is_Mutated_In-part001.csv") + perturbed_in_disease_data_0_csv = os.path.join( + tmp_path, "PERTURBED_IN_DISEASE-part000.csv" + ) + is_mutated_in_0_csv = os.path.join(tmp_path, "Is_Mutated_In-part000.csv") + perturbed_in_disease_data_1_csv = os.path.join( + tmp_path, "PERTURBED_IN_DISEASE-part001.csv" + ) + is_mutated_in_1_csv = os.path.join(tmp_path, "Is_Mutated_In-part001.csv") - l_lines0 = sum(1 for _ in open(apl0_csv)) - c_lines0 = sum(1 for _ in open(ips0_csv)) - l_lines1 = sum(1 for _ in open(apl1_csv)) - c_lines1 = sum(1 for _ in open(ips1_csv)) + perturbed_in_disease_data_0 = sum( + 1 for _ in open(perturbed_in_disease_data_0_csv) + ) + is_mutated_in_0 = sum(1 for _ in open(is_mutated_in_0_csv)) + perturbed_in_disease_data_1 = sum( + 1 for _ in open(perturbed_in_disease_data_1_csv) + ) + is_mutated_in_1 = sum(1 for _ in open(is_mutated_in_1_csv)) assert ( passed - and l_lines0 == 1e4 - and c_lines0 == 1e4 - and l_lines1 == 4 - and c_lines1 == 4 + and perturbed_in_disease_data_0 == 1e4 + and is_mutated_in_0 == 1e4 + and perturbed_in_disease_data_1 == 4 + and is_mutated_in_1 == 4 ) @@ -563,31 +575,33 @@ def test_write_edge_data_from_list(bw, _get_edges): tmp_path = bw.outdir - apl_csv = os.path.join(tmp_path, "PERTURBED_IN_DISEASE-part000.csv") - ips_csv = os.path.join(tmp_path, "Is_Mutated_In-part000.csv") + perturbed_in_disease_csv = os.path.join( + tmp_path, "PERTURBED_IN_DISEASE-part000.csv" + ) + is_mutated_in_csv = os.path.join(tmp_path, "Is_Mutated_In-part000.csv") - with open(apl_csv) as f: - l = f.read() - with open(ips_csv) as f: - c = f.read() + with open(perturbed_in_disease_csv) as f: + perturbed_in_disease = f.read() + with open(is_mutated_in_csv) as f: + is_mutated_in = f.read() assert passed - assert "p0;" in l - assert "prel0;" in l - assert "'T253';" in l - assert "4;" in l - assert "p1;" in l - assert "PERTURBED_IN_DISEASE" in l - assert "\n" in l - assert "p2;PERTURBED_IN_DISEASE" in l - assert "m0;" in c - assert "mrel0;" in c - assert "'3-UTR';" in c - assert "1;" in c - assert "p1;" in c - assert "Is_Mutated_In" in c - assert "m1;" in c - assert "\n" in c + assert "p0;" in perturbed_in_disease + assert "prel0;" in perturbed_in_disease + assert "'T253';" in perturbed_in_disease + assert "4;" in perturbed_in_disease + assert "p1;" in perturbed_in_disease + assert "PERTURBED_IN_DISEASE" in perturbed_in_disease + assert "\n" in perturbed_in_disease + assert "p2;PERTURBED_IN_DISEASE" in perturbed_in_disease + assert "m0;" in is_mutated_in + assert "mrel0;" in is_mutated_in + assert "'3-UTR';" in is_mutated_in + assert "1;" in is_mutated_in + assert "p1;" in is_mutated_in + assert "Is_Mutated_In" in is_mutated_in + assert "m1;" in is_mutated_in + assert "\n" in is_mutated_in @pytest.mark.parametrize("l", [4], scope="module") @@ -596,86 +610,94 @@ def test_write_edge_id_optional(bw, _get_edges): # add phosphorylation edges for i in range(4): - e1 = BioCypherEdge( + edge_1 = BioCypherEdge( relationship_id=f"phos{i}", # should be ignored source_id=f"p{i}", target_id=f"p{i + 1}", relationship_label="phosphorylation", ) - edges.append(e1) + edges.append(edge_1) passed = bw.write_edges(edges, batch_size=int(1e4)) assert passed tmp_path = bw.outdir - pert_csv = os.path.join(tmp_path, "PERTURBED_IN_DISEASE-part000.csv") - phos_csv = os.path.join(tmp_path, "Phosphorylation-part000.csv") + perturbed_in_disease_csv = os.path.join( + tmp_path, "PERTURBED_IN_DISEASE-part000.csv" + ) + phosphorylation_csv = os.path.join(tmp_path, "Phosphorylation-part000.csv") - with open(pert_csv) as f: - pertf = f.read() - with open(phos_csv) as f: - phosf = f.read() + with open(perturbed_in_disease_csv) as f: + perturbed_in_disease = f.read() + with open(phosphorylation_csv) as f: + phosphorylation = f.read() - assert "prel0;" in pertf - assert "phos1;" not in phosf + assert "prel0;" in perturbed_in_disease + assert "phos1;" not in phosphorylation - pert_header = os.path.join(tmp_path, "PERTURBED_IN_DISEASE-header.csv") - phos_header = os.path.join(tmp_path, "Phosphorylation-header.csv") + perturbed_in_disease_header = os.path.join( + tmp_path, "PERTURBED_IN_DISEASE-header.csv" + ) + phosphorylation_header = os.path.join( + tmp_path, "Phosphorylation-header.csv" + ) - with open(pert_header) as f: - perth = f.read() - with open(phos_header) as f: - phosh = f.read() + with open(perturbed_in_disease_header) as f: + perturbed_in_disease_header = f.read() + with open(phosphorylation_header) as f: + phosphorylation_header = f.read() - assert "id;" in perth - assert "id;" not in phosh + assert "id;" in perturbed_in_disease_header + assert "id;" not in phosphorylation_header def test_write_edge_data_from_list_no_props(bw): - le = 4 + number_of_items = 4 edges = [] - for i in range(le): - e1 = BioCypherEdge( + for i in range(number_of_items): + edge_1 = BioCypherEdge( source_id=f"p{i}", target_id=f"p{i + 1}", relationship_label="PERTURBED_IN_DISEASE", ) - edges.append(e1) - e2 = BioCypherEdge( + edges.append(edge_1) + edge_2 = BioCypherEdge( source_id=f"m{i}", target_id=f"p{i + 1}", relationship_label="Is_Mutated_In", ) - edges.append(e2) + edges.append(edge_2) passed = bw._write_edge_data(edges, batch_size=int(1e4)) tmp_path = bw.outdir - ptl_csv = os.path.join(tmp_path, "PERTURBED_IN_DISEASE-part000.csv") - pts_csv = os.path.join(tmp_path, "Is_Mutated_In-part000.csv") + perturbed_in_disease_csv = os.path.join( + tmp_path, "PERTURBED_IN_DISEASE-part000.csv" + ) + is_mutated_in_csv = os.path.join(tmp_path, "Is_Mutated_In-part000.csv") - with open(ptl_csv) as f: - l = f.read() - with open(pts_csv) as f: - c = f.read() + with open(perturbed_in_disease_csv) as f: + perturbed_in_disease = f.read() + with open(is_mutated_in_csv) as f: + is_mutated_in = f.read() assert passed - assert "p0;" in l - assert "p1;" in l - assert "PERTURBED_IN_DISEASE" in l - assert "p1;" in l - assert "p2;" in l - assert "PERTURBED_IN_DISEASE" in l - assert "\n" in l - assert "m0;" in c - assert "p1;" in c - assert "Is_Mutated_In" in c - assert "m1;" in c - assert "p2;" in c - assert "Is_Mutated_In" in c - assert "\n" in c + assert "p0;" in perturbed_in_disease + assert "p1;" in perturbed_in_disease + assert "PERTURBED_IN_DISEASE" in perturbed_in_disease + assert "p1;" in perturbed_in_disease + assert "p2;" in perturbed_in_disease + assert "PERTURBED_IN_DISEASE" in perturbed_in_disease + assert "\n" in perturbed_in_disease + assert "m0;" in is_mutated_in + assert "p1;" in is_mutated_in + assert "Is_Mutated_In" in is_mutated_in + assert "m1;" in is_mutated_in + assert "p2;" in is_mutated_in + assert "Is_Mutated_In" in is_mutated_in + assert "\n" in is_mutated_in @pytest.mark.parametrize("l", [8], scope="module") @@ -703,19 +725,23 @@ def edge_gen2(edges): tmp_path = bw.outdir - ptl_csv = os.path.join(tmp_path, "PERTURBED_IN_DISEASE-header.csv") - pts_csv = os.path.join(tmp_path, "Is_Mutated_In-header.csv") + perturbed_in_disease_csv = os.path.join( + tmp_path, "PERTURBED_IN_DISEASE-header.csv" + ) + is_mutated_in_csv = os.path.join(tmp_path, "Is_Mutated_In-header.csv") call_csv = os.path.join(tmp_path, "neo4j-admin-import-call.sh") - with open(ptl_csv) as f: - l = f.read() - with open(pts_csv) as f: - c = f.read() + with open(perturbed_in_disease_csv) as f: + perturbed_in_disease = f.read() + with open(is_mutated_in_csv) as f: + is_mutated_in = f.read() with open(call_csv) as f: call = f.read() - assert l == ":START_ID;id;residue;level:long;:END_ID;:TYPE" - assert c == ":START_ID;id;site;confidence:long;:END_ID;:TYPE" + assert ( + perturbed_in_disease == ":START_ID;id;residue;level:long;:END_ID;:TYPE" + ) + assert is_mutated_in == ":START_ID;id;site;confidence:long;:END_ID;:TYPE" assert "bin/neo4j-admin import" in call assert "--database=neo4j" in call @@ -735,13 +761,15 @@ def test_write_duplicate_edges(bw, _get_edges): tmp_path = bw.outdir - ptl_csv = os.path.join(tmp_path, "PERTURBED_IN_DISEASE-part000.csv") - pts_csv = os.path.join(tmp_path, "Is_Mutated_In-part000.csv") + perturbed_in_disease_csv = os.path.join( + tmp_path, "PERTURBED_IN_DISEASE-part000.csv" + ) + is_mutated_in_csv = os.path.join(tmp_path, "Is_Mutated_In-part000.csv") - l = sum(1 for _ in open(ptl_csv)) - c = sum(1 for _ in open(pts_csv)) + perturbed_in_disease = sum(1 for _ in open(perturbed_in_disease_csv)) + is_mutated_in = sum(1 for _ in open(is_mutated_in_csv)) - assert passed and l == 4 and c == 4 + assert passed and perturbed_in_disease == 4 and is_mutated_in == 4 @pytest.mark.parametrize("l", [4], scope="module") @@ -755,29 +783,31 @@ def gen(lis): tmp_path = bw.outdir - iso_csv = os.path.join(tmp_path, "IS_SOURCE_OF-part000.csv") - ito_csv = os.path.join(tmp_path, "IS_TARGET_OF-part000.csv") - pmi_csv = os.path.join(tmp_path, "PostTranslationalInteraction-part000.csv") + is_source_of_csv = os.path.join(tmp_path, "IS_SOURCE_OF-part000.csv") + is_target_of_csv = os.path.join(tmp_path, "IS_TARGET_OF-part000.csv") + post_translational_interaction_csv = os.path.join( + tmp_path, "PostTranslationalInteraction-part000.csv" + ) - with open(iso_csv) as f: - s = f.read() - with open(ito_csv) as f: - t = f.read() - with open(pmi_csv) as f: - p = f.read() + with open(is_source_of_csv) as f: + is_source_of = f.read() + with open(is_target_of_csv) as f: + is_target_of = f.read() + with open(post_translational_interaction_csv) as f: + post_translational_interaction = f.read() assert passed - assert "i1;" in s - assert "p1;" in s - assert "IS_SOURCE_OF" in s - assert "\n" in s - assert "i0;" in t - assert "p2;" in t - assert "IS_TARGET_OF" in t - assert "\n" in t - assert "i1;True;-1;'i1';'id'" in p - assert "Association" in p - assert "\n" in p + assert "i1;" in is_source_of + assert "p1;" in is_source_of + assert "IS_SOURCE_OF" in is_source_of + assert "\n" in is_source_of + assert "i0;" in is_target_of + assert "p2;" in is_target_of + assert "IS_TARGET_OF" in is_target_of + assert "\n" in is_target_of + assert "i1;True;-1;'i1';'id'" in post_translational_interaction + assert "Association" in post_translational_interaction + assert "\n" in post_translational_interaction @pytest.mark.parametrize("l", [8], scope="module") @@ -797,37 +827,37 @@ def gen2(lis): tmp_path = bw.outdir - iso_csv = os.path.join(tmp_path, "IS_SOURCE_OF-part001.csv") + is_source_of_csv = os.path.join(tmp_path, "IS_SOURCE_OF-part001.csv") - assert passed1 and passed2 and isfile(iso_csv) + assert passed1 and passed2 and isfile(is_source_of_csv) def test_write_mixed_edges(bw): mixed = [] - le = 4 - for i in range(le): - e3 = BioCypherEdge( + number_of_items = 4 + for i in range(number_of_items): + edge_3 = BioCypherEdge( source_id=f"p{i+1}", target_id=f"p{i+1}", relationship_label="PERTURBED_IN_DISEASE", ) - mixed.append(e3) + mixed.append(edge_3) - n = BioCypherNode( + node = BioCypherNode( f"i{i+1}", "post translational interaction", ) - e1 = BioCypherEdge( + edge_1 = BioCypherEdge( source_id=f"i{i+1}", target_id=f"p{i+1}", relationship_label="IS_SOURCE_OF", ) - e2 = BioCypherEdge( + edge_2 = BioCypherEdge( source_id=f"i{i}", target_id=f"p{i+2}", relationship_label="IS_TARGET_OF", ) - mixed.append(BioCypherRelAsNode(n, e1, e2)) + mixed.append(BioCypherRelAsNode(node, edge_1, edge_2)) def gen(lis): yield from lis @@ -836,17 +866,21 @@ def gen(lis): tmp_path = bw.outdir - pmi_csv = os.path.join(tmp_path, "PostTranslationalInteraction-header.csv") - iso_csv = os.path.join(tmp_path, "IS_SOURCE_OF-header.csv") - ito_csv = os.path.join(tmp_path, "IS_TARGET_OF-header.csv") - ipt_csv = os.path.join(tmp_path, "PERTURBED_IN_DISEASE-header.csv") + post_translational_interaction_csv = os.path.join( + tmp_path, "PostTranslationalInteraction-header.csv" + ) + is_source_of_csv = os.path.join(tmp_path, "IS_SOURCE_OF-header.csv") + is_target_of_csv = os.path.join(tmp_path, "IS_TARGET_OF-header.csv") + perturbed_in_disease_csv = os.path.join( + tmp_path, "PERTURBED_IN_DISEASE-header.csv" + ) assert ( passed - and os.path.isfile(pmi_csv) - and os.path.isfile(iso_csv) - and os.path.isfile(ito_csv) - and os.path.isfile(ipt_csv) + and os.path.isfile(post_translational_interaction_csv) + and os.path.isfile(is_source_of_csv) + and os.path.isfile(is_target_of_csv) + and os.path.isfile(perturbed_in_disease_csv) ) @@ -863,7 +897,7 @@ def test_duplicate_id(bw): # four proteins, four miRNAs for _ in range(2): - bnp = BioCypherNode( + biocypher_node_protein = BioCypherNode( node_id=f"p1", node_label="protein", properties={ @@ -873,7 +907,7 @@ def test_duplicate_id(bw): "genes": ["gene1", "gene2"], }, ) - nodes.append(bnp) + nodes.append(biocypher_node_protein) passed = bw.write_nodes(nodes) @@ -894,7 +928,7 @@ def test_write_synonym(bw): os.remove(csv) # four proteins, four miRNAs for _ in range(4): - bnp = BioCypherNode( + biocypher_node_protein = BioCypherNode( node_id=f"p{_+1}", node_label="complex", properties={ @@ -903,20 +937,20 @@ def test_write_synonym(bw): "taxon": 9606, }, ) - nodes.append(bnp) + nodes.append(biocypher_node_protein) passed = bw.write_nodes(nodes) with open(csv) as f: - comp = f.read() + complex = f.read() assert passed and os.path.exists(csv) - assert "p1;'StringProperty1';4.32;9606;'p1';'id'" in comp - assert "Complex" in comp + assert "p1;'StringProperty1';4.32;9606;'p1';'id'" in complex + assert "Complex" in complex def test_write_strict(bw_strict): - n1 = BioCypherNode( + node_1 = BioCypherNode( node_id="p1", node_label="protein", properties={ @@ -930,7 +964,7 @@ def test_write_strict(bw_strict): }, ) - passed = bw_strict.write_nodes([n1]) + passed = bw_strict.write_nodes([node_1]) assert passed @@ -939,13 +973,13 @@ def test_write_strict(bw_strict): csv = os.path.join(tmp_path, "Protein-part000.csv") with open(csv) as f: - prot = f.read() + protein = f.read() assert ( "p1;'StringProperty1';4.32;9606;'gene1|gene2';'p1';'id';'source1';'version1';'licence1'" - in prot + in protein ) - assert "BiologicalEntity" in prot + assert "BiologicalEntity" in protein @pytest.mark.parametrize("l", [4], scope="module") @@ -959,9 +993,9 @@ def test_tab_delimiter(bw_tab, _get_nodes): header = os.path.join(tmp_path, "Protein-header.csv") with open(header) as f: - prot = f.read() + protein = f.read() - assert "\t" in prot + assert "\t" in protein call = bw_tab._construct_import_call() diff --git a/test/test_write_postgres.py b/test/test_write_postgres.py index efc7339f..04021a64 100644 --- a/test/test_write_postgres.py +++ b/test/test_write_postgres.py @@ -20,22 +20,22 @@ def node_gen(nodes): tmp_path = bw_comma_postgresql.outdir - p_csv = os.path.join(tmp_path, "Protein-part000.csv") - m_csv = os.path.join(tmp_path, "MicroRNA-part000.csv") + protein_csv = os.path.join(tmp_path, "Protein-part000.csv") + micro_rna_csv = os.path.join(tmp_path, "MicroRNA-part000.csv") - with open(p_csv) as f: - pr = f.read() + with open(protein_csv) as f: + protein = f.read() - with open(m_csv) as f: - mi = f.read() + with open(micro_rna_csv) as f: + micro_rna = f.read() - assert 'p1,"StringProperty1",4.0,9606' in pr - assert "uniprot" in pr - assert "BiologicalEntity" in pr - assert "Polypeptide" in pr - assert "Protein" in pr - assert 'm1,"StringProperty1",9606,"m1","mirbase"' in mi - assert "ChemicalEntity" in mi + assert 'p1,"StringProperty1",4.0,9606' in protein + assert "uniprot" in protein + assert "BiologicalEntity" in protein + assert "Polypeptide" in protein + assert "Protein" in protein + assert 'm1,"StringProperty1",9606,"m1","mirbase"' in micro_rna + assert "ChemicalEntity" in micro_rna @pytest.mark.parametrize("l", [4], scope="module") @@ -49,23 +49,23 @@ def node_gen(nodes): tmp_path = bw_tab_postgresql.outdir - p_csv = os.path.join(tmp_path, "Protein-part000.csv") - m_csv = os.path.join(tmp_path, "MicroRNA-part000.csv") + protein_csv = os.path.join(tmp_path, "Protein-part000.csv") + micro_rna_csv = os.path.join(tmp_path, "MicroRNA-part000.csv") - with open(p_csv) as f: - pr = f.read() + with open(protein_csv) as f: + protein = f.read() - with open(m_csv) as f: - mi = f.read() + with open(micro_rna_csv) as f: + micro_rna = f.read() assert passed - assert 'p1\t"StringProperty1"\t4.0\t9606\t' in pr - assert '\t"uniprot"\t' in pr - assert "BiologicalEntity" in pr - assert "Polypeptide" in pr - assert "Protein" in pr - assert 'm1\t"StringProperty1"\t9606\t"m1"\t"mirbase"' in mi - assert "ChemicalEntity" in mi + assert 'p1\t"StringProperty1"\t4.0\t9606\t' in protein + assert '\t"uniprot"\t' in protein + assert "BiologicalEntity" in protein + assert "Polypeptide" in protein + assert "Protein" in protein + assert 'm1\t"StringProperty1"\t9606\t"m1"\t"mirbase"' in micro_rna + assert "ChemicalEntity" in micro_rna @pytest.mark.requires_postgresql @@ -241,11 +241,11 @@ def edge_gen1(edges): def edge_gen2(edges): yield from edges[4:] - p1 = bw_comma_postgresql.write_edges(edge_gen1(edges)) - p2 = bw_comma_postgresql.write_edges(edge_gen2(edges)) - p3 = bw_comma_postgresql.write_nodes(nodes) + process_1 = bw_comma_postgresql.write_edges(edge_gen1(edges)) + process_2 = bw_comma_postgresql.write_edges(edge_gen2(edges)) + process_3 = bw_comma_postgresql.write_nodes(nodes) - assert all([p1, p2, p3]) + assert all([process_1, process_2, process_3]) bw_comma_postgresql.write_import_call() @@ -319,11 +319,11 @@ def edge_gen1(edges): def edge_gen2(edges): yield from edges[4:] - p1 = bw_tab_postgresql.write_edges(edge_gen1(edges)) - p2 = bw_tab_postgresql.write_edges(edge_gen2(edges)) - p3 = bw_tab_postgresql.write_nodes(nodes) + process_1 = bw_tab_postgresql.write_edges(edge_gen1(edges)) + process_2 = bw_tab_postgresql.write_edges(edge_gen2(edges)) + process_3 = bw_tab_postgresql.write_nodes(nodes) - assert all([p1, p2, p3]) + assert all([process_1, process_2, process_3]) bw_tab_postgresql.write_import_call() From ef74095cd989b511f4139e0b6dbd26ac2e72a6ee Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Wed, 11 Oct 2023 11:55:23 +0200 Subject: [PATCH 161/343] issue #254: replace single-letter variables in source code and verify by running flake8 and check for E741 --- biocypher/_config/__init__.py | 5 ++-- poetry.lock | 55 ++++++++++++++++++++++++++++++++++- pyproject.toml | 5 ++-- test/conftest.py | 12 ++++---- test/test_core.py | 4 +-- test/test_deduplicate.py | 8 ++--- test/test_integration.py | 2 +- test/test_pandas.py | 14 ++++----- test/test_write_arango.py | 2 +- test/test_write_neo4j.py | 32 ++++++++++---------- test/test_write_postgres.py | 12 ++++---- tutorial/data_generator.py | 14 ++++++--- 12 files changed, 113 insertions(+), 52 deletions(-) diff --git a/biocypher/_config/__init__.py b/biocypher/_config/__init__.py index 3d421c1e..c017847c 100644 --- a/biocypher/_config/__init__.py +++ b/biocypher/_config/__init__.py @@ -17,7 +17,6 @@ from typing import Any, Optional import os -import re import warnings import yaml @@ -101,7 +100,9 @@ def read_config() -> dict: ) if value is not None: - if type(defaults[key]) == str: # first level config (like title) + if isinstance( + defaults[key], str + ): # first level config (like title) defaults[key] = value else: defaults[key].update(value) diff --git a/poetry.lock b/poetry.lock index f997ec0c..b7c44642 100644 --- a/poetry.lock +++ b/poetry.lock @@ -847,6 +847,23 @@ docs = ["furo (>=2023.7.26)", "sphinx (>=7.1.2)", "sphinx-autodoc-typehints (>=1 testing = ["covdefaults (>=2.3)", "coverage (>=7.3)", "diff-cover (>=7.7)", "pytest (>=7.4)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)", "pytest-timeout (>=2.1)"] typing = ["typing-extensions (>=4.7.1)"] +[[package]] +name = "flake8" +version = "6.1.0" +description = "the modular source code checker: pep8 pyflakes and co" +category = "dev" +optional = false +python-versions = ">=3.8.1" +files = [ + {file = "flake8-6.1.0-py2.py3-none-any.whl", hash = "sha256:ffdfce58ea94c6580c77888a86506937f9a1a227dfcd15f245d694ae20a6b6e5"}, + {file = "flake8-6.1.0.tar.gz", hash = "sha256:d5b3857f07c030bdb5bf41c7f53799571d75c4491748a3adcd47de929e34cd23"}, +] + +[package.dependencies] +mccabe = ">=0.7.0,<0.8.0" +pycodestyle = ">=2.11.0,<2.12.0" +pyflakes = ">=3.1.0,<3.2.0" + [[package]] name = "fonttools" version = "4.43.1" @@ -1551,6 +1568,18 @@ files = [ [package.dependencies] traitlets = "*" +[[package]] +name = "mccabe" +version = "0.7.0" +description = "McCabe checker, plugin for flake8" +category = "dev" +optional = false +python-versions = ">=3.6" +files = [ + {file = "mccabe-0.7.0-py2.py3-none-any.whl", hash = "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e"}, + {file = "mccabe-0.7.0.tar.gz", hash = "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325"}, +] + [[package]] name = "mdit-py-plugins" version = "0.3.5" @@ -2321,6 +2350,18 @@ files = [ [package.extras] tests = ["pytest"] +[[package]] +name = "pycodestyle" +version = "2.11.0" +description = "Python style guide checker" +category = "dev" +optional = false +python-versions = ">=3.8" +files = [ + {file = "pycodestyle-2.11.0-py2.py3-none-any.whl", hash = "sha256:5d1013ba8dc7895b548be5afb05740ca82454fd899971563d2ef625d090326f8"}, + {file = "pycodestyle-2.11.0.tar.gz", hash = "sha256:259bcc17857d8a8b3b4a2327324b79e5f020a13c16074670f9c8c8f872ea76d0"}, +] + [[package]] name = "pycparser" version = "2.21" @@ -2333,6 +2374,18 @@ files = [ {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"}, ] +[[package]] +name = "pyflakes" +version = "3.1.0" +description = "passive checker of Python programs" +category = "dev" +optional = false +python-versions = ">=3.8" +files = [ + {file = "pyflakes-3.1.0-py2.py3-none-any.whl", hash = "sha256:4132f6d49cb4dae6819e5379898f2b8cce3c5f23994194c24b77d5da2e36f774"}, + {file = "pyflakes-3.1.0.tar.gz", hash = "sha256:a0aae034c444db0071aa077972ba4768d40c830d9539fd45bf4cd3f8f6992efc"}, +] + [[package]] name = "pygments" version = "2.16.1" @@ -3448,4 +3501,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = "^3.9" -content-hash = "8b48ed8cc2182d2d3f1ca914ceac77222be5325c77d1713a226d09d22a1cdf98" +content-hash = "032afb6387880271a09ac351c3fe1b718e0ee17ed7f7d0a13ff845b3def0bcd8" diff --git a/pyproject.toml b/pyproject.toml index c156d329..5b7a133c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -59,6 +59,7 @@ sphinxext-opengraph = "^0.8.2" coverage-badge = "^1.1.0" nbsphinx = "^0.9.2" black = "^23.9.1" +flake8 = "^6.1.0" [build-system] requires = ["poetry-core>=1.0.0"] @@ -113,11 +114,11 @@ indent = " " profile = "black" [tool.flake8] -ignore = ["D200", "D202", "D401", "D105", "W504"] +ignore = ["E203", "D200", "D202", "D401", "D105", "W504"] per-file-ignores = [ "docs/source/conf.py:D100", "tests/*:D100,D101,D102", "*/__init__.py:F401" ] -max-line-length = 80 +max-line-length = 88 count = true diff --git a/test/conftest.py b/test/conftest.py index 4ef97f90..b163cf22 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -82,9 +82,9 @@ def remove_tmp_dir(): # biocypher node generator @pytest.fixture(scope="function") -def _get_nodes(l: int) -> list: +def _get_nodes(lenght: int) -> list: nodes = [] - for i in range(l): + for i in range(lenght): bnp = BioCypherNode( node_id=f"p{i+1}", node_label="protein", @@ -113,9 +113,9 @@ def _get_nodes(l: int) -> list: # biocypher edge generator @pytest.fixture(scope="function") -def _get_edges(l): +def _get_edges(lenght): edges = [] - for i in range(l): + for i in range(lenght): e1 = BioCypherEdge( relationship_id=f"prel{i}", source_id=f"p{i}", @@ -146,9 +146,9 @@ def _get_edges(l): @pytest.fixture(scope="function") -def _get_rel_as_nodes(l): +def _get_rel_as_nodes(lenght): rels = [] - for i in range(l): + for i in range(lenght): n = BioCypherNode( node_id=f"i{i+1}", node_label="post translational interaction", diff --git a/test/test_core.py b/test/test_core.py index 7c223bd2..14e6bbf8 100644 --- a/test/test_core.py +++ b/test/test_core.py @@ -21,7 +21,7 @@ def test_log_missing_types(core, translator): assert real_missing_types.get("a") == 1 and real_missing_types.get("b") == 2 -@pytest.mark.parametrize("l", [4], scope="function") +@pytest.mark.parametrize("lenght", [4], scope="function") def test_log_duplicates(core, deduplicator, _get_nodes): core._deduplicator = deduplicator nodes = _get_nodes + _get_nodes @@ -35,7 +35,7 @@ def test_log_duplicates(core, deduplicator, _get_nodes): assert "m1" in core._deduplicator.duplicate_entity_ids -@pytest.mark.parametrize("l", [4], scope="function") +@pytest.mark.parametrize("lenght", [4], scope="function") def test_write_schema_info(core, _get_nodes, _get_edges, _get_rel_as_nodes): core.add(_get_nodes) core.add(_get_edges) diff --git a/test/test_deduplicate.py b/test/test_deduplicate.py index a1f0beea..645bb6d1 100644 --- a/test/test_deduplicate.py +++ b/test/test_deduplicate.py @@ -4,7 +4,7 @@ from biocypher._deduplicate import Deduplicator -@pytest.mark.parametrize("l", [4], scope="module") +@pytest.mark.parametrize("lenght", [4], scope="module") def test_duplicate_nodes(_get_nodes): dedup = Deduplicator() nodes = _get_nodes @@ -28,7 +28,7 @@ def test_duplicate_nodes(_get_nodes): assert "p1" in dedup.duplicate_entity_ids -@pytest.mark.parametrize("l", [4], scope="module") +@pytest.mark.parametrize("lenght", [4], scope="module") def test_get_duplicate_nodes(_get_nodes): dedup = Deduplicator() nodes = _get_nodes @@ -56,7 +56,7 @@ def test_get_duplicate_nodes(_get_nodes): assert "p1" in ids -@pytest.mark.parametrize("l", [4], scope="module") +@pytest.mark.parametrize("lenght", [4], scope="module") def test_duplicate_edges(_get_edges): dedup = Deduplicator() edges = _get_edges @@ -82,7 +82,7 @@ def test_duplicate_edges(_get_edges): assert ("mrel2") in dedup.duplicate_relationship_ids -@pytest.mark.parametrize("l", [4], scope="module") +@pytest.mark.parametrize("lenght", [4], scope="module") def test_get_duplicate_edges(_get_edges): dedup = Deduplicator() edges = _get_edges diff --git a/test/test_integration.py b/test/test_integration.py index e632f94f..ca79bd12 100644 --- a/test/test_integration.py +++ b/test/test_integration.py @@ -3,7 +3,7 @@ import pytest -@pytest.mark.parametrize("l", [4], scope="function") +@pytest.mark.parametrize("lenght", [4], scope="function") def test_write_node_data_from_gen(core, _get_nodes): nodes = _get_nodes diff --git a/test/test_pandas.py b/test/test_pandas.py index a99d0578..7a6b98af 100644 --- a/test/test_pandas.py +++ b/test/test_pandas.py @@ -5,7 +5,7 @@ def test_pandas(_pd): assert _pd.dfs == {} -@pytest.mark.parametrize("l", [4], scope="module") +@pytest.mark.parametrize("lenght", [4], scope="module") def test_nodes(_pd, _get_nodes): _pd.add_tables(_get_nodes) assert "protein" in _pd.dfs.keys() @@ -16,7 +16,7 @@ def test_nodes(_pd, _get_nodes): assert "m2" in _pd.dfs["microRNA"]["node_id"].values -@pytest.mark.parametrize("l", [4], scope="module") +@pytest.mark.parametrize("lenght", [4], scope="module") def test_nodes_gen(_pd, _get_nodes): def node_gen(): for node in _get_nodes: @@ -26,21 +26,21 @@ def node_gen(): assert "protein" in _pd.dfs.keys() -@pytest.mark.parametrize("l", [4], scope="module") +@pytest.mark.parametrize("lenght", [4], scope="module") def test_duplicates(_pd, _get_nodes): nodes = _get_nodes + _get_nodes _pd.add_tables(nodes) assert len(_pd.dfs["protein"].node_id) == 4 -@pytest.mark.parametrize("l", [8], scope="module") +@pytest.mark.parametrize("lenght", [8], scope="module") def test_two_step_add(_pd, _get_nodes): _pd.add_tables(_get_nodes[:4]) _pd.add_tables(_get_nodes[4:]) assert len(_pd.dfs["protein"].node_id) == 8 -@pytest.mark.parametrize("l", [4], scope="module") +@pytest.mark.parametrize("lenght", [4], scope="module") def test_edges(_pd, _get_edges): _pd.add_tables(_get_edges) assert "PERTURBED_IN_DISEASE" in _pd.dfs.keys() @@ -51,7 +51,7 @@ def test_edges(_pd, _get_edges): assert "p1" in _pd.dfs["Is_Mutated_In"]["target_id"].values -@pytest.mark.parametrize("l", [4], scope="module") +@pytest.mark.parametrize("lenght", [4], scope="module") def test_edges_gen(_pd, _get_edges): def edge_gen(): for edge in _get_edges: @@ -61,7 +61,7 @@ def edge_gen(): assert "PERTURBED_IN_DISEASE" in _pd.dfs.keys() -@pytest.mark.parametrize("l", [4], scope="module") +@pytest.mark.parametrize("lenght", [4], scope="module") def test_rel_as_nodes(_pd, _get_rel_as_nodes): _pd.add_tables(_get_rel_as_nodes) assert "post translational interaction" in _pd.dfs.keys() diff --git a/test/test_write_arango.py b/test/test_write_arango.py index d2d560a7..979b2f2d 100644 --- a/test/test_write_arango.py +++ b/test/test_write_arango.py @@ -3,7 +3,7 @@ import pytest -@pytest.mark.parametrize("l", [4], scope="function") +@pytest.mark.parametrize("lenght", [4], scope="function") def test_arango_write_data_headers_import_call( bw_arango, _get_nodes, diff --git a/test/test_write_neo4j.py b/test/test_write_neo4j.py index 44722015..f3c72b3c 100644 --- a/test/test_write_neo4j.py +++ b/test/test_write_neo4j.py @@ -74,7 +74,7 @@ def gen(lis): ) -@pytest.mark.parametrize("l", [4], scope="module") +@pytest.mark.parametrize("lenght", [4], scope="module") def test_neo4j_write_node_data_headers_import_call(bw, _get_nodes): # four proteins, four miRNAs nodes = _get_nodes @@ -197,7 +197,7 @@ def test_property_types(bw): assert "BiologicalEntity" in data -@pytest.mark.parametrize("l", [4], scope="module") +@pytest.mark.parametrize("lenght", [4], scope="module") def test_write_node_data_from_list(bw, _get_nodes): nodes = _get_nodes @@ -223,7 +223,7 @@ def test_write_node_data_from_list(bw, _get_nodes): assert "ChemicalEntity" in micro_rna -@pytest.mark.parametrize("l", [4], scope="module") +@pytest.mark.parametrize("lenght", [4], scope="module") def test_write_node_data_from_gen(bw, _get_nodes): nodes = _get_nodes @@ -297,7 +297,7 @@ def node_gen(nodes): assert "ChemicalEntity" in micro_rna -@pytest.mark.parametrize("l", [int(1e4 + 4)], scope="module") +@pytest.mark.parametrize("lenght", [int(1e4 + 4)], scope="module") def test_write_node_data_from_large_gen(bw, _get_nodes): nodes = _get_nodes @@ -330,7 +330,7 @@ def node_gen(nodes): ) -@pytest.mark.parametrize("l", [1], scope="module") +@pytest.mark.parametrize("lenght", [1], scope="module") def test_too_many_properties(bw, _get_nodes): nodes = _get_nodes @@ -357,7 +357,7 @@ def node_gen(nodes): assert not passed -@pytest.mark.parametrize("l", [1], scope="module") +@pytest.mark.parametrize("lenght", [1], scope="module") def test_not_enough_properties(bw, _get_nodes): nodes = _get_nodes @@ -439,7 +439,7 @@ def node_gen(nodes): assert "BiologicalEntity" in protein -@pytest.mark.parametrize("l", [int(1e4)], scope="module") +@pytest.mark.parametrize("lenght", [int(1e4)], scope="module") def test_accidental_exact_batch_size(bw, _get_nodes): nodes = _get_nodes @@ -481,7 +481,7 @@ def node_gen(nodes): ) -@pytest.mark.parametrize("l", [4], scope="module") +@pytest.mark.parametrize("lenght", [4], scope="module") def test_write_edge_data_from_gen(bw, _get_edges): edges = _get_edges @@ -529,7 +529,7 @@ def edge_gen(edges): assert "\n" in is_mutated_in -@pytest.mark.parametrize("l", [int(1e4 + 4)], scope="module") +@pytest.mark.parametrize("lenght", [int(1e4 + 4)], scope="module") def test_write_edge_data_from_large_gen(bw, _get_edges): edges = _get_edges @@ -567,7 +567,7 @@ def edge_gen(edges): ) -@pytest.mark.parametrize("l", [4], scope="module") +@pytest.mark.parametrize("lenght", [4], scope="module") def test_write_edge_data_from_list(bw, _get_edges): edges = _get_edges @@ -604,7 +604,7 @@ def test_write_edge_data_from_list(bw, _get_edges): assert "\n" in is_mutated_in -@pytest.mark.parametrize("l", [4], scope="module") +@pytest.mark.parametrize("lenght", [4], scope="module") def test_write_edge_id_optional(bw, _get_edges): edges = _get_edges @@ -700,7 +700,7 @@ def test_write_edge_data_from_list_no_props(bw): assert "\n" in is_mutated_in -@pytest.mark.parametrize("l", [8], scope="module") +@pytest.mark.parametrize("lenght", [8], scope="module") def test_write_edge_data_headers_import_call(bw, _get_nodes, _get_edges): edges = _get_edges @@ -752,7 +752,7 @@ def edge_gen2(edges): assert "Is_Mutated_In" in call -@pytest.mark.parametrize("l", [4], scope="module") +@pytest.mark.parametrize("lenght", [4], scope="module") def test_write_duplicate_edges(bw, _get_edges): edges = _get_edges edges.append(edges[0]) @@ -772,7 +772,7 @@ def test_write_duplicate_edges(bw, _get_edges): assert passed and perturbed_in_disease == 4 and is_mutated_in == 4 -@pytest.mark.parametrize("l", [4], scope="module") +@pytest.mark.parametrize("lenght", [4], scope="module") def test_BioCypherRelAsNode_implementation(bw, _get_rel_as_nodes): trips = _get_rel_as_nodes @@ -810,7 +810,7 @@ def gen(lis): assert "\n" in post_translational_interaction -@pytest.mark.parametrize("l", [8], scope="module") +@pytest.mark.parametrize("lenght", [8], scope="module") def test_RelAsNode_overwrite_behaviour(bw, _get_rel_as_nodes): # if rel as node is called from successive write calls, SOURCE_OF, # TARGET_OF, and PART_OF should be continued, not overwritten @@ -982,7 +982,7 @@ def test_write_strict(bw_strict): assert "BiologicalEntity" in protein -@pytest.mark.parametrize("l", [4], scope="module") +@pytest.mark.parametrize("lenght", [4], scope="module") def test_tab_delimiter(bw_tab, _get_nodes): passed = bw_tab.write_nodes(_get_nodes) diff --git a/test/test_write_postgres.py b/test/test_write_postgres.py index 04021a64..35d9dff0 100644 --- a/test/test_write_postgres.py +++ b/test/test_write_postgres.py @@ -4,7 +4,7 @@ import pytest -@pytest.mark.parametrize("l", [4], scope="module") +@pytest.mark.parametrize("lenght", [4], scope="module") def test_write_node_data_from_gen_comma_postgresql( bw_comma_postgresql, _get_nodes ): @@ -38,7 +38,7 @@ def node_gen(nodes): assert "ChemicalEntity" in micro_rna -@pytest.mark.parametrize("l", [4], scope="module") +@pytest.mark.parametrize("lenght", [4], scope="module") def test_write_node_data_from_gen_tab_postgresql(bw_tab_postgresql, _get_nodes): nodes = _get_nodes @@ -69,7 +69,7 @@ def node_gen(nodes): @pytest.mark.requires_postgresql -@pytest.mark.parametrize("l", [4], scope="module") +@pytest.mark.parametrize("lenght", [4], scope="module") def test_database_import_node_data_from_gen_comma_postgresql( bw_comma_postgresql, _get_nodes, create_database_postgres ): @@ -143,7 +143,7 @@ def node_gen(nodes): @pytest.mark.requires_postgresql -@pytest.mark.parametrize("l", [5], scope="module") +@pytest.mark.parametrize("lenght", [5], scope="module") def test_database_import_node_data_from_gen_tab_postgresql( bw_tab_postgresql, _get_nodes, create_database_postgres ): @@ -217,7 +217,7 @@ def node_gen(nodes): @pytest.mark.requires_postgresql -@pytest.mark.parametrize("l", [8], scope="module") +@pytest.mark.parametrize("lenght", [8], scope="module") def test_database_import_edge_data_from_gen_comma_postgresql( bw_comma_postgresql, _get_nodes, create_database_postgres, _get_edges ): @@ -295,7 +295,7 @@ def edge_gen2(edges): @pytest.mark.requires_postgresql -@pytest.mark.parametrize("l", [8], scope="module") +@pytest.mark.parametrize("lenght", [8], scope="module") def test_database_import_edge_data_from_gen_tab_postgresql( bw_tab_postgresql, _get_nodes, create_database_postgres, _get_edges ): diff --git a/tutorial/data_generator.py b/tutorial/data_generator.py index 27f18b48..46df0847 100644 --- a/tutorial/data_generator.py +++ b/tutorial/data_generator.py @@ -72,10 +72,13 @@ def _generate_properties(self): ## random amino acid sequence # random int between 50 and 250 - l = random.randint(50, 250) + random_lenght = random.randint(50, 250) properties["sequence"] = "".join( - [random.choice("ACDEFGHIKLMNPQRSTVWY") for _ in range(l)], + [ + random.choice("ACDEFGHIKLMNPQRSTVWY") + for _ in range(random_lenght) + ], ) ## random description @@ -133,10 +136,13 @@ def _generate_properties(self): ## random amino acid sequence # random int between 50 and 250 - l = random.randint(50, 250) + random_lenght = random.randint(50, 250) properties["sequence"] = "".join( - [random.choice("ACDEFGHIKLMNPQRSTVWY") for _ in range(l)], + [ + random.choice("ACDEFGHIKLMNPQRSTVWY") + for _ in range(random_lenght) + ], ) ## random description From 62ee0f6ca3b6ac7bbfa95f2b9220ba3e406d3d17 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Wed, 11 Oct 2023 14:34:33 +0200 Subject: [PATCH 162/343] issue #256: replace globals by fixtures --- test/test_misc.py | 64 ++++++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 28 deletions(-) diff --git a/test/test_misc.py b/test/test_misc.py index e971489a..99d4ef8e 100644 --- a/test/test_misc.py +++ b/test/test_misc.py @@ -3,37 +3,45 @@ from biocypher._misc import create_tree_visualisation -inheritance_tree = { - "B": "A", - "C": "A", - "D": "B", - "E": "B", - "F": "C", - "G": "C", - "H": "E", - "I": "G", -} - -disjoint_tree = { - "B": "A", - "C": "A", - "D": "B", - "F": "E", - "G": "E", - "H": "F", -} - - -def test_tree_vis(): - tree_vis = create_tree_visualisation(inheritance_tree) + +@pytest.fixture(scope="function") +def _get_inheritance_tree() -> dict: + inheritance_tree = { + "B": "A", + "C": "A", + "D": "B", + "E": "B", + "F": "C", + "G": "C", + "H": "E", + "I": "G", + } + return inheritance_tree + + +@pytest.fixture(scope="function") +def _get_disjoint_tree() -> dict: + disjoint_tree = { + "B": "A", + "C": "A", + "D": "B", + "F": "E", + "G": "E", + "H": "F", + } + return disjoint_tree + + +def test_tree_vis(_get_inheritance_tree): + tree_vis = create_tree_visualisation(_get_inheritance_tree) assert tree_vis.DEPTH == 1 assert tree_vis.WIDTH == 2 assert tree_vis.root == "A" -def test_tree_vis_from_networkx(): - graph = nx.DiGraph(inheritance_tree) +def test_tree_vis_from_networkx(_get_inheritance_tree): + graph = nx.DiGraph(_get_inheritance_tree) tree_vis = create_tree_visualisation(graph) @@ -42,11 +50,11 @@ def test_tree_vis_from_networkx(): assert tree_vis.root == "A" -def test_disjoint_tree(): +def test_disjoint_tree(_get_disjoint_tree): with pytest.raises(ValueError): - create_tree_visualisation(disjoint_tree) + create_tree_visualisation(_get_disjoint_tree) if __name__ == "__main__": # to look at it - print(create_tree_visualisation(nx.DiGraph(inheritance_tree)).show()) + print(create_tree_visualisation(nx.DiGraph(_get_inheritance_tree)).show()) From c7c8d9275431d4192c6f7e0551f337133210e71d Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Wed, 11 Oct 2023 15:45:38 +0200 Subject: [PATCH 163/343] issue #250: document postgresql better --- docs/installation.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/installation.md b/docs/installation.md index c0749227..9d9c2bca 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -54,12 +54,14 @@ poetry install Poetry creates a virtual environment for you (starting with `biocypher-`; alternatively you can name it yourself) and installs all dependencies. -If you want to run the tests that use a Neo4j DBMS (database management system) +If you want to run the tests that use a local Neo4j or PostgreSQL DBMS (database management system) instance: - Make sure that you have a Neo4j instance with the APOC plugin installed and a database named `test` running on standard bolt port `7687` +- A PostgreSQL instance with the psql command line tool should be installed locally and running on standard port `5432` + - Activate the virtual environment by running `% poetry shell` and then run the tests by running `% pytest` in the root directory of the repository with the command line argument `--password=`. From 34b9f304ac047728be16e9142fe7b4dc8bd5cae0 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Wed, 11 Oct 2023 15:56:13 +0200 Subject: [PATCH 164/343] issue #250: rerun cicd --- .github/workflows/ci_cd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index 934be99d..e0581b7d 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -38,7 +38,7 @@ jobs: - name: Start Postgres Docker run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:11.21-bullseye #---------------------------------------------- - # run tests and code quality checks + # run tests and code quality checks #---------------------------------------------- - name: Run Tests run: poetry run pytest --password=your_password_here From 78eeb19086276e437b8c3804b556078a7cd5a225 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Thu, 19 Oct 2023 10:41:51 +0200 Subject: [PATCH 165/343] issue #259: automate github release and release notes creation process --- .github/workflows/publish.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index c35a3732..3c701cbd 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -43,3 +43,15 @@ jobs: #---------------------------------------------- - name: Publish artifact to PyPI uses: pypa/gh-action-pypi-publish@release/v1 + #---------------------------------------------- + # create Github release + #---------------------------------------------- + - name: Create Github release + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + tag: ${{ github.ref_name }} + run: | + gh release create "$tag" \ + --repo="$GITHUB_REPOSITORY" \ + --title="$tag" \ + --generate-notes From d07499c99f0301d4d4ac759618d2815dd037dcb0 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Thu, 19 Oct 2023 11:10:05 +0200 Subject: [PATCH 166/343] issue #259: improve runtime by using cached poetry installation --- .github/workflows/ci_cd.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index e0581b7d..cb06e8da 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -19,7 +19,14 @@ jobs: uses: actions/setup-python@v4 with: python-version: ${{env.PYTHON_VERSION}} + - name: Load cached Poetry installation + id: cached-poetry + uses: actions/cache@v3 + with: + path: ~/.local + key: poetry-0 - name: Install and configure Poetry + if: steps.cached-poetry.outputs.cache-hit != 'true' uses: snok/install-poetry@v1 with: version: 1.5.1 @@ -67,7 +74,14 @@ jobs: uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} + - name: Load cached Poetry installation + id: cached-poetry + uses: actions/cache@v3 + with: + path: ~/.local + key: poetry-0 - name: Install and configure Poetry + if: steps.cached-poetry.outputs.cache-hit != 'true' uses: snok/install-poetry@v1 with: version: 1.5.1 From 44c6b73577c5aa853e35915cefe53dc7d3d26828 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Thu, 19 Oct 2023 11:20:33 +0200 Subject: [PATCH 167/343] issue #259: improve runtime by using cached venv --- .github/workflows/ci_cd.yaml | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index cb06e8da..7dc5b604 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -33,9 +33,19 @@ jobs: virtualenvs-create: true virtualenvs-in-project: true #---------------------------------------------- - # install dependencies + # load cached venv if cache exists + #---------------------------------------------- + - name: Load cached venv + id: cached-poetry-dependencies + uses: actions/cache@v3 + with: + path: .venv + key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }} + #---------------------------------------------- + # install dependencies if cache does not exist #---------------------------------------------- - name: Install Dependencies + if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' run: poetry install #---------------------------------------------- # setup docker containers for testing @@ -87,18 +97,20 @@ jobs: version: 1.5.1 virtualenvs-create: true virtualenvs-in-project: true - #- name: Set Poetry Python version - # run: poetry env use ${{ matrix.python-version }} + #---------------------------------------------- + # load cached venv if cache exists + #---------------------------------------------- - name: Load cached venv - id: cached-pip-wheels + id: cached-poetry-dependencies uses: actions/cache@v3 with: - path: ~/.cache + path: .venv key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }} #---------------------------------------------- - # install dependencies + # install dependencies if cache does not exist #---------------------------------------------- - name: Install dependencies + if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' run: poetry install --no-interaction --no-root - name: Install library run: poetry install --no-interaction From a40feba696270c93bacc03949f858e8535796225 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Thu, 19 Oct 2023 11:50:03 +0200 Subject: [PATCH 168/343] issue #259: fix cross platfrom poetry caching --- .github/workflows/ci_cd.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index 7dc5b604..4ef107a4 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -24,7 +24,7 @@ jobs: uses: actions/cache@v3 with: path: ~/.local - key: poetry-0 + key: poetry-cache-${{ runner.os }}-${{ matrix.python-version }}-${{ env.POETRY_VERSION }} - name: Install and configure Poetry if: steps.cached-poetry.outputs.cache-hit != 'true' uses: snok/install-poetry@v1 @@ -70,6 +70,8 @@ jobs: os: ["ubuntu-latest", "macos-latest", "windows-latest"] python-version: ["3.9", "3.10", "3.11"] runs-on: ${{ matrix.os }} + env: + POETRY_VERSION: 1.5.1 defaults: run: shell: bash @@ -89,12 +91,12 @@ jobs: uses: actions/cache@v3 with: path: ~/.local - key: poetry-0 + key: poetry-cache-${{ runner.os }}-${{ matrix.python-version }}-${{ env.POETRY_VERSION }} - name: Install and configure Poetry if: steps.cached-poetry.outputs.cache-hit != 'true' uses: snok/install-poetry@v1 with: - version: 1.5.1 + version: ${{env.POETRY_VERSION}} virtualenvs-create: true virtualenvs-in-project: true #---------------------------------------------- From c2d41d44972ac474608556dee8c5b2fbc6058786 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Thu, 19 Oct 2023 12:19:52 +0200 Subject: [PATCH 169/343] issue #259: fix poetry cache name on push job first try to avoid duplicated code --- .github/workflows/ci_cd.yaml | 26 ++------------- .github/workflows/reusable_steps/setup.yaml | 36 +++++++++++++++++++++ 2 files changed, 38 insertions(+), 24 deletions(-) create mode 100644 .github/workflows/reusable_steps/setup.yaml diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index 4ef107a4..c23e0ed9 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -6,32 +6,10 @@ jobs: push_job: if: ${{ github.event_name == 'push' }} runs-on: ubuntu-latest - env: - PYTHON_VERSION: 3.9 steps: - #---------------------------------------------- - # check-out repo and set-up python and poetry - #---------------------------------------------- - - name: Checkout Repository - uses: actions/checkout@v4 - - name: Set up Python ${{env.PYTHON_VERSION}} - uses: actions/setup-python@v4 - with: - python-version: ${{env.PYTHON_VERSION}} - - name: Load cached Poetry installation - id: cached-poetry - uses: actions/cache@v3 - with: - path: ~/.local - key: poetry-cache-${{ runner.os }}-${{ matrix.python-version }}-${{ env.POETRY_VERSION }} - - name: Install and configure Poetry - if: steps.cached-poetry.outputs.cache-hit != 'true' - uses: snok/install-poetry@v1 - with: - version: 1.5.1 - virtualenvs-create: true - virtualenvs-in-project: true + - name: Setup + uses: nilskre/biocypher/.github/workflows/reusable_steps/setup.yaml #TODO: adapt Org #---------------------------------------------- # load cached venv if cache exists #---------------------------------------------- diff --git a/.github/workflows/reusable_steps/setup.yaml b/.github/workflows/reusable_steps/setup.yaml new file mode 100644 index 00000000..0aa6c02b --- /dev/null +++ b/.github/workflows/reusable_steps/setup.yaml @@ -0,0 +1,36 @@ +name: Setup + +run-name: ${{ github.actor }} is testing out GitHub Actions + +on: + workflow_call: + +jobs: + runs-on: ubuntu-latest + env: + PYTHON_VERSION: 3.9 + POETRY_VERSION: 1.5.1 + + steps: + #---------------------------------------------- + # check-out repo and set-up python and poetry + #---------------------------------------------- + - name: Checkout Repository + uses: actions/checkout@v4 + - name: Set up Python ${{env.PYTHON_VERSION}} + uses: actions/setup-python@v4 + with: + python-version: ${{env.PYTHON_VERSION}} + - name: Load cached Poetry installation + id: cached-poetry + uses: actions/cache@v3 + with: + path: ~/.local + key: poetry-cache-${{ runner.os }}-${{ env.PYTHON_VERSION }}-${{ env.POETRY_VERSION }} + - name: Install and configure Poetry + if: steps.cached-poetry.outputs.cache-hit != 'true' + uses: snok/install-poetry@v1 + with: + version: 1.5.1 + virtualenvs-create: true + virtualenvs-in-project: true From 170b991a2f44607dd1f1f54d61d182b6e39bce05 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Thu, 19 Oct 2023 12:22:10 +0200 Subject: [PATCH 170/343] issue #259: add branch name to reusable workflow reference --- .github/workflows/ci_cd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index c23e0ed9..bec62972 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -9,7 +9,7 @@ jobs: steps: - name: Setup - uses: nilskre/biocypher/.github/workflows/reusable_steps/setup.yaml #TODO: adapt Org + uses: nilskre/biocypher/.github/workflows/reusable_steps/setup.yaml@PyOpenSci_review_part_2 #TODO: adapt Org #---------------------------------------------- # load cached venv if cache exists #---------------------------------------------- From 46edf29c914d0f6c1c66083b4d4833989daf7d10 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Thu, 19 Oct 2023 12:32:32 +0200 Subject: [PATCH 171/343] issue #259: use composite actiomn to avoid duplication --- .github/workflows/ci_cd.yaml | 2 +- .github/workflows/reusable_steps/setup.yaml | 67 +++++++++++---------- 2 files changed, 36 insertions(+), 33 deletions(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index bec62972..7fdd4984 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -9,7 +9,7 @@ jobs: steps: - name: Setup - uses: nilskre/biocypher/.github/workflows/reusable_steps/setup.yaml@PyOpenSci_review_part_2 #TODO: adapt Org + uses: .github/workflows/reusable_steps/setup.yaml #---------------------------------------------- # load cached venv if cache exists #---------------------------------------------- diff --git a/.github/workflows/reusable_steps/setup.yaml b/.github/workflows/reusable_steps/setup.yaml index 0aa6c02b..b39f213c 100644 --- a/.github/workflows/reusable_steps/setup.yaml +++ b/.github/workflows/reusable_steps/setup.yaml @@ -1,36 +1,39 @@ -name: Setup - -run-name: ${{ github.actor }} is testing out GitHub Actions - -on: - workflow_call: - -jobs: - runs-on: ubuntu-latest +name: 'Setup' +description: 'Setup Python and Poetry' +#inputs: +# who-to-greet: # id of input +# description: 'Who to greet' +# required: true +# default: 'World' +#outputs: +# random-number: +# description: "Random number" +# value: ${{ steps.random-number-generator.outputs.random-number }} +runs: + using: "composite" env: PYTHON_VERSION: 3.9 POETRY_VERSION: 1.5.1 - steps: - #---------------------------------------------- - # check-out repo and set-up python and poetry - #---------------------------------------------- - - name: Checkout Repository - uses: actions/checkout@v4 - - name: Set up Python ${{env.PYTHON_VERSION}} - uses: actions/setup-python@v4 - with: - python-version: ${{env.PYTHON_VERSION}} - - name: Load cached Poetry installation - id: cached-poetry - uses: actions/cache@v3 - with: - path: ~/.local - key: poetry-cache-${{ runner.os }}-${{ env.PYTHON_VERSION }}-${{ env.POETRY_VERSION }} - - name: Install and configure Poetry - if: steps.cached-poetry.outputs.cache-hit != 'true' - uses: snok/install-poetry@v1 - with: - version: 1.5.1 - virtualenvs-create: true - virtualenvs-in-project: true + #---------------------------------------------- + # check-out repo and set-up python and poetry + #---------------------------------------------- + - name: Checkout Repository + uses: actions/checkout@v4 + - name: Set up Python ${{env.PYTHON_VERSION}} + uses: actions/setup-python@v4 + with: + python-version: ${{env.PYTHON_VERSION}} + - name: Load cached Poetry installation + id: cached-poetry + uses: actions/cache@v3 + with: + path: ~/.local + key: poetry-cache-${{ runner.os }}-${{ env.PYTHON_VERSION }}-${{ env.POETRY_VERSION }} + - name: Install and configure Poetry + if: steps.cached-poetry.outputs.cache-hit != 'true' + uses: snok/install-poetry@v1 + with: + version: 1.5.1 + virtualenvs-create: true + virtualenvs-in-project: true From 0f1d70f4237eb4a2bdc999a4baf1573df4a8cbbc Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Thu, 19 Oct 2023 12:34:47 +0200 Subject: [PATCH 172/343] issue #259: first checkout repo, then call setup.yaml --- .github/workflows/ci_cd.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index 7fdd4984..b7375121 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -8,6 +8,8 @@ jobs: runs-on: ubuntu-latest steps: + - name: Checkout Repository + uses: actions/checkout@v4 - name: Setup uses: .github/workflows/reusable_steps/setup.yaml #---------------------------------------------- From e3d2ead5e2cb914766e2d87cf266fb770b12d8cb Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Thu, 19 Oct 2023 12:36:01 +0200 Subject: [PATCH 173/343] issue #259: fix path --- .github/workflows/ci_cd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index b7375121..6ac53cfb 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -11,7 +11,7 @@ jobs: - name: Checkout Repository uses: actions/checkout@v4 - name: Setup - uses: .github/workflows/reusable_steps/setup.yaml + uses: ./.github/workflows/reusable_steps/setup.yaml #---------------------------------------------- # load cached venv if cache exists #---------------------------------------------- From 28c69d05a0cdf3b70fffbc29d7558c311ed70460 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Thu, 19 Oct 2023 12:41:23 +0200 Subject: [PATCH 174/343] issue #259: fix folder layout to enable composite actions --- .../setup.yaml => actions/setup_composite/action.yaml} | 2 -- .github/workflows/ci_cd.yaml | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) rename .github/{workflows/reusable_steps/setup.yaml => actions/setup_composite/action.yaml} (94%) diff --git a/.github/workflows/reusable_steps/setup.yaml b/.github/actions/setup_composite/action.yaml similarity index 94% rename from .github/workflows/reusable_steps/setup.yaml rename to .github/actions/setup_composite/action.yaml index b39f213c..76b3862f 100644 --- a/.github/workflows/reusable_steps/setup.yaml +++ b/.github/actions/setup_composite/action.yaml @@ -18,8 +18,6 @@ runs: #---------------------------------------------- # check-out repo and set-up python and poetry #---------------------------------------------- - - name: Checkout Repository - uses: actions/checkout@v4 - name: Set up Python ${{env.PYTHON_VERSION}} uses: actions/setup-python@v4 with: diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index 6ac53cfb..4ebdf24c 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -11,7 +11,7 @@ jobs: - name: Checkout Repository uses: actions/checkout@v4 - name: Setup - uses: ./.github/workflows/reusable_steps/setup.yaml + uses: ./.github/actions/setup_composite/action.yaml #---------------------------------------------- # load cached venv if cache exists #---------------------------------------------- From d4ccc2435e4d4e481dbb01df35a9f733d89be4f3 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Thu, 19 Oct 2023 12:47:54 +0200 Subject: [PATCH 175/343] issue #259: fix composite action location --- .github/workflows/ci_cd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index 4ebdf24c..1cddccf7 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -11,7 +11,7 @@ jobs: - name: Checkout Repository uses: actions/checkout@v4 - name: Setup - uses: ./.github/actions/setup_composite/action.yaml + uses: nilskre/biocypher/.github/actions/setup_composite/action.yaml@PyOpenSci_review_part_2 # TODO: adapt #---------------------------------------------- # load cached venv if cache exists #---------------------------------------------- From ed087e0c32c5235d79d8406e2d1f8ecaf97ed318 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Thu, 19 Oct 2023 12:55:08 +0200 Subject: [PATCH 176/343] issue #259: another action try --- .github/actions/{setup_composite => setup}/action.yaml | 0 .github/workflows/ci_cd.yaml | 6 ++++-- 2 files changed, 4 insertions(+), 2 deletions(-) rename .github/actions/{setup_composite => setup}/action.yaml (100%) diff --git a/.github/actions/setup_composite/action.yaml b/.github/actions/setup/action.yaml similarity index 100% rename from .github/actions/setup_composite/action.yaml rename to .github/actions/setup/action.yaml diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index 1cddccf7..1a4a80a1 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -10,8 +10,10 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v4 - - name: Setup - uses: nilskre/biocypher/.github/actions/setup_composite/action.yaml@PyOpenSci_review_part_2 # TODO: adapt + #- name: Setup + # uses: nilskre/biocypher/.github/actions/setup_composite/action.yaml@PyOpenSci_review_part_2 # TODO: adapt + - id: Setup + uses: ./.github/actions/setup #---------------------------------------------- # load cached venv if cache exists #---------------------------------------------- From 554d9e9d67d460a229452515b42d9e57963e6d2d Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Thu, 19 Oct 2023 13:04:32 +0200 Subject: [PATCH 177/343] issue #259: set python and poetry version in composite by input --- .github/actions/setup/action.yaml | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/actions/setup/action.yaml b/.github/actions/setup/action.yaml index 76b3862f..d0f2fb34 100644 --- a/.github/actions/setup/action.yaml +++ b/.github/actions/setup/action.yaml @@ -1,33 +1,35 @@ name: 'Setup' description: 'Setup Python and Poetry' -#inputs: -# who-to-greet: # id of input -# description: 'Who to greet' -# required: true -# default: 'World' +inputs: + PYTHON_VERSION: + description: 'Python version' + #required: true + default: 3.9 + POETRY_VERSION: + description: 'Poetry version' + #required: true + default: 1.5.1 #outputs: # random-number: # description: "Random number" # value: ${{ steps.random-number-generator.outputs.random-number }} + runs: using: "composite" - env: - PYTHON_VERSION: 3.9 - POETRY_VERSION: 1.5.1 steps: #---------------------------------------------- # check-out repo and set-up python and poetry #---------------------------------------------- - - name: Set up Python ${{env.PYTHON_VERSION}} + - name: Set up Python ${{inputs.PYTHON_VERSION}} uses: actions/setup-python@v4 with: - python-version: ${{env.PYTHON_VERSION}} + python-version: ${{inputs.PYTHON_VERSION}} - name: Load cached Poetry installation id: cached-poetry uses: actions/cache@v3 with: path: ~/.local - key: poetry-cache-${{ runner.os }}-${{ env.PYTHON_VERSION }}-${{ env.POETRY_VERSION }} + key: poetry-cache-${{ runner.os }}-${{ inputs.PYTHON_VERSION }}-${{ inputs.POETRY_VERSION }} - name: Install and configure Poetry if: steps.cached-poetry.outputs.cache-hit != 'true' uses: snok/install-poetry@v1 From 7c312f2bc224b3e7c2ef3ad557509b6c0461f0e9 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Thu, 19 Oct 2023 13:15:22 +0200 Subject: [PATCH 178/343] issue #259: setup for python and poetry now in reusable composite action --- .github/actions/setup/action.yaml | 11 ++--------- .github/workflows/ci_cd.yaml | 29 +++++++++-------------------- 2 files changed, 11 insertions(+), 29 deletions(-) diff --git a/.github/actions/setup/action.yaml b/.github/actions/setup/action.yaml index d0f2fb34..598b8128 100644 --- a/.github/actions/setup/action.yaml +++ b/.github/actions/setup/action.yaml @@ -3,23 +3,14 @@ description: 'Setup Python and Poetry' inputs: PYTHON_VERSION: description: 'Python version' - #required: true default: 3.9 POETRY_VERSION: description: 'Poetry version' - #required: true default: 1.5.1 -#outputs: -# random-number: -# description: "Random number" -# value: ${{ steps.random-number-generator.outputs.random-number }} runs: using: "composite" steps: - #---------------------------------------------- - # check-out repo and set-up python and poetry - #---------------------------------------------- - name: Set up Python ${{inputs.PYTHON_VERSION}} uses: actions/setup-python@v4 with: @@ -37,3 +28,5 @@ runs: version: 1.5.1 virtualenvs-create: true virtualenvs-in-project: true + - name: Check Poetry installation + run: poetry --version diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml index 1a4a80a1..fc2985b0 100644 --- a/.github/workflows/ci_cd.yaml +++ b/.github/workflows/ci_cd.yaml @@ -8,11 +8,12 @@ jobs: runs-on: ubuntu-latest steps: + #---------------------------------------------- + # checkout repo and set-up python and poetry + #---------------------------------------------- - name: Checkout Repository uses: actions/checkout@v4 - #- name: Setup - # uses: nilskre/biocypher/.github/actions/setup_composite/action.yaml@PyOpenSci_review_part_2 # TODO: adapt - - id: Setup + - name: Setup Python and Poetry uses: ./.github/actions/setup #---------------------------------------------- # load cached venv if cache exists @@ -60,27 +61,15 @@ jobs: steps: #---------------------------------------------- - # check-out repo and set-up python and poetry + # checkout repo and set-up python and poetry #---------------------------------------------- - name: Checkout Repository uses: actions/checkout@v4 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - - name: Load cached Poetry installation - id: cached-poetry - uses: actions/cache@v3 - with: - path: ~/.local - key: poetry-cache-${{ runner.os }}-${{ matrix.python-version }}-${{ env.POETRY_VERSION }} - - name: Install and configure Poetry - if: steps.cached-poetry.outputs.cache-hit != 'true' - uses: snok/install-poetry@v1 + - name: Setup Python and Poetry + uses: ./.github/actions/setup with: - version: ${{env.POETRY_VERSION}} - virtualenvs-create: true - virtualenvs-in-project: true + PYTHON_VERSION: ${{ matrix.python-version }} + POETRY_VERSION: ${{ env.POETRY_VERSION }} #---------------------------------------------- # load cached venv if cache exists #---------------------------------------------- From 683707043f7df08e0f7950b280ca28709b9ef872 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Thu, 19 Oct 2023 13:17:47 +0200 Subject: [PATCH 179/343] issue #259: specify shell --- .github/actions/setup/action.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/setup/action.yaml b/.github/actions/setup/action.yaml index 598b8128..7422d667 100644 --- a/.github/actions/setup/action.yaml +++ b/.github/actions/setup/action.yaml @@ -30,3 +30,4 @@ runs: virtualenvs-in-project: true - name: Check Poetry installation run: poetry --version + shell: bash From 56a628d8e10050a81cfe3e182adc6c10f9dc9dda Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Thu, 19 Oct 2023 13:38:59 +0200 Subject: [PATCH 180/343] issue #259: remove poetry caching for windws and macos due to different cahce pathes --- .github/actions/setup/action.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/setup/action.yaml b/.github/actions/setup/action.yaml index 7422d667..441adae0 100644 --- a/.github/actions/setup/action.yaml +++ b/.github/actions/setup/action.yaml @@ -16,6 +16,7 @@ runs: with: python-version: ${{inputs.PYTHON_VERSION}} - name: Load cached Poetry installation + if: runner.os == 'ubuntu-latest' # TODO: add support for other OS id: cached-poetry uses: actions/cache@v3 with: From 37a59e87e080285d04d221ff608c3925b342cd84 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 19 Oct 2023 14:57:56 +0200 Subject: [PATCH 181/343] added manual format specification, still need to allow not having a schema config --- biocypher/_ontology.py | 24 +++++++++++++++++++++--- test/test_ontology.py | 17 +++++++++++++++++ 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/biocypher/_ontology.py b/biocypher/_ontology.py index 2f71c660..89a5b651 100644 --- a/biocypher/_ontology.py +++ b/biocypher/_ontology.py @@ -45,6 +45,7 @@ def __init__( self, ontology_file: str, root_label: str, + format: Optional[str] = None, head_join_node: Optional[str] = None, merge_nodes: Optional[bool] = True, reverse_labels: bool = True, @@ -81,6 +82,7 @@ def __init__( self._ontology_file = ontology_file self._root_label = root_label + self._format = format self._merge_nodes = merge_nodes self._head_join_node = head_join_node self._reverse_labels = reverse_labels @@ -199,6 +201,20 @@ def _get_format(self, ontology_file): """ Get the format of the ontology file. """ + if self._format: + if self._format == "owl": + return "application/rdf+xml" + elif self._format == "obo": + raise NotImplementedError("OBO format not yet supported") + elif self._format == "rdf": + return "application/rdf+xml" + elif self._format == "ttl": + return self._format + else: + raise ValueError( + f"Could not determine format of ontology file {ontology_file}" + ) + if ontology_file.endswith(".owl"): return "application/rdf+xml" elif ontology_file.endswith(".obo"): @@ -255,7 +271,7 @@ class Ontology: def __init__( self, head_ontology: dict, - ontology_mapping: "OntologyMapping", + ontology_mapping: Optional["OntologyMapping"] = None, tail_ontologies: Optional[dict] = None, ): """ @@ -312,8 +328,9 @@ def _load_ontologies(self) -> None: logger.info("Loading ontologies...") self._head_ontology = OntologyAdapter( - self._head_ontology_meta["url"], - self._head_ontology_meta["root_node"], + ontology_file=self._head_ontology_meta["url"], + root_label=self._head_ontology_meta["root_node"], + format=self._head_ontology_meta.get("format", None), ) if self._tail_ontology_meta: @@ -323,6 +340,7 @@ def _load_ontologies(self) -> None: ontology_file=value["url"], root_label=value["tail_join_node"], head_join_node=value["head_join_node"], + format=value.get("format", None), merge_nodes=value.get("merge_nodes", True), ) diff --git a/test/test_ontology.py b/test/test_ontology.py index a40d1d02..2cd5fcc0 100644 --- a/test/test_ontology.py +++ b/test/test_ontology.py @@ -139,3 +139,20 @@ def test_disconnected_exception(disconnected_mapping): }, ontology_mapping=disconnected_mapping, ) + + +def test_manual_format(): + """ + Allow manual specification of ontology file format. Also test for allowing + no schema config use. + """ + ontology = Ontology( + head_ontology={ + "url": "http://semanticweb.cs.vu.nl/2009/11/sem/", + "root_node": "Core", + "format": "rdf", + }, + ontology_mapping=None, + ) + + assert ontology._head_ontology.get_nx_graph().number_of_nodes() == 6 From 32d4a0ce3ec5a23d9283c196be1bd90981dc05bb Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 19 Oct 2023 14:59:14 +0200 Subject: [PATCH 182/343] integration test stub --- test/test_integration.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/test_integration.py b/test/test_integration.py index ea038118..d8eed899 100644 --- a/test/test_integration.py +++ b/test/test_integration.py @@ -35,3 +35,7 @@ def test_show_ontology_structure_kwargs(core): treevis = core.show_ontology_structure(full=True) assert treevis is not None + + +def test_ontology_without_schema_config(core): + pass From 8b5f3d99e00387ff020d6587ea6e00891f0c516c Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 19 Oct 2023 15:12:25 +0200 Subject: [PATCH 183/343] conditional ontology extension --- biocypher/_ontology.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/biocypher/_ontology.py b/biocypher/_ontology.py index 89a5b651..f3bb36a3 100644 --- a/biocypher/_ontology.py +++ b/biocypher/_ontology.py @@ -312,12 +312,13 @@ def _main(self) -> None: else: self._nx_graph = self._head_ontology.get_nx_graph() - self._extend_ontology() + if self.mapping: + self._extend_ontology() - # experimental: add connections of disjoint classes to entity - self._connect_biolink_classes() + # experimental: add connections of disjoint classes to entity + self._connect_biolink_classes() - self._add_properties() + self._add_properties() def _load_ontologies(self) -> None: """ From e78d7a96a8564e85311c58966a2e00c18fe509c6 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 19 Oct 2023 15:37:07 +0200 Subject: [PATCH 184/343] change pypi upload step API URL --- .github/workflows/publish.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 3c701cbd..e202cc53 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -3,6 +3,7 @@ name: Publish on: [push] jobs: + # TODO add 'main' branch filter build_and_deploy_artifact: if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') runs-on: ubuntu-latest @@ -43,6 +44,8 @@ jobs: #---------------------------------------------- - name: Publish artifact to PyPI uses: pypa/gh-action-pypi-publish@release/v1 + with: + repository_url: https://test.pypi.org/legacy/ #---------------------------------------------- # create Github release #---------------------------------------------- From fb53d1a5ef31401f98472a164cad253ed81886a4 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Thu, 19 Oct 2023 16:16:00 +0200 Subject: [PATCH 185/343] issue #259: add permission for github action to upload release to Github; fix testpypi repository-url --- .github/workflows/publish.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index e202cc53..e71567b1 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -14,6 +14,7 @@ jobs: url: https://test.pypi.org/project/biocypher/ permissions: id-token: write + contents: write steps: #---------------------------------------------- # check-out repo and set-up python and poetry @@ -45,7 +46,7 @@ jobs: - name: Publish artifact to PyPI uses: pypa/gh-action-pypi-publish@release/v1 with: - repository_url: https://test.pypi.org/legacy/ + repository-url: https://test.pypi.org/legacy/ #---------------------------------------------- # create Github release #---------------------------------------------- From fda88c7476fa59e84991b60a44526b56065bd860 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Thu, 19 Oct 2023 17:11:32 +0200 Subject: [PATCH 186/343] issue #259: remove duplicated code in cicd config by using composite actions --- .github/actions/build_docs/action.yaml | 10 ++ .github/actions/install/action.yaml | 29 ++++ .github/actions/test/action.yaml | 28 ++++ .github/actions/test_coverage/action.yaml | 17 +++ .github/workflows/ci_cd.yaml | 126 ------------------ .github/workflows/docs.yaml | 73 +++------- .github/workflows/pr.yaml | 41 ++++++ .github/workflows/publish.yaml | 17 +-- .github/workflows/tests_and_code_quality.yaml | 32 +++++ 9 files changed, 178 insertions(+), 195 deletions(-) create mode 100644 .github/actions/build_docs/action.yaml create mode 100644 .github/actions/install/action.yaml create mode 100644 .github/actions/test/action.yaml create mode 100644 .github/actions/test_coverage/action.yaml delete mode 100644 .github/workflows/ci_cd.yaml create mode 100644 .github/workflows/pr.yaml create mode 100644 .github/workflows/tests_and_code_quality.yaml diff --git a/.github/actions/build_docs/action.yaml b/.github/actions/build_docs/action.yaml new file mode 100644 index 00000000..7b1763b8 --- /dev/null +++ b/.github/actions/build_docs/action.yaml @@ -0,0 +1,10 @@ +name: 'Build docs' +description: 'Build docs and run doc tests' + +runs: + using: "composite" + steps: + - name: Test code snippets in documentation + run: poetry run make doctest --directory docs/ + - name: Build documentation + run: poetry run make html --directory docs/ diff --git a/.github/actions/install/action.yaml b/.github/actions/install/action.yaml new file mode 100644 index 00000000..519e018f --- /dev/null +++ b/.github/actions/install/action.yaml @@ -0,0 +1,29 @@ +name: 'Install' +description: 'Install dependencies' +inputs: + PYTHON_VERSION: + description: 'Python version' + default: 3.9 + +runs: + using: "composite" + steps: + #---------------------------------------------- + # load cached venv if cache exists + #---------------------------------------------- + - name: Load cached venv + id: cached-poetry-dependencies + uses: actions/cache@v3 + with: + path: .venv + key: venv-${{ runner.os }}-${{ inputs.PYTHON_VERSION }}-${{ hashFiles('**/poetry.lock') }} + #---------------------------------------------- + # install dependencies if cache does not exist + #---------------------------------------------- + - name: Install Dependencies + if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' + run: poetry install --no-interaction --no-root + shell: bash + - name: Install library + run: poetry install --no-interaction + shell: bash diff --git a/.github/actions/test/action.yaml b/.github/actions/test/action.yaml new file mode 100644 index 00000000..e0b0f559 --- /dev/null +++ b/.github/actions/test/action.yaml @@ -0,0 +1,28 @@ +name: 'Test and code quality' +description: 'Run tests and code quality checks' + +runs: + using: "composite" + steps: + #---------------------------------------------- + # setup docker containers for testing + #---------------------------------------------- + # currently only available for ubuntu and macos + - name: Install Docker + uses: douglascamata/setup-docker-macos-action@v1-alpha + if: ${{ runner.os == 'macos-latest' }} + - name: Start Neo4j Docker + run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise + if: ${{ runner.os != 'windows-latest' }} + - name: Start Postgres Docker + run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:11.21-bullseye + if: ${{ runner.os != 'windows-latest' }} + #---------------------------------------------- + # run tests and code quality checks + #---------------------------------------------- + - name: Run Tests + run: | + source $VENV + pytest --password=your_password_here + - name: Check code quality + uses: pre-commit/action@v3.0.0 diff --git a/.github/actions/test_coverage/action.yaml b/.github/actions/test_coverage/action.yaml new file mode 100644 index 00000000..6956b817 --- /dev/null +++ b/.github/actions/test_coverage/action.yaml @@ -0,0 +1,17 @@ +name: 'Test coverage' +description: 'Check test coverage' + +runs: + using: "composite" + steps: + - name: Generate coverage report + run: poetry run coverage run -m pytest --password=your_password_here + - name: Generate coverage badge + run: poetry run coverage-badge -f -o docs/coverage/coverage.svg + - name: Commit changes + uses: s0/git-publish-subdir-action@develop + env: + REPO: self + BRANCH: coverage + FOLDER: docs/coverage + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/ci_cd.yaml b/.github/workflows/ci_cd.yaml deleted file mode 100644 index fc2985b0..00000000 --- a/.github/workflows/ci_cd.yaml +++ /dev/null @@ -1,126 +0,0 @@ -name: Tests and code quality - -on: [push, pull_request] - -jobs: - push_job: - if: ${{ github.event_name == 'push' }} - runs-on: ubuntu-latest - - steps: - #---------------------------------------------- - # checkout repo and set-up python and poetry - #---------------------------------------------- - - name: Checkout Repository - uses: actions/checkout@v4 - - name: Setup Python and Poetry - uses: ./.github/actions/setup - #---------------------------------------------- - # load cached venv if cache exists - #---------------------------------------------- - - name: Load cached venv - id: cached-poetry-dependencies - uses: actions/cache@v3 - with: - path: .venv - key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }} - #---------------------------------------------- - # install dependencies if cache does not exist - #---------------------------------------------- - - name: Install Dependencies - if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' - run: poetry install - #---------------------------------------------- - # setup docker containers for testing - #---------------------------------------------- - - name: Start Neo4j Docker - run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise - - name: Start Postgres Docker - run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:11.21-bullseye - #---------------------------------------------- - # run tests and code quality checks - #---------------------------------------------- - - name: Run Tests - run: poetry run pytest --password=your_password_here - - name: Check code quality - uses: pre-commit/action@v3.0.0 - - pull_request_job: - if: ${{ github.event_name == 'pull_request' }} - strategy: - fail-fast: true - matrix: - os: ["ubuntu-latest", "macos-latest", "windows-latest"] - python-version: ["3.9", "3.10", "3.11"] - runs-on: ${{ matrix.os }} - env: - POETRY_VERSION: 1.5.1 - defaults: - run: - shell: bash - - steps: - #---------------------------------------------- - # checkout repo and set-up python and poetry - #---------------------------------------------- - - name: Checkout Repository - uses: actions/checkout@v4 - - name: Setup Python and Poetry - uses: ./.github/actions/setup - with: - PYTHON_VERSION: ${{ matrix.python-version }} - POETRY_VERSION: ${{ env.POETRY_VERSION }} - #---------------------------------------------- - # load cached venv if cache exists - #---------------------------------------------- - - name: Load cached venv - id: cached-poetry-dependencies - uses: actions/cache@v3 - with: - path: .venv - key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }} - #---------------------------------------------- - # install dependencies if cache does not exist - #---------------------------------------------- - - name: Install dependencies - if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' - run: poetry install --no-interaction --no-root - - name: Install library - run: poetry install --no-interaction - #---------------------------------------------- - # setup docker containers for testing - #---------------------------------------------- - # currently only available for ubuntu and macos - - name: Install Docker - uses: douglascamata/setup-docker-macos-action@v1-alpha - if: ${{ matrix.os == 'macos-latest' }} - - name: Start Neo4j Docker - run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise - if: ${{ matrix.os != 'windows-latest' }} - - name: Start Postgres Docker - run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:11.21-bullseye - if: ${{ matrix.os != 'windows-latest' }} - #---------------------------------------------- - # run tests and code quality checks - #---------------------------------------------- - - name: Run Tests - run: | - source $VENV - pytest --password=your_password_here - - name: Check code quality - uses: pre-commit/action@v3.0.0 - - name: Generate coverage report - run: poetry run coverage run -m pytest --password=your_password_here - if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest' }} - - name: Generate coverage badge - run: poetry run coverage-badge -f -o docs/coverage/coverage.svg - # TODO: set to pyopensci branch to test it -> set it back to main branch after test - if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest' && github.ref == 'refs/heads/pyopensci' }} # main - - name: Commit changes - uses: s0/git-publish-subdir-action@develop - if: ${{ matrix.python-version == '3.9' && matrix.os == 'ubuntu-latest' && github.ref == 'refs/heads/pyopensci' }} # main - env: - REPO: self - BRANCH: coverage - FOLDER: docs/coverage - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 0a4e7b2a..a8e02409 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -12,39 +12,22 @@ jobs: #---------------------------------------------- # check-out repo and set-up python and poetry #---------------------------------------------- - - name: Check out main - uses: actions/checkout@main - - name: Setup Python - uses: actions/setup-python@v4 - with: - python-version: ${{env.PYTHON_VERSION}} - - name: Load cached Poetry installation - uses: actions/cache@v2 - with: - path: ~/.local - key: poetry-0 - - name: Install Poetry - uses: snok/install-poetry@v1 - with: - virtualenvs-create: true - virtualenvs-in-project: true - installer-parallel: true + - name: Checkout Repository + uses: actions/checkout@v4 + - name: Setup Python and Poetry + uses: ./.github/actions/setup #---------------------------------------------- - # install dependencies + # install dependencies #---------------------------------------------- - name: Install dependencies - run: poetry install --no-interaction --no-root - - name: Install library - run: poetry install --no-interaction + uses: ./.github/actions/install - name: Install pandoc run: sudo apt-get -y install pandoc #---------------------------------------------- # build docs #---------------------------------------------- - - name: Test code snippets in documentation - run: poetry run make doctest --directory docs/ - - name: Build documentation - run: poetry run make html --directory docs/ + - name: Install dependencies + uses: ./.github/actions/build_docs build_and_deploy_docs: if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') @@ -56,46 +39,22 @@ jobs: #---------------------------------------------- # check-out repo and set-up python and poetry #---------------------------------------------- - - name: Check out main - uses: actions/checkout@main - - name: Setup Python - uses: actions/setup-python@v4 - with: - python-version: ${{env.PYTHON_VERSION}} - - name: Load cached Poetry installation - uses: actions/cache@v2 - with: - path: ~/.local - key: poetry-0 - - name: Install Poetry - uses: snok/install-poetry@v1 - with: - virtualenvs-create: true - virtualenvs-in-project: true - installer-parallel: true - # - name: Load cached venv - # id: cached-poetry-dependencies - # uses: actions/cache@v2 - # with: - # path: .venv - # key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }} + - name: Checkout Repository + uses: actions/checkout@v4 + - name: Setup Python and Poetry + uses: ./.github/actions/setup #---------------------------------------------- - # install dependencies + # install dependencies #---------------------------------------------- - name: Install dependencies - # if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' - run: poetry install --no-interaction --no-root - - name: Install library - run: poetry install --no-interaction + uses: ./.github/actions/install - name: Install pandoc run: sudo apt-get -y install pandoc #---------------------------------------------- # build docs #---------------------------------------------- - - name: Test code snippets in documentation - run: poetry run make doctest --directory docs/ - - name: Build documentation - run: poetry run make html --directory docs/ + - name: Install dependencies + uses: ./.github/actions/build_docs - name: Commit files run: | git config --local user.email "action@github.com" diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml new file mode 100644 index 00000000..4f0da5d2 --- /dev/null +++ b/.github/workflows/pr.yaml @@ -0,0 +1,41 @@ +name: Tests and code quality checks for pull requests + +on: [pull_request] + +jobs: + tests_and_code_quality: + strategy: + fail-fast: true + matrix: + os: ["ubuntu-latest", "macos-latest", "windows-latest"] + python-version: ["3.9", "3.10", "3.11"] + runs-on: ${{ matrix.os }} + env: + POETRY_VERSION: 1.5.1 + defaults: + run: + shell: bash + + steps: + #---------------------------------------------- + # checkout repo and set-up python and poetry + #---------------------------------------------- + - name: Checkout Repository + uses: actions/checkout@v4 + - name: Setup Python and Poetry + uses: ./.github/actions/setup + with: + PYTHON_VERSION: ${{ matrix.python-version }} + POETRY_VERSION: ${{ env.POETRY_VERSION }} + #---------------------------------------------- + # install dependencies + #---------------------------------------------- + - name: Install dependencies + uses: ./.github/actions/install + with: + PYTHON_VERSION: ${{ matrix.python-version }} + #---------------------------------------------- + # run tests and code quality checks + #---------------------------------------------- + - name: Run tests + uses: ./.github/actions/test diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index e71567b1..96016087 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -21,20 +21,13 @@ jobs: #---------------------------------------------- - name: Checkout Repository uses: actions/checkout@v4 - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: ${{env.PYTHON_VERSION}} - - name: Install and configure Poetry - uses: snok/install-poetry@v1 - with: - version: 1.5.1 - virtualenvs-create: false + - name: Setup Python and Poetry + uses: ./.github/actions/setup #---------------------------------------------- - # install dependencies + # install dependencies #---------------------------------------------- - - name: Install Dependencies - run: poetry install + - name: Install dependencies + uses: ./.github/actions/install #---------------------------------------------- # build artifact #---------------------------------------------- diff --git a/.github/workflows/tests_and_code_quality.yaml b/.github/workflows/tests_and_code_quality.yaml new file mode 100644 index 00000000..18d98c86 --- /dev/null +++ b/.github/workflows/tests_and_code_quality.yaml @@ -0,0 +1,32 @@ +name: Tests and code quality + +on: [push] + +jobs: + tests_and_code_quality: + runs-on: ubuntu-latest + + steps: + #---------------------------------------------- + # checkout repo and set-up python and poetry + #---------------------------------------------- + - name: Checkout Repository + uses: actions/checkout@v4 + - name: Setup Python and Poetry + uses: ./.github/actions/setup + #---------------------------------------------- + # install dependencies + #---------------------------------------------- + - name: Install dependencies + uses: ./.github/actions/install + #---------------------------------------------- + # run tests and code quality checks + #---------------------------------------------- + - name: Run tests + uses: ./.github/actions/test + #---------------------------------------------- + # generate test coverage badge + #---------------------------------------------- + - name: Generate test coverage badge + uses: ./.github/actions/test_coverage + if: github.ref == 'refs/heads/main' From 32be5f06cf8e683b44847173a1112d2e6180852d Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Thu, 19 Oct 2023 17:17:10 +0200 Subject: [PATCH 187/343] issue #259: specify shell and add main branch rule for publish workflow --- .github/actions/build_docs/action.yaml | 2 ++ .github/actions/test/action.yaml | 3 +++ .github/actions/test_coverage/action.yaml | 2 ++ .github/workflows/publish.yaml | 11 +++++++++-- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/actions/build_docs/action.yaml b/.github/actions/build_docs/action.yaml index 7b1763b8..3f403980 100644 --- a/.github/actions/build_docs/action.yaml +++ b/.github/actions/build_docs/action.yaml @@ -6,5 +6,7 @@ runs: steps: - name: Test code snippets in documentation run: poetry run make doctest --directory docs/ + shell: bash - name: Build documentation run: poetry run make html --directory docs/ + shell: bash diff --git a/.github/actions/test/action.yaml b/.github/actions/test/action.yaml index e0b0f559..b0a2b520 100644 --- a/.github/actions/test/action.yaml +++ b/.github/actions/test/action.yaml @@ -13,9 +13,11 @@ runs: if: ${{ runner.os == 'macos-latest' }} - name: Start Neo4j Docker run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise + shell: bash if: ${{ runner.os != 'windows-latest' }} - name: Start Postgres Docker run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:11.21-bullseye + shell: bash if: ${{ runner.os != 'windows-latest' }} #---------------------------------------------- # run tests and code quality checks @@ -24,5 +26,6 @@ runs: run: | source $VENV pytest --password=your_password_here + shell: bash - name: Check code quality uses: pre-commit/action@v3.0.0 diff --git a/.github/actions/test_coverage/action.yaml b/.github/actions/test_coverage/action.yaml index 6956b817..52cc4120 100644 --- a/.github/actions/test_coverage/action.yaml +++ b/.github/actions/test_coverage/action.yaml @@ -6,8 +6,10 @@ runs: steps: - name: Generate coverage report run: poetry run coverage run -m pytest --password=your_password_here + shell: bash - name: Generate coverage badge run: poetry run coverage-badge -f -o docs/coverage/coverage.svg + shell: bash - name: Commit changes uses: s0/git-publish-subdir-action@develop env: diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 96016087..f862cfb3 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -1,9 +1,16 @@ name: Publish -on: [push] +#on: [push] +# TODO: switch to this rules after successful test +on: + push: + branches: + - main + tags: + # TODO: ensure semver structure of tags + - '*' jobs: - # TODO add 'main' branch filter build_and_deploy_artifact: if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') runs-on: ubuntu-latest From 276d969d5244adeaeea2ccf8e60cd06311ede29f Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Thu, 19 Oct 2023 17:43:11 +0200 Subject: [PATCH 188/343] issue #259: check if tag corresponds to semver; correct runner.os checks --- .github/actions/setup/action.yaml | 2 +- .github/actions/test/action.yaml | 6 +++--- .github/workflows/docs.yaml | 4 ---- .github/workflows/publish.yaml | 24 ++++++++++++++++-------- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/.github/actions/setup/action.yaml b/.github/actions/setup/action.yaml index 441adae0..216afd91 100644 --- a/.github/actions/setup/action.yaml +++ b/.github/actions/setup/action.yaml @@ -16,7 +16,7 @@ runs: with: python-version: ${{inputs.PYTHON_VERSION}} - name: Load cached Poetry installation - if: runner.os == 'ubuntu-latest' # TODO: add support for other OS + if: runner.os == 'Linux' # TODO: add support for other OS id: cached-poetry uses: actions/cache@v3 with: diff --git a/.github/actions/test/action.yaml b/.github/actions/test/action.yaml index b0a2b520..7a60f1de 100644 --- a/.github/actions/test/action.yaml +++ b/.github/actions/test/action.yaml @@ -10,15 +10,15 @@ runs: # currently only available for ubuntu and macos - name: Install Docker uses: douglascamata/setup-docker-macos-action@v1-alpha - if: ${{ runner.os == 'macos-latest' }} + if: ${{ runner.os == 'macOS' }} - name: Start Neo4j Docker run: docker run --restart always --publish=7474:7474 --publish=7687:7687 --env NEO4J_AUTH=neo4j/your_password_here --env NEO4J_PLUGINS='["apoc"]' --env=NEO4J_ACCEPT_LICENSE_AGREEMENT=yes -d neo4j:4.4-enterprise shell: bash - if: ${{ runner.os != 'windows-latest' }} + if: ${{ runner.os != 'Windows' }} - name: Start Postgres Docker run: docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres:11.21-bullseye shell: bash - if: ${{ runner.os != 'windows-latest' }} + if: ${{ runner.os != 'Windows' }} #---------------------------------------------- # run tests and code quality checks #---------------------------------------------- diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index a8e02409..8ed6b6eb 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -5,8 +5,6 @@ on: [push, pull_request] jobs: build_docs: runs-on: ubuntu-latest - env: - PYTHON_VERSION: 3.10.5 permissions: write-all steps: #---------------------------------------------- @@ -32,8 +30,6 @@ jobs: build_and_deploy_docs: if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') runs-on: ubuntu-latest - env: - PYTHON_VERSION: 3.10.5 permissions: write-all steps: #---------------------------------------------- diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index f862cfb3..a5583184 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -1,14 +1,13 @@ name: Publish -#on: [push] +on: [push] # TODO: switch to this rules after successful test -on: - push: - branches: - - main - tags: - # TODO: ensure semver structure of tags - - '*' +#on: +# push: +# branches: +# - main +# tags: +# - '*' jobs: build_and_deploy_artifact: @@ -36,6 +35,15 @@ jobs: - name: Install dependencies uses: ./.github/actions/install #---------------------------------------------- + # check if tag follows semver + #---------------------------------------------- + - name: Validate tag name + run: | + if [[ ! "$GITHUB_REF" =~ ^(?P0|[1-9]\d*)\.(?P0|[1-9]\d*)\.(?P0|[1-9]\d*)(?:-(?P(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$ ]]; then + echo "Tag name is not in SemVer format (vX.Y.Z). Aborting." + exit 1 + fi + #---------------------------------------------- # build artifact #---------------------------------------------- - name: Build artifact From 1bba609078f601d7b8bd6334dfe420f906538a50 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Thu, 19 Oct 2023 18:00:46 +0200 Subject: [PATCH 189/343] issue #259: rerun cicd --- .github/actions/test/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/test/action.yaml b/.github/actions/test/action.yaml index 7a60f1de..5e90be24 100644 --- a/.github/actions/test/action.yaml +++ b/.github/actions/test/action.yaml @@ -20,7 +20,7 @@ runs: shell: bash if: ${{ runner.os != 'Windows' }} #---------------------------------------------- - # run tests and code quality checks + # run tests and code quality checks #---------------------------------------------- - name: Run Tests run: | From fce5445d538e6d1f9296915e875ab4f88c5cbb2d Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Thu, 19 Oct 2023 18:10:20 +0200 Subject: [PATCH 190/343] issue #259: fix path issue for venv activation --- .github/actions/test/action.yaml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/actions/test/action.yaml b/.github/actions/test/action.yaml index 5e90be24..55a5d9f5 100644 --- a/.github/actions/test/action.yaml +++ b/.github/actions/test/action.yaml @@ -22,10 +22,16 @@ runs: #---------------------------------------------- # run tests and code quality checks #---------------------------------------------- + - run: | + source .venv/scripts/activate + pytest --version + if: runner.os == 'Windows' + - run: | + source .venv/bin/activate + pytest --version + if: runner.os != 'Windows' - name: Run Tests - run: | - source $VENV - pytest --password=your_password_here + run: pytest --password=your_password_here shell: bash - name: Check code quality uses: pre-commit/action@v3.0.0 From e2c1c94a4210fa2ab016627baa6d917261782e6f Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Thu, 19 Oct 2023 18:11:47 +0200 Subject: [PATCH 191/343] issue #259: add shell --- .github/actions/test/action.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/actions/test/action.yaml b/.github/actions/test/action.yaml index 55a5d9f5..b5924bcf 100644 --- a/.github/actions/test/action.yaml +++ b/.github/actions/test/action.yaml @@ -25,10 +25,12 @@ runs: - run: | source .venv/scripts/activate pytest --version + shell: bash if: runner.os == 'Windows' - run: | source .venv/bin/activate pytest --version + shell: bash if: runner.os != 'Windows' - name: Run Tests run: pytest --password=your_password_here From f348946b0546d72edd417fc34e22d7506b23b154 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Thu, 19 Oct 2023 18:22:41 +0200 Subject: [PATCH 192/343] issue #259: another test --- .github/actions/test/action.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/actions/test/action.yaml b/.github/actions/test/action.yaml index b5924bcf..e1323f40 100644 --- a/.github/actions/test/action.yaml +++ b/.github/actions/test/action.yaml @@ -33,7 +33,9 @@ runs: shell: bash if: runner.os != 'Windows' - name: Run Tests - run: pytest --password=your_password_here + run: | + source $VENV + pytest --password=your_password_here shell: bash - name: Check code quality uses: pre-commit/action@v3.0.0 From 58d411798c5241195e969593488dd49cf2a0d1b1 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Thu, 19 Oct 2023 18:30:34 +0200 Subject: [PATCH 193/343] issue #259: another test --- .github/actions/test/action.yaml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/actions/test/action.yaml b/.github/actions/test/action.yaml index e1323f40..a9292faf 100644 --- a/.github/actions/test/action.yaml +++ b/.github/actions/test/action.yaml @@ -22,20 +22,19 @@ runs: #---------------------------------------------- # run tests and code quality checks #---------------------------------------------- - - run: | + - name: Run Tests (Windows) + run: | source .venv/scripts/activate pytest --version + pytest --password=your_password_here shell: bash if: runner.os == 'Windows' - - run: | + - name: Run tests (Linux and MacOS) + run: | source .venv/bin/activate pytest --version - shell: bash - if: runner.os != 'Windows' - - name: Run Tests - run: | - source $VENV pytest --password=your_password_here shell: bash + if: runner.os != 'Windows' - name: Check code quality uses: pre-commit/action@v3.0.0 From 708630943a4c74850a7f6b75ae7d338a667cf600 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 19 Oct 2023 19:06:28 +0200 Subject: [PATCH 194/343] adjust ontology test --- test/test_ontology.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/test_ontology.py b/test/test_ontology.py index 2cd5fcc0..c7c8cfe8 100644 --- a/test/test_ontology.py +++ b/test/test_ontology.py @@ -155,4 +155,5 @@ def test_manual_format(): ontology_mapping=None, ) - assert ontology._head_ontology.get_nx_graph().number_of_nodes() == 6 + assert isinstance(ontology._nx_graph, nx.DiGraph) + assert "event" in ontology._nx_graph.nodes From 8a79ba044b37def2646471d9c09f52220926b589 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 19 Oct 2023 19:06:39 +0200 Subject: [PATCH 195/343] replace value error with warning --- biocypher/_core.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/biocypher/_core.py b/biocypher/_core.py index bed9e778..ca179a9c 100644 --- a/biocypher/_core.py +++ b/biocypher/_core.py @@ -133,11 +133,7 @@ def __init__( ) if not self._schema_config_path: - raise ValueError( - "BioCypher requires a schema configuration; please provide a " - "path to the schema configuration YAML file via " - "`biocypher_config.yaml` or `BioCypher` class parameter." - ) + logger.warning("Running BioCypher without schema configuration.") self._head_ontology = head_ontology or self.base_config["head_ontology"] From 425f8409f1e6f478125bdd902ee246171683ef04 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 19 Oct 2023 19:07:01 +0200 Subject: [PATCH 196/343] disable default schema config to enable running .. without one --- biocypher/_config/biocypher_config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/biocypher/_config/biocypher_config.yaml b/biocypher/_config/biocypher_config.yaml index b371060c..60a6a620 100644 --- a/biocypher/_config/biocypher_config.yaml +++ b/biocypher/_config/biocypher_config.yaml @@ -11,7 +11,7 @@ biocypher: ## Schema configuration - schema_config_path: config/schema_config.yaml + # schema_config_path: config/schema_config.yaml ## Offline mode: do not connect to a running DBMS instance ## Can be used e.g. for writing batch import files From 254bf3f5f59e3e3e08379c8d6def0e976f418594 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 19 Oct 2023 19:07:14 +0200 Subject: [PATCH 197/343] core class without schema config path --- test/conftest.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/test/conftest.py b/test/conftest.py index 4ef97f90..d620341d 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -332,6 +332,31 @@ def create_core(request, tmp_path_session): os.remove(os.path.join(tmp_path_session, f)) +@pytest.fixture(name="core_no_schema", scope="function") +def create_core_no_schema(request, tmp_path_session): + marker = request.node.get_closest_marker("inject_core_args") + + marker_args = {} + # check if marker has attribute param + if marker and hasattr(marker, "param"): + marker_args = marker.param + + else: + core_args = { + "schema_config_path": None, + "output_directory": tmp_path_session, + } + core_args.update(marker_args) + + c = BioCypher(**core_args) + + yield c + + # teardown + for f in os.listdir(tmp_path_session): + os.remove(os.path.join(tmp_path_session, f)) + + @pytest.fixture(scope="function") def _pd(deduplicator): return Pandas( From cc3af8855f1696db6d873c70acd5cb003d84cf59 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 19 Oct 2023 19:07:44 +0200 Subject: [PATCH 198/343] check for the successful creation of biocypher class without schema --- test/test_integration.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test_integration.py b/test/test_integration.py index d8eed899..1b9654d0 100644 --- a/test/test_integration.py +++ b/test/test_integration.py @@ -37,5 +37,5 @@ def test_show_ontology_structure_kwargs(core): assert treevis is not None -def test_ontology_without_schema_config(core): - pass +def test_ontology_without_schema_config(core_no_schema): + assert core_no_schema From e5e6f3f151e6d1c96da12b837ffdd01a00aa8ded Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 19 Oct 2023 19:53:02 +0200 Subject: [PATCH 199/343] allow mapping to be None --- biocypher/_core.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/biocypher/_core.py b/biocypher/_core.py index ca179a9c..7a4da455 100644 --- a/biocypher/_core.py +++ b/biocypher/_core.py @@ -178,6 +178,9 @@ def _get_ontology_mapping(self) -> OntologyMapping: Create ontology mapping if not exists and return. """ + if not self._schema_config_path: + return None + if not self._ontology_mapping: self._ontology_mapping = OntologyMapping( config_file=self._schema_config_path, From 7184e33b917cddd0ff728e76bd17c8fce07568ae Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 19 Oct 2023 19:53:22 +0200 Subject: [PATCH 200/343] extend integration test to building an ontology --- test/test_integration.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/test/test_integration.py b/test/test_integration.py index 1b9654d0..95af9ed3 100644 --- a/test/test_integration.py +++ b/test/test_integration.py @@ -1,6 +1,9 @@ import os import pytest +import networkx as nx + +from biocypher._ontology import Ontology @pytest.mark.parametrize("l", [4], scope="function") @@ -39,3 +42,15 @@ def test_show_ontology_structure_kwargs(core): def test_ontology_without_schema_config(core_no_schema): assert core_no_schema + + core_no_schema._head_ontology = { + "url": "http://semanticweb.cs.vu.nl/2009/11/sem/", + "root_node": "Core", + "format": "rdf", + } + core_no_schema._ontology_mapping = None + + core_no_schema._get_ontology() + + assert isinstance(core_no_schema._ontology, Ontology) + assert isinstance(core_no_schema._ontology._nx_graph, nx.DiGraph) From de8011161e7d8f9bc5ed8815f957a6dfc3ac07cd Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 19 Oct 2023 19:59:47 +0200 Subject: [PATCH 201/343] raise error when attempting to visualise without .. schema configuration --- biocypher/_ontology.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/biocypher/_ontology.py b/biocypher/_ontology.py index f3bb36a3..7f7dc99b 100644 --- a/biocypher/_ontology.py +++ b/biocypher/_ontology.py @@ -547,6 +547,15 @@ def show_ontology_structure(self, to_disk: str = None, full: bool = False): edges that are relevant to the extended schema will be shown. """ + if not full and not self.mapping.extended_schema: + raise ValueError( + "You are attempting to visualise a subset of the loaded" + "ontology, but have not provided a schema configuration. " + "To display a partial ontology graph, please provide a schema " + "configuration file; to visualise the full graph, please use " + "the parameter `full = True`." + ) + if not self._nx_graph: raise ValueError("Ontology not loaded.") From b042d8732021005a3cd06e009fcd712643dce38e Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 19 Oct 2023 20:13:20 +0200 Subject: [PATCH 202/343] =?UTF-8?q?Bump=20version:=200.5.23=20=E2=86=92=20?= =?UTF-8?q?0.5.24?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- biocypher/_metadata.py | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index c2ec8277..042651d7 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.5.23 +current_version = 0.5.24 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+) diff --git a/biocypher/_metadata.py b/biocypher/_metadata.py index 9fdc46bc..da74841e 100644 --- a/biocypher/_metadata.py +++ b/biocypher/_metadata.py @@ -19,7 +19,7 @@ import toml -_VERSION = "0.5.23" +_VERSION = "0.5.24" def get_metadata(): diff --git a/pyproject.toml b/pyproject.toml index b5bce8c5..61bb8a27 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "biocypher" -version = "0.5.23" +version = "0.5.24" description = "A unifying framework for biomedical research knowledge graphs" authors = [ "Sebastian Lobentanzer ", From 559892df2f15b289cbaa6d112ef1333994da5a8b Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 19 Oct 2023 21:15:34 +0200 Subject: [PATCH 203/343] enable defaults for log and output directory .. in config --- biocypher/_config/biocypher_config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/biocypher/_config/biocypher_config.yaml b/biocypher/_config/biocypher_config.yaml index 60a6a620..02b58a7a 100644 --- a/biocypher/_config/biocypher_config.yaml +++ b/biocypher/_config/biocypher_config.yaml @@ -37,11 +37,11 @@ biocypher: ## Set to change the log directory - # log_directory: biocypher-log + log_directory: biocypher-log ## Set to change the output directory - # output_directory: biocypher-out + output_directory: biocypher-out ## Set to change the cache directory From ebd333315cc41ea0e45016386679c206c16d8906 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 19 Oct 2023 21:32:45 +0200 Subject: [PATCH 204/343] add `as_node` function to write schema info .. directly to graph. non-functional; don't know how to make an exception for the schema_info node in the schema config (if not in there, it .. will not pass the filters) --- biocypher/_core.py | 11 ++++++++++- test/test_integration.py | 15 +++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/biocypher/_core.py b/biocypher/_core.py index 7a4da455..f97bdea2 100644 --- a/biocypher/_core.py +++ b/biocypher/_core.py @@ -554,7 +554,7 @@ def write_import_call(self) -> None: self._writer.write_import_call() - def write_schema_info(self) -> None: + def write_schema_info(self, as_node: bool = False) -> None: """ Write an extended schema info YAML file that extends the `schema_config.yaml` with run-time information of the built KG. For @@ -619,6 +619,15 @@ class instance, which contains all expanded entities and relationships. with open(path, "w") as f: f.write(yaml.dump(schema)) + if as_node: + # write as node + node = BioCypherNode( + node_id="schema_info", + node_label="schema_info", + properties={"schema_info": yaml.dump(schema)}, + ) + self.write_nodes([node]) + return schema # TRANSLATION METHODS ### diff --git a/test/test_integration.py b/test/test_integration.py index 95af9ed3..d9c05422 100644 --- a/test/test_integration.py +++ b/test/test_integration.py @@ -54,3 +54,18 @@ def test_ontology_without_schema_config(core_no_schema): assert isinstance(core_no_schema._ontology, Ontology) assert isinstance(core_no_schema._ontology._nx_graph, nx.DiGraph) + + +@pytest.mark.parametrize("l", [4], scope="function") +def test_write_schema_info_as_node(core, _get_nodes): + core.add(_get_nodes) + + schema = core.write_schema_info(as_node=True) + + path = os.path.join(core._output_directory, "schema_info.yaml") + assert os.path.exists(path) + + with open(path, "r") as f: + schema_loaded = yaml.safe_load(f) + + assert schema_loaded == schema From 202e1d06aebc116819981ade9018268215eb86dd Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 19 Oct 2023 21:39:52 +0200 Subject: [PATCH 205/343] make the schema in schema info creation .. independent from the ontology.mapping object (leads to problems if .. used after writing the schema) --- biocypher/_core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/biocypher/_core.py b/biocypher/_core.py index f97bdea2..de5f21d4 100644 --- a/biocypher/_core.py +++ b/biocypher/_core.py @@ -578,7 +578,7 @@ class instance, which contains all expanded entities and relationships. ) ontology = self._get_ontology() - schema = ontology.mapping.extended_schema + schema = ontology.mapping.extended_schema.copy() schema["is_schema_info"] = True deduplicator = self._get_deduplicator() From b7ee2bc4d1d384e2d94e54a50a8a73cce6fc0f8a Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 19 Oct 2023 21:50:23 +0200 Subject: [PATCH 206/343] move output directory check and creation to the .. core class to ensure always having an output directory --- biocypher/_core.py | 7 +++++++ biocypher/_write.py | 8 ++------ test/test_integration.py | 1 + 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/biocypher/_core.py b/biocypher/_core.py index de5f21d4..b4d7da74 100644 --- a/biocypher/_core.py +++ b/biocypher/_core.py @@ -13,6 +13,7 @@ submodules. """ from typing import Optional +from datetime import datetime import os from more_itertools import peekable @@ -221,6 +222,12 @@ def _get_writer(self): """ if self._offline: + timestamp = lambda: datetime.now().strftime("%Y%m%d%H%M%S") + outdir = self._output_directory or os.path.join( + "biocypher-out", timestamp() + ) + self._output_directory = os.path.abspath(outdir) + self._writer = get_writer( dbms=self._dbms, translator=self._get_translator(), diff --git a/biocypher/_write.py b/biocypher/_write.py index c66965b6..40d08390 100644 --- a/biocypher/_write.py +++ b/biocypher/_write.py @@ -183,7 +183,7 @@ class contains all methods expected by a bach writer instance, some of quote: The quote character to use for the CSV files. - dirname: + output_directory: Path for exporting CSV files. db_name: @@ -1887,10 +1887,6 @@ def get_writer( dbms_config = _config(dbms) - timestamp = lambda: datetime.now().strftime("%Y%m%d%H%M%S") - outdir = output_directory or os.path.join("biocypher-out", timestamp()) - outdir = os.path.abspath(outdir) - writer = DBMS_TO_CLASS[dbms] if not writer: @@ -1903,7 +1899,7 @@ def get_writer( delimiter=dbms_config.get("delimiter"), array_delimiter=dbms_config.get("array_delimiter"), quote=dbms_config.get("quote_character"), - output_directory=outdir, + output_directory=output_directory, db_name=dbms_config.get("database_name"), import_call_bin_prefix=dbms_config.get("import_call_bin_prefix"), import_call_file_prefix=dbms_config.get("import_call_file_prefix"), diff --git a/test/test_integration.py b/test/test_integration.py index d9c05422..12681058 100644 --- a/test/test_integration.py +++ b/test/test_integration.py @@ -1,5 +1,6 @@ import os +import yaml import pytest import networkx as nx From 8674521a39c967de4e44c5cf3ffde190ee73e7ab Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Fri, 20 Oct 2023 00:13:30 +0200 Subject: [PATCH 207/343] add force method to skip ancestry when writing .. nodes --- biocypher/_core.py | 18 ++++++++++++++---- biocypher/_write.py | 31 ++++++++++++++++++++++++------- test/test_integration.py | 29 +++++++++++++++++++++++------ 3 files changed, 61 insertions(+), 17 deletions(-) diff --git a/biocypher/_core.py b/biocypher/_core.py index b4d7da74..bdd9faa8 100644 --- a/biocypher/_core.py +++ b/biocypher/_core.py @@ -15,6 +15,7 @@ from typing import Optional from datetime import datetime import os +import json from more_itertools import peekable import yaml @@ -252,7 +253,9 @@ def _get_driver(self): else: raise NotImplementedError("Cannot get driver in offline mode.") - def write_nodes(self, nodes, batch_size: int = int(1e6)) -> bool: + def write_nodes( + self, nodes, batch_size: int = int(1e6), force: bool = False + ) -> bool: """ Write nodes to database. Either takes an iterable of tuples (if given, translates to ``BioCypherNode`` objects) or an iterable of @@ -261,6 +264,11 @@ def write_nodes(self, nodes, batch_size: int = int(1e6)) -> bool: Args: nodes (iterable): An iterable of nodes to write to the database. + batch_size (int): The batch size to use when writing to disk. + + force (bool): Whether to force writing to the output directory even + if the node type is not present in the schema config file. + Returns: bool: True if successful. """ @@ -274,7 +282,9 @@ def write_nodes(self, nodes, batch_size: int = int(1e6)) -> bool: else: tnodes = nodes # write node files - return self._writer.write_nodes(tnodes, batch_size=batch_size) + return self._writer.write_nodes( + tnodes, batch_size=batch_size, force=force + ) def write_edges(self, edges, batch_size: int = int(1e6)) -> bool: """ @@ -631,9 +641,9 @@ class instance, which contains all expanded entities and relationships. node = BioCypherNode( node_id="schema_info", node_label="schema_info", - properties={"schema_info": yaml.dump(schema)}, + properties={"schema_info": json.dumps(schema)}, ) - self.write_nodes([node]) + self.write_nodes([node], force=True) return schema diff --git a/biocypher/_write.py b/biocypher/_write.py index 40d08390..19a668c5 100644 --- a/biocypher/_write.py +++ b/biocypher/_write.py @@ -302,7 +302,9 @@ def _process_delimiter(self, delimiter: str) -> str: else: return delimiter, delimiter - def write_nodes(self, nodes, batch_size: int = int(1e6)): + def write_nodes( + self, nodes, batch_size: int = int(1e6), force: bool = False + ): """ Wrapper for writing nodes and their headers. @@ -310,13 +312,19 @@ def write_nodes(self, nodes, batch_size: int = int(1e6)): nodes (BioCypherNode): a list or generator of nodes in :py:class:`BioCypherNode` format + batch_size (int): The batch size for writing nodes. + + force (bool): Whether to force writing nodes even if their type is + not present in the schema. + + Returns: bool: The return value. True for success, False otherwise. """ # TODO check represented_as # write node data - passed = self._write_node_data(nodes, batch_size) + passed = self._write_node_data(nodes, batch_size, force) if not passed: logger.error("Error while writing node data.") return False @@ -393,7 +401,7 @@ def write_edges( return True - def _write_node_data(self, nodes, batch_size): + def _write_node_data(self, nodes, batch_size, force): """ Writes biocypher nodes to CSV conforming to the headers created with `_write_node_headers()`, and is actually required to be run @@ -444,13 +452,17 @@ def _write_node_data(self, nodes, batch_size): bin_l[label] = 1 # get properties from config if present - cprops = ( - self.translator.ontology.mapping.extended_schema.get( + if ( + label + in self.translator.ontology.mapping.extended_schema + ): + cprops = self.translator.ontology.mapping.extended_schema.get( label ).get( "properties", ) - ) + else: + cprops = None if cprops: d = dict(cprops) @@ -483,7 +495,12 @@ def _write_node_data(self, nodes, batch_size): # get label hierarchy # multiple labels: - all_labels = self.translator.ontology.get_ancestors(label) + if not force: + all_labels = self.translator.ontology.get_ancestors( + label + ) + else: + all_labels = None if all_labels: # convert to pascal case diff --git a/test/test_integration.py b/test/test_integration.py index 12681058..80dd1791 100644 --- a/test/test_integration.py +++ b/test/test_integration.py @@ -1,9 +1,11 @@ import os +import json -import yaml import pytest import networkx as nx +import pandas as pd + from biocypher._ontology import Ontology @@ -63,10 +65,25 @@ def test_write_schema_info_as_node(core, _get_nodes): schema = core.write_schema_info(as_node=True) - path = os.path.join(core._output_directory, "schema_info.yaml") - assert os.path.exists(path) + header_path = os.path.join(core._output_directory, "Schema_info-header.csv") + assert os.path.exists(header_path) + schema_path = os.path.join( + core._output_directory, "Schema_info-part000.csv" + ) + assert os.path.exists(schema_path) + + with open(header_path, "r") as f: + schema_header = f.read() + + assert "schema_info" in schema_header + + # read schema_path with pandas + schema_df = pd.read_csv(schema_path, sep=";", header=None) - with open(path, "r") as f: - schema_loaded = yaml.safe_load(f) + # get the second column of the first row and decode from json dumps format + string = schema_df.iloc[0, 1] + # fix initial and end quotes + string = string[1:-1] + schema_part = json.loads(string) - assert schema_loaded == schema + assert schema_part == schema From c45fe1ecd90bb38301b21500f2642c65059fd49d Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Fri, 20 Oct 2023 00:14:43 +0200 Subject: [PATCH 208/343] deactivate default folders again, should be .. taken care of by moving outdir folder generation to core module --- biocypher/_config/biocypher_config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/biocypher/_config/biocypher_config.yaml b/biocypher/_config/biocypher_config.yaml index 02b58a7a..60a6a620 100644 --- a/biocypher/_config/biocypher_config.yaml +++ b/biocypher/_config/biocypher_config.yaml @@ -37,11 +37,11 @@ biocypher: ## Set to change the log directory - log_directory: biocypher-log + # log_directory: biocypher-log ## Set to change the output directory - output_directory: biocypher-out + # output_directory: biocypher-out ## Set to change the cache directory From ad04c8d7ef1bcbfef0d665ffaa98c63448b35f92 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Fri, 20 Oct 2023 00:28:19 +0200 Subject: [PATCH 209/343] default force value in `_write_node_data` --- biocypher/_write.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/biocypher/_write.py b/biocypher/_write.py index 19a668c5..4e8a420d 100644 --- a/biocypher/_write.py +++ b/biocypher/_write.py @@ -401,7 +401,7 @@ def write_edges( return True - def _write_node_data(self, nodes, batch_size, force): + def _write_node_data(self, nodes, batch_size, force: bool = False): """ Writes biocypher nodes to CSV conforming to the headers created with `_write_node_headers()`, and is actually required to be run From 7b534d3c5a2992b3610d78f488ee3f2bd8d61856 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Fri, 20 Oct 2023 00:37:09 +0200 Subject: [PATCH 210/343] =?UTF-8?q?Bump=20version:=200.5.24=20=E2=86=92=20?= =?UTF-8?q?0.5.25?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- biocypher/_metadata.py | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 042651d7..2f07592a 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.5.24 +current_version = 0.5.25 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+) diff --git a/biocypher/_metadata.py b/biocypher/_metadata.py index da74841e..b429f552 100644 --- a/biocypher/_metadata.py +++ b/biocypher/_metadata.py @@ -19,7 +19,7 @@ import toml -_VERSION = "0.5.24" +_VERSION = "0.5.25" def get_metadata(): diff --git a/pyproject.toml b/pyproject.toml index 61bb8a27..2901244b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "biocypher" -version = "0.5.24" +version = "0.5.25" description = "A unifying framework for biomedical research knowledge graphs" authors = [ "Sebastian Lobentanzer ", From 983694859b6f6e2babe64f6da5deaf5c67f48386 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Fri, 20 Oct 2023 11:58:23 +0200 Subject: [PATCH 211/343] semver check, docs build on main only --- .github/workflows/docs.yaml | 5 ++++- .github/workflows/publish.yaml | 25 ++++++++----------------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 8ed6b6eb..c15f8742 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -1,6 +1,9 @@ name: Docs -on: [push, pull_request] +on: + push: + branches: + - main jobs: build_docs: diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index a5583184..bd86c8e1 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -1,13 +1,13 @@ name: Publish -on: [push] -# TODO: switch to this rules after successful test -#on: -# push: -# branches: -# - main -# tags: -# - '*' +on: + push: + branches: + - pyopensci + - main + tags: + - "[0-9]+.[0-9]+.[0-9]+" + - "[0-9]+.[0-9]+.[0-9]+(a|b|rc|post|dev)[0-9]+" jobs: build_and_deploy_artifact: @@ -35,15 +35,6 @@ jobs: - name: Install dependencies uses: ./.github/actions/install #---------------------------------------------- - # check if tag follows semver - #---------------------------------------------- - - name: Validate tag name - run: | - if [[ ! "$GITHUB_REF" =~ ^(?P0|[1-9]\d*)\.(?P0|[1-9]\d*)\.(?P0|[1-9]\d*)(?:-(?P(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$ ]]; then - echo "Tag name is not in SemVer format (vX.Y.Z). Aborting." - exit 1 - fi - #---------------------------------------------- # build artifact #---------------------------------------------- - name: Build artifact From cc346a332493412d9f65676ce530335804c5fea9 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Fri, 20 Oct 2023 12:20:59 +0200 Subject: [PATCH 212/343] modify recognised tags --- .github/workflows/publish.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index bd86c8e1..4b0c4100 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -6,8 +6,7 @@ on: - pyopensci - main tags: - - "[0-9]+.[0-9]+.[0-9]+" - - "[0-9]+.[0-9]+.[0-9]+(a|b|rc|post|dev)[0-9]+" + - "^[0-9]+.[0-9]+.[0-9]+(-[a-z]+)?(.[0-9]+)?$" jobs: build_and_deploy_artifact: From bea694c6b20096093861b68b98f2c2c9a3a9d934 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Fri, 20 Oct 2023 12:22:09 +0200 Subject: [PATCH 213/343] remove start and end of string matching --- .github/workflows/publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 4b0c4100..c163d813 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -6,7 +6,7 @@ on: - pyopensci - main tags: - - "^[0-9]+.[0-9]+.[0-9]+(-[a-z]+)?(.[0-9]+)?$" + - "[0-9]+.[0-9]+.[0-9]+(-[a-z]+)?(.[0-9]+)?" jobs: build_and_deploy_artifact: From 142e927e29873ef4ff572b3bf7c318146f699fa4 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Fri, 20 Oct 2023 12:25:27 +0200 Subject: [PATCH 214/343] test tag filter --- .github/workflows/publish.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index c163d813..44bc6451 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -5,8 +5,8 @@ on: branches: - pyopensci - main - tags: - - "[0-9]+.[0-9]+.[0-9]+(-[a-z]+)?(.[0-9]+)?" + # tags: + # - "[0-9]+.[0-9]+.[0-9]+(-[a-z]+)?(.[0-9]+)?" jobs: build_and_deploy_artifact: From 7fbc83abdbedd4520d2bebd50e117be9096dde09 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Fri, 20 Oct 2023 12:30:36 +0200 Subject: [PATCH 215/343] test tag wildcard --- .github/workflows/publish.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 44bc6451..90e06705 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -5,7 +5,8 @@ on: branches: - pyopensci - main - # tags: + tags: + - '*' # - "[0-9]+.[0-9]+.[0-9]+(-[a-z]+)?(.[0-9]+)?" jobs: From 6ed89d6042227c119c2c43ddf1f31849db4bcd43 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Fri, 20 Oct 2023 12:38:32 +0200 Subject: [PATCH 216/343] adjust test to conftest setup, fix typo --- test/conftest.py | 12 ++++++------ test/test_core.py | 4 ++-- test/test_deduplicate.py | 8 ++++---- test/test_integration.py | 4 ++-- test/test_pandas.py | 14 +++++++------- test/test_write_arango.py | 2 +- test/test_write_neo4j.py | 32 ++++++++++++++++---------------- test/test_write_postgres.py | 12 ++++++------ tutorial/data_generator.py | 8 ++++---- 9 files changed, 48 insertions(+), 48 deletions(-) diff --git a/test/conftest.py b/test/conftest.py index 2e68b5d5..fcbf5b7f 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -82,9 +82,9 @@ def remove_tmp_dir(): # biocypher node generator @pytest.fixture(scope="function") -def _get_nodes(lenght: int) -> list: +def _get_nodes(length: int) -> list: nodes = [] - for i in range(lenght): + for i in range(length): bnp = BioCypherNode( node_id=f"p{i+1}", node_label="protein", @@ -113,9 +113,9 @@ def _get_nodes(lenght: int) -> list: # biocypher edge generator @pytest.fixture(scope="function") -def _get_edges(lenght): +def _get_edges(length): edges = [] - for i in range(lenght): + for i in range(length): e1 = BioCypherEdge( relationship_id=f"prel{i}", source_id=f"p{i}", @@ -146,9 +146,9 @@ def _get_edges(lenght): @pytest.fixture(scope="function") -def _get_rel_as_nodes(lenght): +def _get_rel_as_nodes(length): rels = [] - for i in range(lenght): + for i in range(length): n = BioCypherNode( node_id=f"i{i+1}", node_label="post translational interaction", diff --git a/test/test_core.py b/test/test_core.py index 14e6bbf8..54cfeac6 100644 --- a/test/test_core.py +++ b/test/test_core.py @@ -21,7 +21,7 @@ def test_log_missing_types(core, translator): assert real_missing_types.get("a") == 1 and real_missing_types.get("b") == 2 -@pytest.mark.parametrize("lenght", [4], scope="function") +@pytest.mark.parametrize("length", [4], scope="function") def test_log_duplicates(core, deduplicator, _get_nodes): core._deduplicator = deduplicator nodes = _get_nodes + _get_nodes @@ -35,7 +35,7 @@ def test_log_duplicates(core, deduplicator, _get_nodes): assert "m1" in core._deduplicator.duplicate_entity_ids -@pytest.mark.parametrize("lenght", [4], scope="function") +@pytest.mark.parametrize("length", [4], scope="function") def test_write_schema_info(core, _get_nodes, _get_edges, _get_rel_as_nodes): core.add(_get_nodes) core.add(_get_edges) diff --git a/test/test_deduplicate.py b/test/test_deduplicate.py index 645bb6d1..c997f54b 100644 --- a/test/test_deduplicate.py +++ b/test/test_deduplicate.py @@ -4,7 +4,7 @@ from biocypher._deduplicate import Deduplicator -@pytest.mark.parametrize("lenght", [4], scope="module") +@pytest.mark.parametrize("length", [4], scope="module") def test_duplicate_nodes(_get_nodes): dedup = Deduplicator() nodes = _get_nodes @@ -28,7 +28,7 @@ def test_duplicate_nodes(_get_nodes): assert "p1" in dedup.duplicate_entity_ids -@pytest.mark.parametrize("lenght", [4], scope="module") +@pytest.mark.parametrize("length", [4], scope="module") def test_get_duplicate_nodes(_get_nodes): dedup = Deduplicator() nodes = _get_nodes @@ -56,7 +56,7 @@ def test_get_duplicate_nodes(_get_nodes): assert "p1" in ids -@pytest.mark.parametrize("lenght", [4], scope="module") +@pytest.mark.parametrize("length", [4], scope="module") def test_duplicate_edges(_get_edges): dedup = Deduplicator() edges = _get_edges @@ -82,7 +82,7 @@ def test_duplicate_edges(_get_edges): assert ("mrel2") in dedup.duplicate_relationship_ids -@pytest.mark.parametrize("lenght", [4], scope="module") +@pytest.mark.parametrize("length", [4], scope="module") def test_get_duplicate_edges(_get_edges): dedup = Deduplicator() edges = _get_edges diff --git a/test/test_integration.py b/test/test_integration.py index 4d7680a0..03a5de53 100644 --- a/test/test_integration.py +++ b/test/test_integration.py @@ -9,7 +9,7 @@ from biocypher._ontology import Ontology -@pytest.mark.parametrize("lenght", [4], scope="function") +@pytest.mark.parametrize("length", [4], scope="function") def test_write_node_data_from_gen(core, _get_nodes): nodes = _get_nodes @@ -62,7 +62,7 @@ def test_ontology_without_schema_config(core_no_schema): assert isinstance(core_no_schema._ontology._nx_graph, nx.DiGraph) -@pytest.mark.parametrize("l", [4], scope="function") +@pytest.mark.parametrize("length", [4], scope="function") def test_write_schema_info_as_node(core, _get_nodes): core.add(_get_nodes) diff --git a/test/test_pandas.py b/test/test_pandas.py index 7a6b98af..6519ef58 100644 --- a/test/test_pandas.py +++ b/test/test_pandas.py @@ -5,7 +5,7 @@ def test_pandas(_pd): assert _pd.dfs == {} -@pytest.mark.parametrize("lenght", [4], scope="module") +@pytest.mark.parametrize("length", [4], scope="module") def test_nodes(_pd, _get_nodes): _pd.add_tables(_get_nodes) assert "protein" in _pd.dfs.keys() @@ -16,7 +16,7 @@ def test_nodes(_pd, _get_nodes): assert "m2" in _pd.dfs["microRNA"]["node_id"].values -@pytest.mark.parametrize("lenght", [4], scope="module") +@pytest.mark.parametrize("length", [4], scope="module") def test_nodes_gen(_pd, _get_nodes): def node_gen(): for node in _get_nodes: @@ -26,21 +26,21 @@ def node_gen(): assert "protein" in _pd.dfs.keys() -@pytest.mark.parametrize("lenght", [4], scope="module") +@pytest.mark.parametrize("length", [4], scope="module") def test_duplicates(_pd, _get_nodes): nodes = _get_nodes + _get_nodes _pd.add_tables(nodes) assert len(_pd.dfs["protein"].node_id) == 4 -@pytest.mark.parametrize("lenght", [8], scope="module") +@pytest.mark.parametrize("length", [8], scope="module") def test_two_step_add(_pd, _get_nodes): _pd.add_tables(_get_nodes[:4]) _pd.add_tables(_get_nodes[4:]) assert len(_pd.dfs["protein"].node_id) == 8 -@pytest.mark.parametrize("lenght", [4], scope="module") +@pytest.mark.parametrize("length", [4], scope="module") def test_edges(_pd, _get_edges): _pd.add_tables(_get_edges) assert "PERTURBED_IN_DISEASE" in _pd.dfs.keys() @@ -51,7 +51,7 @@ def test_edges(_pd, _get_edges): assert "p1" in _pd.dfs["Is_Mutated_In"]["target_id"].values -@pytest.mark.parametrize("lenght", [4], scope="module") +@pytest.mark.parametrize("length", [4], scope="module") def test_edges_gen(_pd, _get_edges): def edge_gen(): for edge in _get_edges: @@ -61,7 +61,7 @@ def edge_gen(): assert "PERTURBED_IN_DISEASE" in _pd.dfs.keys() -@pytest.mark.parametrize("lenght", [4], scope="module") +@pytest.mark.parametrize("length", [4], scope="module") def test_rel_as_nodes(_pd, _get_rel_as_nodes): _pd.add_tables(_get_rel_as_nodes) assert "post translational interaction" in _pd.dfs.keys() diff --git a/test/test_write_arango.py b/test/test_write_arango.py index 979b2f2d..03edddd4 100644 --- a/test/test_write_arango.py +++ b/test/test_write_arango.py @@ -3,7 +3,7 @@ import pytest -@pytest.mark.parametrize("lenght", [4], scope="function") +@pytest.mark.parametrize("length", [4], scope="function") def test_arango_write_data_headers_import_call( bw_arango, _get_nodes, diff --git a/test/test_write_neo4j.py b/test/test_write_neo4j.py index f3c72b3c..7fc68394 100644 --- a/test/test_write_neo4j.py +++ b/test/test_write_neo4j.py @@ -74,7 +74,7 @@ def gen(lis): ) -@pytest.mark.parametrize("lenght", [4], scope="module") +@pytest.mark.parametrize("length", [4], scope="module") def test_neo4j_write_node_data_headers_import_call(bw, _get_nodes): # four proteins, four miRNAs nodes = _get_nodes @@ -197,7 +197,7 @@ def test_property_types(bw): assert "BiologicalEntity" in data -@pytest.mark.parametrize("lenght", [4], scope="module") +@pytest.mark.parametrize("length", [4], scope="module") def test_write_node_data_from_list(bw, _get_nodes): nodes = _get_nodes @@ -223,7 +223,7 @@ def test_write_node_data_from_list(bw, _get_nodes): assert "ChemicalEntity" in micro_rna -@pytest.mark.parametrize("lenght", [4], scope="module") +@pytest.mark.parametrize("length", [4], scope="module") def test_write_node_data_from_gen(bw, _get_nodes): nodes = _get_nodes @@ -297,7 +297,7 @@ def node_gen(nodes): assert "ChemicalEntity" in micro_rna -@pytest.mark.parametrize("lenght", [int(1e4 + 4)], scope="module") +@pytest.mark.parametrize("length", [int(1e4 + 4)], scope="module") def test_write_node_data_from_large_gen(bw, _get_nodes): nodes = _get_nodes @@ -330,7 +330,7 @@ def node_gen(nodes): ) -@pytest.mark.parametrize("lenght", [1], scope="module") +@pytest.mark.parametrize("length", [1], scope="module") def test_too_many_properties(bw, _get_nodes): nodes = _get_nodes @@ -357,7 +357,7 @@ def node_gen(nodes): assert not passed -@pytest.mark.parametrize("lenght", [1], scope="module") +@pytest.mark.parametrize("length", [1], scope="module") def test_not_enough_properties(bw, _get_nodes): nodes = _get_nodes @@ -439,7 +439,7 @@ def node_gen(nodes): assert "BiologicalEntity" in protein -@pytest.mark.parametrize("lenght", [int(1e4)], scope="module") +@pytest.mark.parametrize("length", [int(1e4)], scope="module") def test_accidental_exact_batch_size(bw, _get_nodes): nodes = _get_nodes @@ -481,7 +481,7 @@ def node_gen(nodes): ) -@pytest.mark.parametrize("lenght", [4], scope="module") +@pytest.mark.parametrize("length", [4], scope="module") def test_write_edge_data_from_gen(bw, _get_edges): edges = _get_edges @@ -529,7 +529,7 @@ def edge_gen(edges): assert "\n" in is_mutated_in -@pytest.mark.parametrize("lenght", [int(1e4 + 4)], scope="module") +@pytest.mark.parametrize("length", [int(1e4 + 4)], scope="module") def test_write_edge_data_from_large_gen(bw, _get_edges): edges = _get_edges @@ -567,7 +567,7 @@ def edge_gen(edges): ) -@pytest.mark.parametrize("lenght", [4], scope="module") +@pytest.mark.parametrize("length", [4], scope="module") def test_write_edge_data_from_list(bw, _get_edges): edges = _get_edges @@ -604,7 +604,7 @@ def test_write_edge_data_from_list(bw, _get_edges): assert "\n" in is_mutated_in -@pytest.mark.parametrize("lenght", [4], scope="module") +@pytest.mark.parametrize("length", [4], scope="module") def test_write_edge_id_optional(bw, _get_edges): edges = _get_edges @@ -700,7 +700,7 @@ def test_write_edge_data_from_list_no_props(bw): assert "\n" in is_mutated_in -@pytest.mark.parametrize("lenght", [8], scope="module") +@pytest.mark.parametrize("length", [8], scope="module") def test_write_edge_data_headers_import_call(bw, _get_nodes, _get_edges): edges = _get_edges @@ -752,7 +752,7 @@ def edge_gen2(edges): assert "Is_Mutated_In" in call -@pytest.mark.parametrize("lenght", [4], scope="module") +@pytest.mark.parametrize("length", [4], scope="module") def test_write_duplicate_edges(bw, _get_edges): edges = _get_edges edges.append(edges[0]) @@ -772,7 +772,7 @@ def test_write_duplicate_edges(bw, _get_edges): assert passed and perturbed_in_disease == 4 and is_mutated_in == 4 -@pytest.mark.parametrize("lenght", [4], scope="module") +@pytest.mark.parametrize("length", [4], scope="module") def test_BioCypherRelAsNode_implementation(bw, _get_rel_as_nodes): trips = _get_rel_as_nodes @@ -810,7 +810,7 @@ def gen(lis): assert "\n" in post_translational_interaction -@pytest.mark.parametrize("lenght", [8], scope="module") +@pytest.mark.parametrize("length", [8], scope="module") def test_RelAsNode_overwrite_behaviour(bw, _get_rel_as_nodes): # if rel as node is called from successive write calls, SOURCE_OF, # TARGET_OF, and PART_OF should be continued, not overwritten @@ -982,7 +982,7 @@ def test_write_strict(bw_strict): assert "BiologicalEntity" in protein -@pytest.mark.parametrize("lenght", [4], scope="module") +@pytest.mark.parametrize("length", [4], scope="module") def test_tab_delimiter(bw_tab, _get_nodes): passed = bw_tab.write_nodes(_get_nodes) diff --git a/test/test_write_postgres.py b/test/test_write_postgres.py index 35d9dff0..3d9cbea3 100644 --- a/test/test_write_postgres.py +++ b/test/test_write_postgres.py @@ -4,7 +4,7 @@ import pytest -@pytest.mark.parametrize("lenght", [4], scope="module") +@pytest.mark.parametrize("length", [4], scope="module") def test_write_node_data_from_gen_comma_postgresql( bw_comma_postgresql, _get_nodes ): @@ -38,7 +38,7 @@ def node_gen(nodes): assert "ChemicalEntity" in micro_rna -@pytest.mark.parametrize("lenght", [4], scope="module") +@pytest.mark.parametrize("length", [4], scope="module") def test_write_node_data_from_gen_tab_postgresql(bw_tab_postgresql, _get_nodes): nodes = _get_nodes @@ -69,7 +69,7 @@ def node_gen(nodes): @pytest.mark.requires_postgresql -@pytest.mark.parametrize("lenght", [4], scope="module") +@pytest.mark.parametrize("length", [4], scope="module") def test_database_import_node_data_from_gen_comma_postgresql( bw_comma_postgresql, _get_nodes, create_database_postgres ): @@ -143,7 +143,7 @@ def node_gen(nodes): @pytest.mark.requires_postgresql -@pytest.mark.parametrize("lenght", [5], scope="module") +@pytest.mark.parametrize("length", [5], scope="module") def test_database_import_node_data_from_gen_tab_postgresql( bw_tab_postgresql, _get_nodes, create_database_postgres ): @@ -217,7 +217,7 @@ def node_gen(nodes): @pytest.mark.requires_postgresql -@pytest.mark.parametrize("lenght", [8], scope="module") +@pytest.mark.parametrize("length", [8], scope="module") def test_database_import_edge_data_from_gen_comma_postgresql( bw_comma_postgresql, _get_nodes, create_database_postgres, _get_edges ): @@ -295,7 +295,7 @@ def edge_gen2(edges): @pytest.mark.requires_postgresql -@pytest.mark.parametrize("lenght", [8], scope="module") +@pytest.mark.parametrize("length", [8], scope="module") def test_database_import_edge_data_from_gen_tab_postgresql( bw_tab_postgresql, _get_nodes, create_database_postgres, _get_edges ): diff --git a/tutorial/data_generator.py b/tutorial/data_generator.py index 46df0847..2ef144d9 100644 --- a/tutorial/data_generator.py +++ b/tutorial/data_generator.py @@ -72,12 +72,12 @@ def _generate_properties(self): ## random amino acid sequence # random int between 50 and 250 - random_lenght = random.randint(50, 250) + random_length = random.randint(50, 250) properties["sequence"] = "".join( [ random.choice("ACDEFGHIKLMNPQRSTVWY") - for _ in range(random_lenght) + for _ in range(random_length) ], ) @@ -136,12 +136,12 @@ def _generate_properties(self): ## random amino acid sequence # random int between 50 and 250 - random_lenght = random.randint(50, 250) + random_length = random.randint(50, 250) properties["sequence"] = "".join( [ random.choice("ACDEFGHIKLMNPQRSTVWY") - for _ in range(random_lenght) + for _ in range(random_length) ], ) From f8513cde9855b94d1575fb8860d007027c81e292 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Wed, 25 Oct 2023 12:20:44 +0200 Subject: [PATCH 217/343] overwrite import call to include schema info --- biocypher/_core.py | 3 +++ test/test_integration.py | 12 +++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/biocypher/_core.py b/biocypher/_core.py index bdd9faa8..0fcffd25 100644 --- a/biocypher/_core.py +++ b/biocypher/_core.py @@ -645,6 +645,9 @@ class instance, which contains all expanded entities and relationships. ) self.write_nodes([node], force=True) + # override import call with added schema info node + self.write_import_call() + return schema # TRANSLATION METHODS ### diff --git a/test/test_integration.py b/test/test_integration.py index 03a5de53..54f60da3 100644 --- a/test/test_integration.py +++ b/test/test_integration.py @@ -64,7 +64,7 @@ def test_ontology_without_schema_config(core_no_schema): @pytest.mark.parametrize("length", [4], scope="function") def test_write_schema_info_as_node(core, _get_nodes): - core.add(_get_nodes) + core.write_nodes(_get_nodes) schema = core.write_schema_info(as_node=True) @@ -90,3 +90,13 @@ def test_write_schema_info_as_node(core, _get_nodes): schema_part = json.loads(string) assert schema_part == schema + + # test import call + import_call_path = os.path.join( + core._output_directory, "neo4j-admin-import-call.sh" + ) + assert os.path.exists(import_call_path) + with open(import_call_path, "r") as f: + import_call = f.read() + + assert "Schema_info" in import_call From 94b7a9f222d756777909b48f0d904e4b13bed681 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Wed, 25 Oct 2023 12:22:31 +0200 Subject: [PATCH 218/343] extend test to check import statement --- test/test_integration.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/test/test_integration.py b/test/test_integration.py index 80dd1791..006fd081 100644 --- a/test/test_integration.py +++ b/test/test_integration.py @@ -87,3 +87,13 @@ def test_write_schema_info_as_node(core, _get_nodes): schema_part = json.loads(string) assert schema_part == schema + + # test import call + import_call_path = os.path.join( + core._output_directory, "neo4j-admin-import-call.sh" + ) + assert os.path.exists(import_call_path) + with open(import_call_path, "r") as f: + import_call = f.read() + + assert "Schema_info" in import_call From 63aede81e41e5689b2ccf36b53a5c85b38202a55 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Wed, 25 Oct 2023 12:23:29 +0200 Subject: [PATCH 219/343] overwrite import call with schema node added --- biocypher/_core.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/biocypher/_core.py b/biocypher/_core.py index bdd9faa8..0fcffd25 100644 --- a/biocypher/_core.py +++ b/biocypher/_core.py @@ -645,6 +645,9 @@ class instance, which contains all expanded entities and relationships. ) self.write_nodes([node], force=True) + # override import call with added schema info node + self.write_import_call() + return schema # TRANSLATION METHODS ### From 95612aaa042757744849235f8e0c5b24b6481ea8 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Wed, 25 Oct 2023 12:24:06 +0200 Subject: [PATCH 220/343] =?UTF-8?q?Bump=20version:=200.5.25=20=E2=86=92=20?= =?UTF-8?q?0.5.26?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- biocypher/_metadata.py | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 2f07592a..584f582c 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.5.25 +current_version = 0.5.26 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+) diff --git a/biocypher/_metadata.py b/biocypher/_metadata.py index b429f552..0171346b 100644 --- a/biocypher/_metadata.py +++ b/biocypher/_metadata.py @@ -19,7 +19,7 @@ import toml -_VERSION = "0.5.25" +_VERSION = "0.5.26" def get_metadata(): diff --git a/pyproject.toml b/pyproject.toml index 2901244b..31e661f2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "biocypher" -version = "0.5.25" +version = "0.5.26" description = "A unifying framework for biomedical research knowledge graphs" authors = [ "Sebastian Lobentanzer ", From b3cd4985081be9552dacc7d4f2ac2b0c39141dc5 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Wed, 25 Oct 2023 14:16:01 +0200 Subject: [PATCH 221/343] formatting --- README.md | 18 +++++++++--------- docs/installation.md | 7 ++++--- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 3275b7ac..251f3b31 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,5 @@ # BioCypher -| __License__ | [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) | -| :--- | :--- | -| __Python__ | ![Python](https://img.shields.io/badge/python-3.9-blue.svg) ![Python](https://img.shields.io/badge/python-3.10-blue.svg) ![Python](https://img.shields.io/badge/python-3.11-blue.svg) | -| __Package__ | [![PyPI version](https://badge.fury.io/py/biocypher.svg)](https://badge.fury.io/py/biocypher) [![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) [![Powered by the Bioregistry](https://img.shields.io/static/v1?label=Powered%20by&message=Bioregistry&color=BA274A&style=flat&logo=image/png;base64,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)](https://github.com/biopragmatics/bioregistry) | -| __Build status__ | [![CI](https://github.com/biocypher/biocypher/actions/workflows/ci_cd.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/ci_cd.yaml) [![Docs build](https://github.com/biocypher/biocypher/actions/workflows/sphinx_autodoc.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/sphinx_autodoc.yaml) | -| __Test coverage__ | ![Coverage](https://raw.githubusercontent.com/biocypher/biocypher/coverage/coverage.svg) | -| __Development__ | [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit) | -| __Contributions__ | [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) | - ## ❓ Description Knowledge graphs (KGs) are an [approach to knowledge representation](https://en.wikipedia.org/wiki/Knowledge_graph) that uses graph @@ -29,6 +20,15 @@ the docs [here](https://biocypher.org). alt="Graphical Abstract"> +| __License__ | [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) | +| :--- | :--- | +| __Python__ | ![Python](https://img.shields.io/badge/python-3.9-blue.svg) ![Python](https://img.shields.io/badge/python-3.10-blue.svg) ![Python](https://img.shields.io/badge/python-3.11-blue.svg) | +| __Package__ | [![PyPI version](https://badge.fury.io/py/biocypher.svg)](https://badge.fury.io/py/biocypher) [![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) [![Powered by the Bioregistry](https://img.shields.io/static/v1?label=Powered%20by&message=Bioregistry&color=BA274A&style=flat&logo=image/png;base64,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)](https://github.com/biopragmatics/bioregistry) | +| __Build status__ | [![CI](https://github.com/biocypher/biocypher/actions/workflows/ci_cd.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/ci_cd.yaml) [![Docs build](https://github.com/biocypher/biocypher/actions/workflows/sphinx_autodoc.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/sphinx_autodoc.yaml) | +| __Test coverage__ | ![Coverage](https://raw.githubusercontent.com/biocypher/biocypher/coverage/coverage.svg) | +| __Development__ | [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit) | +| __Contributions__ | [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) | + ## 📖 Documentation Tutorial and developer docs at https://biocypher.org. For a quickstart into your own pipeline, you can refer to our [project diff --git a/docs/installation.md b/docs/installation.md index 9d9c2bca..00355571 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -54,13 +54,14 @@ poetry install Poetry creates a virtual environment for you (starting with `biocypher-`; alternatively you can name it yourself) and installs all dependencies. -If you want to run the tests that use a local Neo4j or PostgreSQL DBMS (database management system) -instance: +If you want to run the tests that use a local Neo4j or PostgreSQL DBMS (database +management system) instance: - Make sure that you have a Neo4j instance with the APOC plugin installed and a database named `test` running on standard bolt port `7687` -- A PostgreSQL instance with the psql command line tool should be installed locally and running on standard port `5432` +- A PostgreSQL instance with the psql command line tool should be installed +locally and running on standard port `5432` - Activate the virtual environment by running `% poetry shell` and then run the tests by running `% pytest` in the root directory of the repository with the From 0808fbae307bc2457644e76966f57b93e6b28d20 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Wed, 25 Oct 2023 16:22:50 +0200 Subject: [PATCH 222/343] reformat table --- README.md | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 251f3b31..176923a3 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,11 @@ # BioCypher +| __License__ | [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) | __Python__ | ![Python](https://img.shields.io/badge/python-3.9-blue.svg) ![Python](https://img.shields.io/badge/python-3.10-blue.svg) ![Python](https://img.shields.io/badge/python-3.11-blue.svg) | +| --- | --- | --- | --- | +| __Package__ | [![PyPI version](https://badge.fury.io/py/biocypher.svg)](https://badge.fury.io/py/biocypher) [![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) | __Build status__ | [![CI](https://github.com/biocypher/biocypher/actions/workflows/ci_cd.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/ci_cd.yaml) [![Docs build](https://github.com/biocypher/biocypher/actions/workflows/sphinx_autodoc.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/sphinx_autodoc.yaml) | +| __Test coverage__ | ![Coverage](https://raw.githubusercontent.com/biocypher/biocypher/coverage/coverage.svg) | __Development__ | [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit) | +| __Contributions__ | [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) [![Powered by the Bioregistry](https://img.shields.io/static/v1?label=Powered%20by&message=Bioregistry&color=BA274A&style=flat&logo=image/png;base64,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)](https://github.com/biopragmatics/bioregistry) | __Code style__ | [![Black](https://img.shields.io/badge/code%20style-black-000000.svg)]() | + ## ❓ Description Knowledge graphs (KGs) are an [approach to knowledge representation](https://en.wikipedia.org/wiki/Knowledge_graph) that uses graph @@ -20,15 +26,6 @@ the docs [here](https://biocypher.org). alt="Graphical Abstract"> -| __License__ | [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) | -| :--- | :--- | -| __Python__ | ![Python](https://img.shields.io/badge/python-3.9-blue.svg) ![Python](https://img.shields.io/badge/python-3.10-blue.svg) ![Python](https://img.shields.io/badge/python-3.11-blue.svg) | -| __Package__ | [![PyPI version](https://badge.fury.io/py/biocypher.svg)](https://badge.fury.io/py/biocypher) [![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) [![Powered by the Bioregistry](https://img.shields.io/static/v1?label=Powered%20by&message=Bioregistry&color=BA274A&style=flat&logo=image/png;base64,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)](https://github.com/biopragmatics/bioregistry) | -| __Build status__ | [![CI](https://github.com/biocypher/biocypher/actions/workflows/ci_cd.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/ci_cd.yaml) [![Docs build](https://github.com/biocypher/biocypher/actions/workflows/sphinx_autodoc.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/sphinx_autodoc.yaml) | -| __Test coverage__ | ![Coverage](https://raw.githubusercontent.com/biocypher/biocypher/coverage/coverage.svg) | -| __Development__ | [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit) | -| __Contributions__ | [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) | - ## 📖 Documentation Tutorial and developer docs at https://biocypher.org. For a quickstart into your own pipeline, you can refer to our [project From cb40d4a2025b2d9776f2a36ffc20904364017e8f Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Wed, 25 Oct 2023 16:29:08 +0200 Subject: [PATCH 223/343] formatting and spelling/grammar --- DEVELOPER.md | 64 +++++++++++++++++++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 21 deletions(-) diff --git a/DEVELOPER.md b/DEVELOPER.md index 5749751d..39b308da 100644 --- a/DEVELOPER.md +++ b/DEVELOPER.md @@ -13,38 +13,62 @@ before starting development. ### Setup the environment - Install dependencies from the lock file: `poetry install` -- Use the environment: You can either run commands directly with `poetry run ` or open a shell with `poetry shell` and then run commands directly. + +- Use the environment: You can either run commands directly with `poetry run +` or open a shell with `poetry shell` and then run commands directly. ### Updating the environment If you want to fix dependency issues, please do so in the Poetry framework. If Poetry does not work for you for some reason, please let us know. -The Poetry dependencies are organized in groups. -There are groups with dependencies needed for running BioCypher (`[tool.poetry.dependencies` with the group name `main`) and a group with dependencies needed for development (`[tool.poetry.group.dev.dependencies` with the group name `dev`). +The Poetry dependencies are organized in groups. There are groups with +dependencies needed for running BioCypher (`[tool.poetry.dependencies` with the +group name `main`) and a group with dependencies needed for development +(`[tool.poetry.group.dev.dependencies` with the group name `dev`). For adding new dependencies: + - Add new dependencies: `poetry add -- group ` -- Update lock file (after adding new dependencies in pyproject.toml): `poetry lock` + +- Update lock file (after adding new dependencies in pyproject.toml): `poetry +lock` ## Code quality and formal requirements -For ensuring code quality following tools are used: +For ensuring code quality, the following tools are used: + - [isort](https://isort.readthedocs.io/en/latest/) for sorting imports + - [black](https://black.readthedocs.io/en/stable/) for automated code formatting -- [pre-commit-hooks](https://github.com/pre-commit/pre-commit-hooks) for ensuring some general rules -- [pep585-upgrade](https://github.com/snok/pep585-upgrade) for automatically upgrading type hints to the new native types defined in PEP 585 -- [pygrep-hooks](https://github.com/pre-commit/pygrep-hooks) for ensuring some general naming rules -Pre-commit hooks are used to automatically run these tools before each commit. They are defined in [.pre-commit-config.yaml](./.pre-commit-config.yaml). To install the hooks run `poetry run pre-commit install`. The hooks are then executed before each commit. -For running the hook for all project files (not only the changed ones) run `poetry run pre-commit run --all-files`. +- [pre-commit-hooks](https://github.com/pre-commit/pre-commit-hooks) for +ensuring some general rules -The project uses [Sphinx](https://www.sphinx-doc.org/en/master/) autodoc GitHub -Actions workflow to generate the documentation. If you add new code, please make sure that it is documented -accordingly and in a consistent manner with the existing code base. -Especially the docstrings should follow the [Google style guide](https://sphinxcontrib-napoleon.readthedocs.io/en/latest/example_google.html). To check, you can run the documentation build locally by running `make html` in the `docs` directory. +- [pep585-upgrade](https://github.com/snok/pep585-upgrade) for automatically +upgrading type hints to the new native types defined in PEP 585 -When adding new code snippets to the documentation make sure, that they are automatically tested with [doctest](https://sphinx-tutorial.readthedocs.io/step-3/#testing-your-code) to ensure, that no ouutdated code snippets are part of the documentation. +- [pygrep-hooks](https://github.com/pre-commit/pygrep-hooks) for ensuring some +general naming rules + +Pre-commit hooks are used to automatically run these tools before each commit. +They are defined in [.pre-commit-config.yaml](./.pre-commit-config.yaml). To +install the hooks run `poetry run pre-commit install`. The hooks are then +executed before each commit. For running the hook for all project files (not +only the changed ones) run `poetry run pre-commit run --all-files`. + +The project uses a [Sphinx](https://www.sphinx-doc.org/en/master/) autodoc +GitHub Actions workflow to generate the documentation. If you add new code, +please make sure that it is documented accordingly and in a consistent manner +with the existing code base. The docstrings should follow the [Google style +guide](https://sphinxcontrib-napoleon.readthedocs.io/en/latest/example_google.html). +To check if the docs build successfully, you can build them locally by running +`make html` in the `docs` directory. + +When adding new code snippets to the documentation, make sure that they are +automatically tested with +[doctest](https://sphinx-tutorial.readthedocs.io/step-3/#testing-your-code); +this ensures that no outdated code snippets are part of the documentation. ## Testing @@ -85,9 +109,7 @@ that the version number is incremented according to the following scheme: - Increment the patch version number if you make backwards-compatible bug fixes. -You can use the `bumpversion` tool to update the version number in the -`pyproject.toml` file. This will create a new git tag automatically. - -``` -bumpversion [major|minor|patch] -``` +We use the `bumpversion` tool to update the version number in the +`pyproject.toml` file. This will create a new git tag automatically. Usually, +versioning is done by the maintainers, so please do not increment versions in +pull requests by default. From fa81989c5c267c7dee81aa40f891568c73ede673 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Wed, 25 Oct 2023 16:31:08 +0200 Subject: [PATCH 224/343] flake8 and isort line length == black --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 46cfd1bd..6e3834a5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -100,7 +100,7 @@ exclude = ''' [tool.isort] from_first = true -line_length = 79 +line_length = 80 multi_line_output = 3 include_trailing_comma = true use_parentheses = true @@ -120,5 +120,5 @@ per-file-ignores = [ "tests/*:D100,D101,D102", "*/__init__.py:F401" ] -max-line-length = 88 +max-line-length = 80 count = true From fc5ad9ebf9d8dbf6cb7106d780127db58ce2c3e8 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Wed, 25 Oct 2023 16:36:44 +0200 Subject: [PATCH 225/343] add consortium to citation cff --- CITATION.cff | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CITATION.cff b/CITATION.cff index c9d7978a..75bd687f 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -12,6 +12,8 @@ authors: Heidelberg University Hospital: Institute for Computational Biomedicine orcid: 'https://orcid.org/0000-0003-3399-6695' + - name: BioCypher Consortium + type: consortium - given-names: Julio family-names: Saez-Rodriguez email: saez@uni-heidelberg.de From 7de63c2563abcdfceae7522333bcb33213a19d5c Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Wed, 25 Oct 2023 17:25:21 +0200 Subject: [PATCH 226/343] empty header in table --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 176923a3..e1d1ceb7 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ # BioCypher -| __License__ | [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) | __Python__ | ![Python](https://img.shields.io/badge/python-3.9-blue.svg) ![Python](https://img.shields.io/badge/python-3.10-blue.svg) ![Python](https://img.shields.io/badge/python-3.11-blue.svg) | +| | | | | | --- | --- | --- | --- | +| __License__ | [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) | __Python__ | ![Python](https://img.shields.io/badge/python-3.9-blue.svg) ![Python](https://img.shields.io/badge/python-3.10-blue.svg) ![Python](https://img.shields.io/badge/python-3.11-blue.svg) | | __Package__ | [![PyPI version](https://badge.fury.io/py/biocypher.svg)](https://badge.fury.io/py/biocypher) [![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) | __Build status__ | [![CI](https://github.com/biocypher/biocypher/actions/workflows/ci_cd.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/ci_cd.yaml) [![Docs build](https://github.com/biocypher/biocypher/actions/workflows/sphinx_autodoc.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/sphinx_autodoc.yaml) | | __Test coverage__ | ![Coverage](https://raw.githubusercontent.com/biocypher/biocypher/coverage/coverage.svg) | __Development__ | [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit) | | __Contributions__ | [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) [![Powered by the Bioregistry](https://img.shields.io/static/v1?label=Powered%20by&message=Bioregistry&color=BA274A&style=flat&logo=image/png;base64,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)](https://github.com/biopragmatics/bioregistry) | __Code style__ | [![Black](https://img.shields.io/badge/code%20style-black-000000.svg)]() | From 2d47d7ca0c0a3120b702f730b8b605c7e9699c48 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Wed, 25 Oct 2023 17:26:44 +0200 Subject: [PATCH 227/343] update badge link workflow name --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e1d1ceb7..d0b5ab0b 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ | | | | | | --- | --- | --- | --- | | __License__ | [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) | __Python__ | ![Python](https://img.shields.io/badge/python-3.9-blue.svg) ![Python](https://img.shields.io/badge/python-3.10-blue.svg) ![Python](https://img.shields.io/badge/python-3.11-blue.svg) | -| __Package__ | [![PyPI version](https://badge.fury.io/py/biocypher.svg)](https://badge.fury.io/py/biocypher) [![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) | __Build status__ | [![CI](https://github.com/biocypher/biocypher/actions/workflows/ci_cd.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/ci_cd.yaml) [![Docs build](https://github.com/biocypher/biocypher/actions/workflows/sphinx_autodoc.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/sphinx_autodoc.yaml) | +| __Package__ | [![PyPI version](https://badge.fury.io/py/biocypher.svg)](https://badge.fury.io/py/biocypher) [![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) | __Build status__ | [![CI](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml) [![Docs build](https://github.com/biocypher/biocypher/actions/workflows/sphinx_autodoc.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/sphinx_autodoc.yaml) | | __Test coverage__ | ![Coverage](https://raw.githubusercontent.com/biocypher/biocypher/coverage/coverage.svg) | __Development__ | [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit) | | __Contributions__ | [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) [![Powered by the Bioregistry](https://img.shields.io/static/v1?label=Powered%20by&message=Bioregistry&color=BA274A&style=flat&logo=image/png;base64,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)](https://github.com/biopragmatics/bioregistry) | __Code style__ | [![Black](https://img.shields.io/badge/code%20style-black-000000.svg)]() | From eacd93e7e0217ce1c409305d79dee1441c7ab98d Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Wed, 25 Oct 2023 17:27:45 +0200 Subject: [PATCH 228/343] docs workflow badge name --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d0b5ab0b..6693827a 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ | | | | | | --- | --- | --- | --- | | __License__ | [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) | __Python__ | ![Python](https://img.shields.io/badge/python-3.9-blue.svg) ![Python](https://img.shields.io/badge/python-3.10-blue.svg) ![Python](https://img.shields.io/badge/python-3.11-blue.svg) | -| __Package__ | [![PyPI version](https://badge.fury.io/py/biocypher.svg)](https://badge.fury.io/py/biocypher) [![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) | __Build status__ | [![CI](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml) [![Docs build](https://github.com/biocypher/biocypher/actions/workflows/sphinx_autodoc.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/sphinx_autodoc.yaml) | +| __Package__ | [![PyPI version](https://badge.fury.io/py/biocypher.svg)](https://badge.fury.io/py/biocypher) [![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) | __Build status__ | [![CI](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml) [![Docs build](https://github.com/biocypher/biocypher/actions/workflows/docs.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/docs.yaml) | | __Test coverage__ | ![Coverage](https://raw.githubusercontent.com/biocypher/biocypher/coverage/coverage.svg) | __Development__ | [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit) | | __Contributions__ | [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) [![Powered by the Bioregistry](https://img.shields.io/static/v1?label=Powered%20by&message=Bioregistry&color=BA274A&style=flat&logo=image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAACXBIWXMAAAEnAAABJwGNvPDMAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAACi9JREFUWIWtmXl41MUZxz/z291sstmQO9mQG0ISwHBtOOSwgpUQhApWgUfEowKigKI81actypaqFbWPVkGFFKU0Vgs+YgvhEAoqEUESrnDlEEhCbkLYJtlkk9399Y/N/rKbzQXt96+Zed+Z9/t7Z+adeecnuA1s5yFVSGrLOAf2qTiEEYlUZKIAfYdKE7KoBLkQSc4XgkPfXxz/owmT41ZtiVtR3j94eqxQq5aDeASIvkVb12RBtt0mb5xZsvfa/5XgnqTMcI3Eq7IQjwM+7jJJo8YvNhK/qDBUOl8A7JZWWqqu01Jeg6Pd1nW4NuBjjax6eWrRruv/M8EDqTMflmXeB0Jcbb6RIRhmTCJ0ymgC0wYjadTd9nW0tWMu+In63NNU7c3FWtvgJpXrZVlakVGU8/ltEcwzGjU3miI/ABa72vwTB5K45AEi7x2PUEl9fZsHZLuDmgPHuLJpJ82lle6iTSH6mpXp+fnt/Sa4yzhbp22yfwFkgnMaBy17kPhFmQh1997qLxztNkq35XB505fINtf0iz1WvfTQ7Pxdlj4Jdnjuny5yvpEhjHh7FQOGD/YyZi4owS86HJ+QQMDpJaBf3jUXlHD21+8q0y4LDppV/vfNO7+jzV3Pa6SOac0E8I8fSPonpm7JAVR+eRhzwU/Ofj+e49tpT/HdtGXcyLvQJ8HAtCTGfmJCF2dwfpTMz4NszX/uqqdyr+xPyVwoEK+C03PGrDX4GkJ7NBJ+txH/hCgAit7cRlNxOY62dmzmZgwzJvZJUh2gI/xnRmoOHsfe3AqQ/kho0qXs+pLzLh3FgwdT54YKxLsAQq0mbf1zHuTsltZejemHJSrlgGGDPGTXc09zdM5qTi59jZbKOg+Zb1QYI95+XokEQogPDifPDnPJFQ8uCkl8FyGmACQtn4dhxp3KINX7jnHi0ZeJnT8dla8Plbu+48zzfyJ08kh8ggIACB4zlIAhsURm3EnML6eB6Fzep1a+SUt5DS2VddTs+4GQccPRhgV1kowIQRaChhMXAPxkIev/Vl+8R/HgnqTMmI4gjH/iQOIXZSqdzQUlXDB9RPyi+1DrdVx67WMursvCkDERXYxB0ROSIOKecURMG+tBzkXAhbYbZk6teNPLkwmPzUIX71wuMiw+MHx2nEJQrWIFHSdE4pIHlFDisLZxYe1HhIwfTtLK+RSu30rVnlxGvrOapOcW9DsW3vH6CgKS4zxIXlz3Fw8dSaMmcfEcV9XHYbc/DSCZMEkgFoJzY0TeO17pVL7jANbaBoauWUJlTi4VOw+T9sazBKYl0ZB/qV/kALThQRi3vOJB0lpzw0vPMONOtOHOqRcyi7bzkEqanJo3HogBMGROUrziaGundGsOsQsyUPn6UPx2NvELZxIybhinn3uLyx9uVwaW7XbqjxdQmr2X0uy93Dh+Dtlu9zCu9vdj1PsvEWwcii7OwJAXFnoRFCoVhoxJrmr0gOQWo9qBfaorXodOHq0o1x8roN3cSMyC6ZT942uQBIlL53Jl804sV6oY9/fXAGg4WcjFdZuxlFV7GNPFRzFs7VKCRiV7ejJrTa/eDr1rFKXZOQCocEyTgHQAyUdD4B2d4cF8pohg4zC0YUFU7z5C9Jy7sVvbKPtsH6GT0tCGBtFwspBTz/zRixyApbSKk8te5+aZ4l4JdUVQWpIScmQhjGocUjJCRhcTieSjURQTF89FtttpuVaLpaya8Knp1B3OQ5Zlag/nU//9cmScS6EnONrauWjazIQv3kCoVD3quUPS+uAXHU7z1SpATpEQchSA78AwD0WVnxa1XkdjURlCJRGQHMfN/EuEjk9jyr4NRN47Hltjc58Gm0sraTjZ/w3l5BLuKkZJdFzT1f5+3Sq3NZjRDNAjaX1orb2BX2wEmkA9fvGGbvW7Q+OlUu+2wlIqdx+h3dzkJVPrda5iQJ93p+DRqcQ/PhsAw8xJ6AfHdkhuIVvoEribLl/jxKOv4Gi34T8omgnb1yOk7sdTA01AiK3J6yoGgP+gaPwHOdOP6LlTlXb3mNYXAlI8da9/e0pJBZovV2BrakYzQK/I3bg0SsiiCqClqs/0wAPB6UOVo6k3+CdEETwm1aPtP+dLlLJPSKAHOYDWCoVLlYTkKAKcCU4vO7IrhErFsLVLPXZ+V0haDcN+v8xjB9strdQfPavUA0ckefRxWNuwVNS6rBRKQB44r+Lmc5f7TRAgaFQyYzb9Dv/4gd18ASQ8/gsC0zwJNJVcw97aeWmOcDtaAW6eLXZLBchTC8EhWXbW6o+cInhMipetuu9OUvTWNnwNodzx+krlvAQIGjmECV+spyH/Ak3F5QDok+OoPXicip2HiJiWTuH6rQx6eh7BxlT0STH4xUbSUl6Df/xAIqaO9bBVn3taKUuy/ZAwYZImpvx4FYjVRgQzOec9r1vK0TmrldMiIDkO45ZXegxLLrRW13P0/heQHQ4CUhIYvfElNIHOtWaztNJ4qZQBqfFKLg3OMz135rNY624ClB0tHJcomTA5ZMGnANbaBmoOHPMy5hvZebNuLCoj71frXIN0i9pDJzj24IsIlUTCo7NI3/KyQg5ArfMleEyKBzmA6r1HO8eV+dSEySEB2G3yRpwZP1c2f+n1GjB07RIlcwNoKi7j3G839EhQF2cg6fmHmbznPRKevJ/GorIedV1wtLVzJesrV9WqQtoIHRfWjreSjwGar1ZRui3Ho7PfwHBGb3jRg6S1roGeoIuNJGBIPKV/zSF31irOrn4HXAu9B1zduhtLecelQxZZ9xTtrgC342Df8IwQyaYqBMKEWo0xaw1BI4d4DNJSWcfF32fRWnuD5NWPEDZ5lIe8NDuHq1v+ha2xGdkho4szYJg1hbj501EH6OgJ5oIS8hf/oWPm5HqNrE51vdt4nC/7k+9bIIT8GYA2Ipixn5jwjQrrZsju0XT5GubTRfiEBqFPisUvOrzPPi0VdeQ9YcJ63bWmxbzphTk7XHKvA/DrlJkfAU+Bcy2N+fA3vZK0WVoxny4idOKIfn+IO7lTz7zRObWCjdMv7VnhruOV9dws9F8u4CsAS1k1J54wYS4o6arWaaS8hvLP998yuZtnisl7wuROLkdjsKzqqtfL45FjB8gzwZnIJy6dS8Jjs3p8ausvHG3tXN26mytZO5W8Rcjsbg1Qze/X45ELHY9I7wHLXG26+CgSl8zFkDGh3zdkF2S7nep9PzhzmnK3FEGwUWOwrJr6zTdeL529EnRhf3LmfCHEBkBZiNrwIAwZkwi9a5Qzh9D6dNvXYW3jZkEJ9UdOOYPwdY/gXgdiufuGuC2C4Hy3kWXrOhmeBLQeA6jV6GLC8Y0KR613Hn+2phZaK69jqah1P/hdsCKLLIfGtnbG+f3eyfHtEHTh38mzom2SY4WQWQjE9tnBE+XIZKuQNrqCcH9wSwRdMGGSJiTnpatwTJOFMIKcgvPVX/kNIcM1gSgC8iTZfii3aEL+7fyG+C+6O8izl1GE5gAAAABJRU5ErkJggg==)](https://github.com/biopragmatics/bioregistry) | __Code style__ | [![Black](https://img.shields.io/badge/code%20style-black-000000.svg)]() | From 8ade09220453325767c5d5c363ab0ceddf49df09 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Wed, 25 Oct 2023 17:30:40 +0200 Subject: [PATCH 229/343] deactivate coverage badge until fixed --- .github/workflows/tests_and_code_quality.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests_and_code_quality.yaml b/.github/workflows/tests_and_code_quality.yaml index 18d98c86..25ce0173 100644 --- a/.github/workflows/tests_and_code_quality.yaml +++ b/.github/workflows/tests_and_code_quality.yaml @@ -24,9 +24,9 @@ jobs: #---------------------------------------------- - name: Run tests uses: ./.github/actions/test - #---------------------------------------------- - # generate test coverage badge - #---------------------------------------------- - - name: Generate test coverage badge - uses: ./.github/actions/test_coverage - if: github.ref == 'refs/heads/main' + # #---------------------------------------------- + # # generate test coverage badge + # #---------------------------------------------- + # - name: Generate test coverage badge + # uses: ./.github/actions/test_coverage + # if: github.ref == 'refs/heads/main' From 09612799848db62132f999f8a90196c40b0972ef Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Wed, 25 Oct 2023 17:35:39 +0200 Subject: [PATCH 230/343] contributor covenant badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6693827a..348567e6 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ | __License__ | [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) | __Python__ | ![Python](https://img.shields.io/badge/python-3.9-blue.svg) ![Python](https://img.shields.io/badge/python-3.10-blue.svg) ![Python](https://img.shields.io/badge/python-3.11-blue.svg) | | __Package__ | [![PyPI version](https://badge.fury.io/py/biocypher.svg)](https://badge.fury.io/py/biocypher) [![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) | __Build status__ | [![CI](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml) [![Docs build](https://github.com/biocypher/biocypher/actions/workflows/docs.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/docs.yaml) | | __Test coverage__ | ![Coverage](https://raw.githubusercontent.com/biocypher/biocypher/coverage/coverage.svg) | __Development__ | [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit) | -| __Contributions__ | [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) [![Powered by the Bioregistry](https://img.shields.io/static/v1?label=Powered%20by&message=Bioregistry&color=BA274A&style=flat&logo=image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAACXBIWXMAAAEnAAABJwGNvPDMAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAACi9JREFUWIWtmXl41MUZxz/z291sstmQO9mQG0ISwHBtOOSwgpUQhApWgUfEowKigKI81actypaqFbWPVkGFFKU0Vgs+YgvhEAoqEUESrnDlEEhCbkLYJtlkk9399Y/N/rKbzQXt96+Zed+Z9/t7Z+adeecnuA1s5yFVSGrLOAf2qTiEEYlUZKIAfYdKE7KoBLkQSc4XgkPfXxz/owmT41ZtiVtR3j94eqxQq5aDeASIvkVb12RBtt0mb5xZsvfa/5XgnqTMcI3Eq7IQjwM+7jJJo8YvNhK/qDBUOl8A7JZWWqqu01Jeg6Pd1nW4NuBjjax6eWrRruv/M8EDqTMflmXeB0Jcbb6RIRhmTCJ0ymgC0wYjadTd9nW0tWMu+In63NNU7c3FWtvgJpXrZVlakVGU8/ltEcwzGjU3miI/ABa72vwTB5K45AEi7x2PUEl9fZsHZLuDmgPHuLJpJ82lle6iTSH6mpXp+fnt/Sa4yzhbp22yfwFkgnMaBy17kPhFmQh1997qLxztNkq35XB505fINtf0iz1WvfTQ7Pxdlj4Jdnjuny5yvpEhjHh7FQOGD/YyZi4owS86HJ+QQMDpJaBf3jUXlHD21+8q0y4LDppV/vfNO7+jzV3Pa6SOac0E8I8fSPonpm7JAVR+eRhzwU/Ofj+e49tpT/HdtGXcyLvQJ8HAtCTGfmJCF2dwfpTMz4NszX/uqqdyr+xPyVwoEK+C03PGrDX4GkJ7NBJ+txH/hCgAit7cRlNxOY62dmzmZgwzJvZJUh2gI/xnRmoOHsfe3AqQ/kho0qXs+pLzLh3FgwdT54YKxLsAQq0mbf1zHuTsltZejemHJSrlgGGDPGTXc09zdM5qTi59jZbKOg+Zb1QYI95+XokEQogPDifPDnPJFQ8uCkl8FyGmACQtn4dhxp3KINX7jnHi0ZeJnT8dla8Plbu+48zzfyJ08kh8ggIACB4zlIAhsURm3EnML6eB6Fzep1a+SUt5DS2VddTs+4GQccPRhgV1kowIQRaChhMXAPxkIev/Vl+8R/HgnqTMmI4gjH/iQOIXZSqdzQUlXDB9RPyi+1DrdVx67WMursvCkDERXYxB0ROSIOKecURMG+tBzkXAhbYbZk6teNPLkwmPzUIX71wuMiw+MHx2nEJQrWIFHSdE4pIHlFDisLZxYe1HhIwfTtLK+RSu30rVnlxGvrOapOcW9DsW3vH6CgKS4zxIXlz3Fw8dSaMmcfEcV9XHYbc/DSCZMEkgFoJzY0TeO17pVL7jANbaBoauWUJlTi4VOw+T9sazBKYl0ZB/qV/kALThQRi3vOJB0lpzw0vPMONOtOHOqRcyi7bzkEqanJo3HogBMGROUrziaGundGsOsQsyUPn6UPx2NvELZxIybhinn3uLyx9uVwaW7XbqjxdQmr2X0uy93Dh+Dtlu9zCu9vdj1PsvEWwcii7OwJAXFnoRFCoVhoxJrmr0gOQWo9qBfaorXodOHq0o1x8roN3cSMyC6ZT942uQBIlL53Jl804sV6oY9/fXAGg4WcjFdZuxlFV7GNPFRzFs7VKCRiV7ejJrTa/eDr1rFKXZOQCocEyTgHQAyUdD4B2d4cF8pohg4zC0YUFU7z5C9Jy7sVvbKPtsH6GT0tCGBtFwspBTz/zRixyApbSKk8te5+aZ4l4JdUVQWpIScmQhjGocUjJCRhcTieSjURQTF89FtttpuVaLpaya8Knp1B3OQ5Zlag/nU//9cmScS6EnONrauWjazIQv3kCoVD3quUPS+uAXHU7z1SpATpEQchSA78AwD0WVnxa1XkdjURlCJRGQHMfN/EuEjk9jyr4NRN47Hltjc58Gm0sraTjZ/w3l5BLuKkZJdFzT1f5+3Sq3NZjRDNAjaX1orb2BX2wEmkA9fvGGbvW7Q+OlUu+2wlIqdx+h3dzkJVPrda5iQJ93p+DRqcQ/PhsAw8xJ6AfHdkhuIVvoEribLl/jxKOv4Gi34T8omgnb1yOk7sdTA01AiK3J6yoGgP+gaPwHOdOP6LlTlXb3mNYXAlI8da9/e0pJBZovV2BrakYzQK/I3bg0SsiiCqClqs/0wAPB6UOVo6k3+CdEETwm1aPtP+dLlLJPSKAHOYDWCoVLlYTkKAKcCU4vO7IrhErFsLVLPXZ+V0haDcN+v8xjB9strdQfPavUA0ckefRxWNuwVNS6rBRKQB44r+Lmc5f7TRAgaFQyYzb9Dv/4gd18ASQ8/gsC0zwJNJVcw97aeWmOcDtaAW6eLXZLBchTC8EhWXbW6o+cInhMipetuu9OUvTWNnwNodzx+krlvAQIGjmECV+spyH/Ak3F5QDok+OoPXicip2HiJiWTuH6rQx6eh7BxlT0STH4xUbSUl6Df/xAIqaO9bBVn3taKUuy/ZAwYZImpvx4FYjVRgQzOec9r1vK0TmrldMiIDkO45ZXegxLLrRW13P0/heQHQ4CUhIYvfElNIHOtWaztNJ4qZQBqfFKLg3OMz135rNY624ClB0tHJcomTA5ZMGnANbaBmoOHPMy5hvZebNuLCoj71frXIN0i9pDJzj24IsIlUTCo7NI3/KyQg5ArfMleEyKBzmA6r1HO8eV+dSEySEB2G3yRpwZP1c2f+n1GjB07RIlcwNoKi7j3G839EhQF2cg6fmHmbznPRKevJ/GorIedV1wtLVzJesrV9WqQtoIHRfWjreSjwGar1ZRui3Ho7PfwHBGb3jRg6S1roGeoIuNJGBIPKV/zSF31irOrn4HXAu9B1zduhtLecelQxZZ9xTtrgC342Df8IwQyaYqBMKEWo0xaw1BI4d4DNJSWcfF32fRWnuD5NWPEDZ5lIe8NDuHq1v+ha2xGdkho4szYJg1hbj501EH6OgJ5oIS8hf/oWPm5HqNrE51vdt4nC/7k+9bIIT8GYA2Ipixn5jwjQrrZsju0XT5GubTRfiEBqFPisUvOrzPPi0VdeQ9YcJ63bWmxbzphTk7XHKvA/DrlJkfAU+Bcy2N+fA3vZK0WVoxny4idOKIfn+IO7lTz7zRObWCjdMv7VnhruOV9dws9F8u4CsAS1k1J54wYS4o6arWaaS8hvLP998yuZtnisl7wuROLkdjsKzqqtfL45FjB8gzwZnIJy6dS8Jjs3p8ausvHG3tXN26mytZO5W8Rcjsbg1Qze/X45ELHY9I7wHLXG26+CgSl8zFkDGh3zdkF2S7nep9PzhzmnK3FEGwUWOwrJr6zTdeL529EnRhf3LmfCHEBkBZiNrwIAwZkwi9a5Qzh9D6dNvXYW3jZkEJ9UdOOYPwdY/gXgdiufuGuC2C4Hy3kWXrOhmeBLQeA6jV6GLC8Y0KR613Hn+2phZaK69jqah1P/hdsCKLLIfGtnbG+f3eyfHtEHTh38mzom2SY4WQWQjE9tnBE+XIZKuQNrqCcH9wSwRdMGGSJiTnpatwTJOFMIKcgvPVX/kNIcM1gSgC8iTZfii3aEL+7fyG+C+6O8izl1GE5gAAAABJRU5ErkJggg==)](https://github.com/biopragmatics/bioregistry) | __Code style__ | [![Black](https://img.shields.io/badge/code%20style-black-000000.svg)]() | +| __Contributions__ | [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CONTRIBUTING.md) [![Powered by the Bioregistry](https://img.shields.io/static/v1?label=Powered%20by&message=Bioregistry&color=BA274A&style=flat&logo=image/png;base64,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)](https://github.com/biopragmatics/bioregistry) | __Code style__ | [![Black](https://img.shields.io/badge/code%20style-black-000000.svg)]() | ## ❓ Description Knowledge graphs (KGs) are an [approach to knowledge From 050274ef4de777f3ed4e0083c7449e06842d5bb1 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Wed, 25 Oct 2023 17:50:40 +0200 Subject: [PATCH 231/343] =?UTF-8?q?Bump=20version:=200.5.26=20=E2=86=92=20?= =?UTF-8?q?0.5.27?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- biocypher/_metadata.py | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 584f582c..e4e49409 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.5.26 +current_version = 0.5.27 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+) diff --git a/biocypher/_metadata.py b/biocypher/_metadata.py index 0171346b..53ebf67c 100644 --- a/biocypher/_metadata.py +++ b/biocypher/_metadata.py @@ -19,7 +19,7 @@ import toml -_VERSION = "0.5.26" +_VERSION = "0.5.27" def get_metadata(): diff --git a/pyproject.toml b/pyproject.toml index 6e3834a5..96ab463d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "biocypher" -version = "0.5.26" +version = "0.5.27" description = "A unifying framework for biomedical research knowledge graphs" authors = [ "Sebastian Lobentanzer ", From 8da7bfca48b0f5fc5171de468c12c18b769eb7f6 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Wed, 25 Oct 2023 22:32:34 +0200 Subject: [PATCH 232/343] issue #259: run tests before publishing --- .github/actions/test_coverage/action.yaml | 7 ++++++- .github/workflows/docs.yaml | 3 +-- .github/workflows/publish.yaml | 12 +++++++---- .github/workflows/tests_and_code_quality.yaml | 20 ++++++++++++------- 4 files changed, 28 insertions(+), 14 deletions(-) diff --git a/.github/actions/test_coverage/action.yaml b/.github/actions/test_coverage/action.yaml index 52cc4120..1e53d499 100644 --- a/.github/actions/test_coverage/action.yaml +++ b/.github/actions/test_coverage/action.yaml @@ -1,6 +1,11 @@ name: 'Test coverage' description: 'Check test coverage' +inputs: + token: + description: 'A Github PAT' + required: true + runs: using: "composite" steps: @@ -16,4 +21,4 @@ runs: REPO: self BRANCH: coverage FOLDER: docs/coverage - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ inputs.token }} diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index c15f8742..6e0a8481 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -27,11 +27,10 @@ jobs: #---------------------------------------------- # build docs #---------------------------------------------- - - name: Install dependencies + - name: Build docs uses: ./.github/actions/build_docs build_and_deploy_docs: - if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') runs-on: ubuntu-latest permissions: write-all steps: diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 90e06705..885482f0 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -3,15 +3,19 @@ name: Publish on: push: branches: - - pyopensci - main tags: - - '*' - # - "[0-9]+.[0-9]+.[0-9]+(-[a-z]+)?(.[0-9]+)?" + - "*" + # TODO: ensure semver style - "[0-9]+.[0-9]+.[0-9]+(-[a-z]+)?(.[0-9]+)?" jobs: + call-tests_and_code_quality: + if: github.event_name == 'push' && contains(github.ref, 'refs/tags/') + uses: "./.github/workflows/tests_and_code_quality.yaml" + build_and_deploy_artifact: - if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') + if: github.event_name == 'push' && contains(github.ref, 'refs/tags/') + needs: call-tests_and_code_quality runs-on: ubuntu-latest env: PYTHON_VERSION: 3.9 diff --git a/.github/workflows/tests_and_code_quality.yaml b/.github/workflows/tests_and_code_quality.yaml index 25ce0173..4b75273b 100644 --- a/.github/workflows/tests_and_code_quality.yaml +++ b/.github/workflows/tests_and_code_quality.yaml @@ -1,6 +1,10 @@ name: Tests and code quality -on: [push] +on: + push: + tags-ignore: + - '**' + workflow_call: jobs: tests_and_code_quality: @@ -24,9 +28,11 @@ jobs: #---------------------------------------------- - name: Run tests uses: ./.github/actions/test - # #---------------------------------------------- - # # generate test coverage badge - # #---------------------------------------------- - # - name: Generate test coverage badge - # uses: ./.github/actions/test_coverage - # if: github.ref == 'refs/heads/main' + #---------------------------------------------- + # generate test coverage badge + #---------------------------------------------- + - name: Generate test coverage badge + uses: ./.github/actions/test_coverage + with: + token: ${{ secrets.GITHUB_TOKEN }} + if: github.ref == 'refs/heads/main' From 586c32c7dc3fa12e3cc10c21edf79ad570d5771d Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Wed, 25 Oct 2023 22:34:53 +0200 Subject: [PATCH 233/343] issue #259: fix tests --- .github/workflows/tests_and_code_quality.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests_and_code_quality.yaml b/.github/workflows/tests_and_code_quality.yaml index 4b75273b..b981785a 100644 --- a/.github/workflows/tests_and_code_quality.yaml +++ b/.github/workflows/tests_and_code_quality.yaml @@ -2,8 +2,8 @@ name: Tests and code quality on: push: - tags-ignore: - - '**' + branches: + - "*" workflow_call: jobs: From 1999f6f84aa408c0398ea20f2dd8c86004611ae7 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 26 Oct 2023 10:54:34 +0200 Subject: [PATCH 234/343] combined python badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 348567e6..b47e7f5f 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ | | | | | | --- | --- | --- | --- | -| __License__ | [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) | __Python__ | ![Python](https://img.shields.io/badge/python-3.9-blue.svg) ![Python](https://img.shields.io/badge/python-3.10-blue.svg) ![Python](https://img.shields.io/badge/python-3.11-blue.svg) | +| __License__ | [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) | __Python__ | ![Python](https://img.shields.io/pypi/pyversions/biocypher) | | __Package__ | [![PyPI version](https://badge.fury.io/py/biocypher.svg)](https://badge.fury.io/py/biocypher) [![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) | __Build status__ | [![CI](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml) [![Docs build](https://github.com/biocypher/biocypher/actions/workflows/docs.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/docs.yaml) | | __Test coverage__ | ![Coverage](https://raw.githubusercontent.com/biocypher/biocypher/coverage/coverage.svg) | __Development__ | [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit) | | __Contributions__ | [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CONTRIBUTING.md) [![Powered by the Bioregistry](https://img.shields.io/static/v1?label=Powered%20by&message=Bioregistry&color=BA274A&style=flat&logo=image/png;base64,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)](https://github.com/biopragmatics/bioregistry) | __Code style__ | [![Black](https://img.shields.io/badge/code%20style-black-000000.svg)]() | From 2bcd9fbf09184e69cf06a0848daecf9788ec09d4 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 26 Oct 2023 10:56:21 +0200 Subject: [PATCH 235/343] exchange code style and development --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b47e7f5f..4e5994d3 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@ | --- | --- | --- | --- | | __License__ | [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) | __Python__ | ![Python](https://img.shields.io/pypi/pyversions/biocypher) | | __Package__ | [![PyPI version](https://badge.fury.io/py/biocypher.svg)](https://badge.fury.io/py/biocypher) [![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) | __Build status__ | [![CI](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml) [![Docs build](https://github.com/biocypher/biocypher/actions/workflows/docs.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/docs.yaml) | -| __Test coverage__ | ![Coverage](https://raw.githubusercontent.com/biocypher/biocypher/coverage/coverage.svg) | __Development__ | [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit) | -| __Contributions__ | [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CONTRIBUTING.md) [![Powered by the Bioregistry](https://img.shields.io/static/v1?label=Powered%20by&message=Bioregistry&color=BA274A&style=flat&logo=image/png;base64,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)](https://github.com/biopragmatics/bioregistry) | __Code style__ | [![Black](https://img.shields.io/badge/code%20style-black-000000.svg)]() | +| __Test coverage__ | ![Coverage](https://raw.githubusercontent.com/biocypher/biocypher/coverage/coverage.svg) | __Code style__ | [![Black](https://img.shields.io/badge/code%20style-black-000000.svg)]() | +| __Development__ | [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit) | __Contributions__ | [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CONTRIBUTING.md) [![Powered by the Bioregistry](https://img.shields.io/static/v1?label=Powered%20by&message=Bioregistry&color=BA274A&style=flat&logo=image/png;base64,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)](https://github.com/biopragmatics/bioregistry) | ## ❓ Description Knowledge graphs (KGs) are an [approach to knowledge From 7118591626e4fdc4bccf3c2a4d0eefa01e90a2ca Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 26 Oct 2023 11:01:13 +0200 Subject: [PATCH 236/343] shields io for pypi version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4e5994d3..c4d7a513 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ | | | | | | --- | --- | --- | --- | | __License__ | [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) | __Python__ | ![Python](https://img.shields.io/pypi/pyversions/biocypher) | -| __Package__ | [![PyPI version](https://badge.fury.io/py/biocypher.svg)](https://badge.fury.io/py/biocypher) [![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) | __Build status__ | [![CI](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml) [![Docs build](https://github.com/biocypher/biocypher/actions/workflows/docs.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/docs.yaml) | +| __Package__ | [![PyPI version](https://img.shields.io/pypi/v/biocypher)](https://img.shields.io/pypi/v/biocypher) [![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) | __Build status__ | [![CI](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml) [![Docs build](https://github.com/biocypher/biocypher/actions/workflows/docs.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/docs.yaml) | | __Test coverage__ | ![Coverage](https://raw.githubusercontent.com/biocypher/biocypher/coverage/coverage.svg) | __Code style__ | [![Black](https://img.shields.io/badge/code%20style-black-000000.svg)]() | | __Development__ | [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit) | __Contributions__ | [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CONTRIBUTING.md) [![Powered by the Bioregistry](https://img.shields.io/static/v1?label=Powered%20by&message=Bioregistry&color=BA274A&style=flat&logo=image/png;base64,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)](https://github.com/biopragmatics/bioregistry) | From bca5b815c62d1da31a9f977191820b65a13c3015 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 26 Oct 2023 11:02:20 +0200 Subject: [PATCH 237/343] shorten header --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c4d7a513..4c038261 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ | --- | --- | --- | --- | | __License__ | [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) | __Python__ | ![Python](https://img.shields.io/pypi/pyversions/biocypher) | | __Package__ | [![PyPI version](https://img.shields.io/pypi/v/biocypher)](https://img.shields.io/pypi/v/biocypher) [![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) | __Build status__ | [![CI](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml) [![Docs build](https://github.com/biocypher/biocypher/actions/workflows/docs.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/docs.yaml) | -| __Test coverage__ | ![Coverage](https://raw.githubusercontent.com/biocypher/biocypher/coverage/coverage.svg) | __Code style__ | [![Black](https://img.shields.io/badge/code%20style-black-000000.svg)]() | +| __Tests__ | ![Coverage](https://raw.githubusercontent.com/biocypher/biocypher/coverage/coverage.svg) | __Code style__ | [![Black](https://img.shields.io/badge/code%20style-black-000000.svg)]() | | __Development__ | [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit) | __Contributions__ | [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CONTRIBUTING.md) [![Powered by the Bioregistry](https://img.shields.io/static/v1?label=Powered%20by&message=Bioregistry&color=BA274A&style=flat&logo=image/png;base64,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)](https://github.com/biopragmatics/bioregistry) | ## ❓ Description From 653789e664af6ebebaaac7f8aca9e28fa61f3798 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 26 Oct 2023 11:11:23 +0200 Subject: [PATCH 238/343] docker badge cell --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4c038261..a2fb71f0 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,11 @@ | --- | --- | --- | --- | | __License__ | [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) | __Python__ | ![Python](https://img.shields.io/pypi/pyversions/biocypher) | | __Package__ | [![PyPI version](https://img.shields.io/pypi/v/biocypher)](https://img.shields.io/pypi/v/biocypher) [![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) | __Build status__ | [![CI](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml) [![Docs build](https://github.com/biocypher/biocypher/actions/workflows/docs.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/docs.yaml) | -| __Tests__ | ![Coverage](https://raw.githubusercontent.com/biocypher/biocypher/coverage/coverage.svg) | __Code style__ | [![Black](https://img.shields.io/badge/code%20style-black-000000.svg)]() | -| __Development__ | [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit) | __Contributions__ | [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CONTRIBUTING.md) [![Powered by the Bioregistry](https://img.shields.io/static/v1?label=Powered%20by&message=Bioregistry&color=BA274A&style=flat&logo=image/png;base64,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)](https://github.com/biopragmatics/bioregistry) | +| __Tests__ | ![Coverage](https://raw.githubusercontent.com/biocypher/biocypher/coverage/coverage.svg) | __Docker__ | [![Latest image](https://img.shields.io/docker/v/biocypher/base)](https://hub.docker.com/repository/docker/biocypher/base/general) [![Image size](https://img.shields.io/docker/image-size/biocypher/base/latest)](https://hub.docker.com/repository/docker/biocypher/base/general) | +| __Development__ | [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit) [![Code style](https://img.shields.io/badge/code%20style-black-000000.svg)]() | __Contributions__ | [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CONTRIBUTING.md) [![Powered by the Bioregistry](https://img.shields.io/static/v1?label=Powered%20by&message=Bioregistry&color=BA274A&style=flat&logo=image/png;base64,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)](https://github.com/biopragmatics/bioregistry) | + + + ## ❓ Description Knowledge graphs (KGs) are an [approach to knowledge From f6c1388614e86deded34538591edd3248ffb21f1 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 26 Oct 2023 11:13:01 +0200 Subject: [PATCH 239/343] python link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a2fb71f0..f95f4892 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ | | | | | | --- | --- | --- | --- | -| __License__ | [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) | __Python__ | ![Python](https://img.shields.io/pypi/pyversions/biocypher) | +| __License__ | [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) | __Python__ | [![Python](https://img.shields.io/pypi/pyversions/biocypher)](https://www.python.org) | | __Package__ | [![PyPI version](https://img.shields.io/pypi/v/biocypher)](https://img.shields.io/pypi/v/biocypher) [![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) | __Build status__ | [![CI](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml) [![Docs build](https://github.com/biocypher/biocypher/actions/workflows/docs.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/docs.yaml) | | __Tests__ | ![Coverage](https://raw.githubusercontent.com/biocypher/biocypher/coverage/coverage.svg) | __Docker__ | [![Latest image](https://img.shields.io/docker/v/biocypher/base)](https://hub.docker.com/repository/docker/biocypher/base/general) [![Image size](https://img.shields.io/docker/image-size/biocypher/base/latest)](https://hub.docker.com/repository/docker/biocypher/base/general) | | __Development__ | [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit) [![Code style](https://img.shields.io/badge/code%20style-black-000000.svg)]() | __Contributions__ | [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CONTRIBUTING.md) [![Powered by the Bioregistry](https://img.shields.io/static/v1?label=Powered%20by&message=Bioregistry&color=BA274A&style=flat&logo=image/png;base64,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)](https://github.com/biopragmatics/bioregistry) | From 3c797555e55cc55d62b1be23b3a47aef41370c4c Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 26 Oct 2023 11:16:05 +0200 Subject: [PATCH 240/343] code quality link --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f95f4892..b091ae50 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,8 @@ | | | | | | --- | --- | --- | --- | | __License__ | [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) | __Python__ | [![Python](https://img.shields.io/pypi/pyversions/biocypher)](https://www.python.org) | -| __Package__ | [![PyPI version](https://img.shields.io/pypi/v/biocypher)](https://img.shields.io/pypi/v/biocypher) [![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) | __Build status__ | [![CI](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml) [![Docs build](https://github.com/biocypher/biocypher/actions/workflows/docs.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/docs.yaml) | -| __Tests__ | ![Coverage](https://raw.githubusercontent.com/biocypher/biocypher/coverage/coverage.svg) | __Docker__ | [![Latest image](https://img.shields.io/docker/v/biocypher/base)](https://hub.docker.com/repository/docker/biocypher/base/general) [![Image size](https://img.shields.io/docker/image-size/biocypher/base/latest)](https://hub.docker.com/repository/docker/biocypher/base/general) | +| __Package__ | [![PyPI version](https://img.shields.io/pypi/v/biocypher)](https://pypi.org/project/biocypher/) [![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) | __Build status__ | [![CI](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml) [![Docs build](https://github.com/biocypher/biocypher/actions/workflows/docs.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/docs.yaml) | +| __Tests__ | [![Coverage](https://raw.githubusercontent.com/biocypher/biocypher/coverage/coverage.svg)](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml) | __Docker__ | [![Latest image](https://img.shields.io/docker/v/biocypher/base)](https://hub.docker.com/repository/docker/biocypher/base/general) [![Image size](https://img.shields.io/docker/image-size/biocypher/base/latest)](https://hub.docker.com/repository/docker/biocypher/base/general) | | __Development__ | [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit) [![Code style](https://img.shields.io/badge/code%20style-black-000000.svg)]() | __Contributions__ | [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CONTRIBUTING.md) [![Powered by the Bioregistry](https://img.shields.io/static/v1?label=Powered%20by&message=Bioregistry&color=BA274A&style=flat&logo=image/png;base64,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)](https://github.com/biopragmatics/bioregistry) | From f66a5d95c5f6d11e5700c0942249b00b34383aee Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 26 Oct 2023 11:16:59 +0200 Subject: [PATCH 241/343] black link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b091ae50..111d6390 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ | __License__ | [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) | __Python__ | [![Python](https://img.shields.io/pypi/pyversions/biocypher)](https://www.python.org) | | __Package__ | [![PyPI version](https://img.shields.io/pypi/v/biocypher)](https://pypi.org/project/biocypher/) [![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) | __Build status__ | [![CI](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml) [![Docs build](https://github.com/biocypher/biocypher/actions/workflows/docs.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/docs.yaml) | | __Tests__ | [![Coverage](https://raw.githubusercontent.com/biocypher/biocypher/coverage/coverage.svg)](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml) | __Docker__ | [![Latest image](https://img.shields.io/docker/v/biocypher/base)](https://hub.docker.com/repository/docker/biocypher/base/general) [![Image size](https://img.shields.io/docker/image-size/biocypher/base/latest)](https://hub.docker.com/repository/docker/biocypher/base/general) | -| __Development__ | [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit) [![Code style](https://img.shields.io/badge/code%20style-black-000000.svg)]() | __Contributions__ | [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CONTRIBUTING.md) [![Powered by the Bioregistry](https://img.shields.io/static/v1?label=Powered%20by&message=Bioregistry&color=BA274A&style=flat&logo=image/png;base64,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)](https://github.com/biopragmatics/bioregistry) | +| __Development__ | [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit) [![Code style](https://img.shields.io/badge/code%20style-black-000000.svg)](https://black.readthedocs.io/en/stable/) | __Contributions__ | [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CONTRIBUTING.md) [![Powered by the Bioregistry](https://img.shields.io/static/v1?label=Powered%20by&message=Bioregistry&color=BA274A&style=flat&logo=image/png;base64,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)](https://github.com/biopragmatics/bioregistry) | From 2f5e4b0c71e9d42b0b664c81cd34eb3cf4ec2902 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 26 Oct 2023 11:59:37 +0200 Subject: [PATCH 242/343] =?UTF-8?q?Bump=20version:=200.5.27=20=E2=86=92=20?= =?UTF-8?q?0.5.28?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- biocypher/_metadata.py | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index e4e49409..b726d973 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.5.27 +current_version = 0.5.28 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+) diff --git a/biocypher/_metadata.py b/biocypher/_metadata.py index 53ebf67c..e44a228d 100644 --- a/biocypher/_metadata.py +++ b/biocypher/_metadata.py @@ -19,7 +19,7 @@ import toml -_VERSION = "0.5.27" +_VERSION = "0.5.28" def get_metadata(): diff --git a/pyproject.toml b/pyproject.toml index 96ab463d..d36ae816 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "biocypher" -version = "0.5.27" +version = "0.5.28" description = "A unifying framework for biomedical research knowledge graphs" authors = [ "Sebastian Lobentanzer ", From c40fd46f3f3723a536bf2b717be88b3a7787dbbf Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Thu, 26 Oct 2023 12:10:41 +0200 Subject: [PATCH 243/343] issue #278: fix ontology root label check --- biocypher/_ontology.py | 26 ++++++++++++++++---------- test/test_ontology.py | 7 ++++++- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/biocypher/_ontology.py b/biocypher/_ontology.py index 7f7dc99b..da970178 100644 --- a/biocypher/_ontology.py +++ b/biocypher/_ontology.py @@ -96,16 +96,7 @@ def __init__( ) def _rdf_to_nx(self, g, root_label, switch_id_and_label=True): - # Loop through all labels in the ontology - for s, _, o in g.triples((None, rdflib.RDFS.label, None)): - # If the label is the root label, set the root node to the subject of the label - if o.eq(root_label): - root = s - break - else: - raise ValueError( - f"Could not find root node with label {root_label}" - ) + root = self._find_root_label(g, root_label) # Create a directed graph to represent the ontology as a tree G = nx.DiGraph() @@ -177,6 +168,21 @@ def _get_nx_id_and_label(node): return G + def _find_root_label(self, g, root_label): + # Loop through all labels in the ontology + for label_subject, _, label_in_ontology in g.triples( + (None, rdflib.RDFS.label, None) + ): + # If the label is the root label, set the root node to the subject of the label + if str(label_in_ontology) == root_label: + root = label_subject + break + else: + raise ValueError( + f"Could not find root node with label {root_label}" + ) + return root + def _remove_prefix(self, uri: str) -> str: """ Remove the prefix of a URI. URIs can contain either "#" or "/" as a diff --git a/test/test_ontology.py b/test/test_ontology.py index 383c5c44..44c152f4 100644 --- a/test/test_ontology.py +++ b/test/test_ontology.py @@ -3,7 +3,7 @@ import pytest import networkx as nx -from biocypher._ontology import Ontology +from biocypher._ontology import Ontology, OntologyAdapter def test_biolink_adapter(biolink_adapter): @@ -37,6 +37,11 @@ def test_mondo_adapter(mondo_adapter): assert "human disease" in mondo_adapter.get_ancestors("cystic fibrosis") +def test_ontology_adapter_root_node_missing(): + with pytest.raises(ValueError): + OntologyAdapter("test/so.owl", "not_in_tree") + + def test_ontology_functions(hybrid_ontology): assert isinstance(hybrid_ontology, Ontology) From 651ab8497de72ece890930b32eb7bb393d2137d6 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Thu, 26 Oct 2023 12:22:54 +0200 Subject: [PATCH 244/343] issue #278: rerun cicd --- biocypher/_ontology.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/biocypher/_ontology.py b/biocypher/_ontology.py index da970178..e9350dc8 100644 --- a/biocypher/_ontology.py +++ b/biocypher/_ontology.py @@ -173,7 +173,7 @@ def _find_root_label(self, g, root_label): for label_subject, _, label_in_ontology in g.triples( (None, rdflib.RDFS.label, None) ): - # If the label is the root label, set the root node to the subject of the label + # If the label is the root label, set the root node to the label's subject if str(label_in_ontology) == root_label: root = label_subject break From 3b6df157ecd8f1e4ad71a99624cbc22fcfcd6665 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Thu, 26 Oct 2023 15:46:30 +0200 Subject: [PATCH 245/343] issue #226: add config param to disable writing log file to disk --- biocypher/_config/biocypher_config.yaml | 4 +++ biocypher/_logger.py | 42 +++++++++++++++---------- 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/biocypher/_config/biocypher_config.yaml b/biocypher/_config/biocypher_config.yaml index 60a6a620..8aad144f 100644 --- a/biocypher/_config/biocypher_config.yaml +++ b/biocypher/_config/biocypher_config.yaml @@ -39,6 +39,10 @@ biocypher: # log_directory: biocypher-log + ## Set to configure if logs are written to disk + + # log_to_disk: true + ## Set to change the output directory # output_directory: biocypher-out diff --git a/biocypher/_logger.py b/biocypher/_logger.py index c936a44f..37a69416 100644 --- a/biocypher/_logger.py +++ b/biocypher/_logger.py @@ -60,11 +60,27 @@ def get_logger(name: str = "biocypher") -> logging.Logger: now = datetime.now() date_time = now.strftime("%Y%m%d-%H%M%S") - logdir = ( - _config.config("biocypher").get("log_directory") or "biocypher-log" - ) - os.makedirs(logdir, exist_ok=True) - logfile = os.path.join(logdir, f"biocypher-{date_time}.log") + log_to_disk = _config.config("biocypher").get("log_to_disk", True) + + if log_to_disk: + logdir = ( + _config.config("biocypher").get("log_directory") + or "biocypher-log" + ) + os.makedirs(logdir, exist_ok=True) + logfile = os.path.join(logdir, f"biocypher-{date_time}.log") + + # file handler + file_handler = logging.FileHandler(logfile) + + if _config.config("biocypher").get("debug"): + file_handler.setLevel(logging.DEBUG) + else: + file_handler.setLevel(logging.INFO) + + file_handler.setFormatter(file_formatter) + + logger.addHandler(file_handler) # handlers # stream handler @@ -72,23 +88,15 @@ def get_logger(name: str = "biocypher") -> logging.Logger: stdout_handler.setLevel(logging.INFO) stdout_handler.setFormatter(stdout_formatter) - # file handler - file_handler = logging.FileHandler(logfile) - - if _config.config("biocypher").get("debug"): - file_handler.setLevel(logging.DEBUG) - else: - file_handler.setLevel(logging.INFO) - - file_handler.setFormatter(file_formatter) - # add handlers - logger.addHandler(file_handler) logger.addHandler(stdout_handler) # startup message logger.info(f"This is BioCypher v{__version__}.") - logger.info(f"Logging into `{logfile}`.") + if log_to_disk: + logger.info(f"Logging into `{logfile}`.") + else: + logger.info("Logging into stdout.") return logging.getLogger(name) From e375f9dea3a938f8db62068bbc18046cc28b92fd Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Mon, 30 Oct 2023 10:55:40 +0100 Subject: [PATCH 246/343] issue #253: improve readability in tutorial by using lorem ipsum text --- tutorial/data_generator.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tutorial/data_generator.py b/tutorial/data_generator.py index 2ef144d9..f8752268 100644 --- a/tutorial/data_generator.py +++ b/tutorial/data_generator.py @@ -71,8 +71,8 @@ def _generate_properties(self): ## random amino acid sequence - # random int between 50 and 250 - random_length = random.randint(50, 250) + # random int between 20 and 50 + random_length = random.randint(20, 50) properties["sequence"] = "".join( [ @@ -82,8 +82,8 @@ def _generate_properties(self): ) ## random description - properties["description"] = " ".join( - [random.choice(string.ascii_lowercase) for _ in range(10)], + properties["description"] = "Lorem ipsum " + "".join( + [random.choice(string.ascii_lowercase) for _ in range(5)], ) ## taxon @@ -115,8 +115,8 @@ def _generate_properties(self): properties = {} ## random description - properties["description"] = " ".join( - [random.choice(string.ascii_lowercase) for _ in range(10)], + properties["description"] = "Lorem ipsum " + "".join( + [random.choice(string.ascii_lowercase) for _ in range(5)], ) ## taxon @@ -135,8 +135,8 @@ def _generate_properties(self): ## random amino acid sequence - # random int between 50 and 250 - random_length = random.randint(50, 250) + # random int between 20 and 50 + random_length = random.randint(20, 50) properties["sequence"] = "".join( [ @@ -146,8 +146,8 @@ def _generate_properties(self): ) ## random description - properties["description"] = " ".join( - [random.choice(string.ascii_lowercase) for _ in range(10)], + properties["description"] = "Lorem ipsum " + "".join( + [random.choice(string.ascii_lowercase) for _ in range(5)], ) ## random taxon @@ -262,8 +262,8 @@ def _generate_properties(self): ## randomly add 'method' if random.random() > 0.5: - properties["method"] = " ".join( - [random.choice(string.ascii_lowercase) for _ in range(10)], + properties["method"] = "Lorem ipsum " + "".join( + [random.choice(string.ascii_lowercase) for _ in range(5)], ) return properties From 48452322b63e03684d8c6fea2d701f1e697a5d2c Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Mon, 30 Oct 2023 15:53:39 +0100 Subject: [PATCH 247/343] fix issue #284: running BioCypher without schema --- biocypher/_core.py | 2 +- biocypher/_mapping.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/biocypher/_core.py b/biocypher/_core.py index 0fcffd25..c1b8a15d 100644 --- a/biocypher/_core.py +++ b/biocypher/_core.py @@ -181,7 +181,7 @@ def _get_ontology_mapping(self) -> OntologyMapping: """ if not self._schema_config_path: - return None + self._ontology_mapping = OntologyMapping() if not self._ontology_mapping: self._ontology_mapping = OntologyMapping( diff --git a/biocypher/_mapping.py b/biocypher/_mapping.py index 1269b28a..7113cf5d 100644 --- a/biocypher/_mapping.py +++ b/biocypher/_mapping.py @@ -40,7 +40,7 @@ def _read_config(self, config_file: str = None): Read the configuration file and store the ontology mapping and extensions. """ if config_file is None: - schema_config = _config.module_data("schema_config") + schema_config = {} # load yaml file from web elif config_file.startswith("http"): From 8936fbba7ae4205fbada5ffd865ed6c9f8561827 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Mon, 30 Oct 2023 15:54:20 +0100 Subject: [PATCH 248/343] fix issue #285: log ontology tree to log instead of stdout --- biocypher/_ontology.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/biocypher/_ontology.py b/biocypher/_ontology.py index e9350dc8..c7e91639 100644 --- a/biocypher/_ontology.py +++ b/biocypher/_ontology.py @@ -571,7 +571,7 @@ def show_ontology_structure(self, to_disk: str = None, full: bool = False): else: msg = f"Showing ontology structure based on {len(self._tail_ontology_meta)+1} ontologies: " - print(msg) + logger.info(msg) if not full: # set of leaves and their intermediate parents up to the root @@ -600,7 +600,7 @@ def show_ontology_structure(self, to_disk: str = None, full: bool = False): f"{self.mapping.extended_schema[node].get('synonym_for')}" ) - tree.show() + logger.info(f"\n{tree}") return tree From 83fdb648d998860a22919dc7d4aa420d2ec902a3 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Tue, 7 Nov 2023 15:07:08 +0100 Subject: [PATCH 249/343] change log to disk default setting defaults are set in the config YAML --- biocypher/_config/biocypher_config.yaml | 20 ++++++++------------ biocypher/_logger.py | 2 +- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/biocypher/_config/biocypher_config.yaml b/biocypher/_config/biocypher_config.yaml index 8aad144f..89b94bce 100644 --- a/biocypher/_config/biocypher_config.yaml +++ b/biocypher/_config/biocypher_config.yaml @@ -30,25 +30,21 @@ biocypher: root_node: entity ### Optional parameters ### - ## Logging granularity - ## Set debug to true if more granular logging is desired - debug: true + ## Logging + # Write log to disk + log_to_disk: true - ## Set to change the log directory + # Activate more granular logging + debug: true + # Change the log directory # log_directory: biocypher-log - ## Set to configure if logs are written to disk - - # log_to_disk: true - - ## Set to change the output directory - + ## Data output directory # output_directory: biocypher-out - ## Set to change the cache directory - + ## Resource cache directory # cache_directory: .cache ## Optional tail ontologies diff --git a/biocypher/_logger.py b/biocypher/_logger.py index 37a69416..5f65a73b 100644 --- a/biocypher/_logger.py +++ b/biocypher/_logger.py @@ -60,7 +60,7 @@ def get_logger(name: str = "biocypher") -> logging.Logger: now = datetime.now() date_time = now.strftime("%Y%m%d-%H%M%S") - log_to_disk = _config.config("biocypher").get("log_to_disk", True) + log_to_disk = _config.config("biocypher").get("log_to_disk") if log_to_disk: logdir = ( From 3c9a79b56f7e8cf2c7925cd27bc7c934a1f6175b Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Tue, 7 Nov 2023 15:45:27 +0100 Subject: [PATCH 250/343] issue #284: add unit test --- test/test_integration.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/test/test_integration.py b/test/test_integration.py index 54f60da3..3779a59b 100644 --- a/test/test_integration.py +++ b/test/test_integration.py @@ -62,6 +62,28 @@ def test_ontology_without_schema_config(core_no_schema): assert isinstance(core_no_schema._ontology._nx_graph, nx.DiGraph) +def test_show_full_ontology_without_schema_config(core_no_schema): + assert core_no_schema + + core_no_schema._head_ontology = { + "url": "http://semanticweb.cs.vu.nl/2009/11/sem/", + "root_node": "Core", + "format": "rdf", + } + core_no_schema._ontology_mapping = None + + core_no_schema._get_ontology() + + treevis = core_no_schema.show_ontology_structure(full=True) + + assert treevis is not None + assert "core" in treevis + assert "actor" in treevis + assert "event" in treevis + assert "place" in treevis + assert "time" in treevis + + @pytest.mark.parametrize("length", [4], scope="function") def test_write_schema_info_as_node(core, _get_nodes): core.write_nodes(_get_nodes) From cdea93641578d2166a238541c432e00aa0c74a21 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Tue, 7 Nov 2023 16:12:58 +0100 Subject: [PATCH 251/343] publish to the real PyPI using the action --- .github/workflows/publish.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 885482f0..25718576 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -20,8 +20,8 @@ jobs: env: PYTHON_VERSION: 3.9 environment: - name: staging # uploads to test.pypi.org - url: https://test.pypi.org/project/biocypher/ + name: release + url: https://upload.pypi.org/legacy/ permissions: id-token: write contents: write @@ -49,7 +49,7 @@ jobs: - name: Publish artifact to PyPI uses: pypa/gh-action-pypi-publish@release/v1 with: - repository-url: https://test.pypi.org/legacy/ + repository-url: https://upload.pypi.org/legacy/ #---------------------------------------------- # create Github release #---------------------------------------------- From 506faead03b8b2dee0e3dd89195ab92d597b6153 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Tue, 7 Nov 2023 16:13:53 +0100 Subject: [PATCH 252/343] =?UTF-8?q?Bump=20version:=200.5.28=20=E2=86=92=20?= =?UTF-8?q?0.5.29?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- biocypher/_metadata.py | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index b726d973..54795db8 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.5.28 +current_version = 0.5.29 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+) diff --git a/biocypher/_metadata.py b/biocypher/_metadata.py index e44a228d..fd1e4371 100644 --- a/biocypher/_metadata.py +++ b/biocypher/_metadata.py @@ -19,7 +19,7 @@ import toml -_VERSION = "0.5.28" +_VERSION = "0.5.29" def get_metadata(): diff --git a/pyproject.toml b/pyproject.toml index d36ae816..edb1a410 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "biocypher" -version = "0.5.28" +version = "0.5.29" description = "A unifying framework for biomedical research knowledge graphs" authors = [ "Sebastian Lobentanzer ", From 0938ef1ba8b4fbc3a05149ac55a90f1aa0496ed4 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Tue, 7 Nov 2023 16:23:15 +0100 Subject: [PATCH 253/343] =?UTF-8?q?Bump=20version:=200.5.29=20=E2=86=92=20?= =?UTF-8?q?0.5.30?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- biocypher/_metadata.py | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 54795db8..cf7d8ccf 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.5.29 +current_version = 0.5.30 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+) diff --git a/biocypher/_metadata.py b/biocypher/_metadata.py index fd1e4371..10b96e22 100644 --- a/biocypher/_metadata.py +++ b/biocypher/_metadata.py @@ -19,7 +19,7 @@ import toml -_VERSION = "0.5.29" +_VERSION = "0.5.30" def get_metadata(): diff --git a/pyproject.toml b/pyproject.toml index edb1a410..14dfff65 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "biocypher" -version = "0.5.29" +version = "0.5.30" description = "A unifying framework for biomedical research knowledge graphs" authors = [ "Sebastian Lobentanzer ", From d3195ea33d2e7b2bd516336dc1bbf38999a8221e Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Tue, 7 Nov 2023 22:55:12 +0100 Subject: [PATCH 254/343] issue #284: refactor test based on PR feedback --- test/test_core.py | 19 +++++++++++++++++++ test/test_integration.py | 22 ---------------------- 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/test/test_core.py b/test/test_core.py index 54cfeac6..8583d160 100644 --- a/test/test_core.py +++ b/test/test_core.py @@ -3,6 +3,8 @@ import yaml import pytest +from biocypher import BioCypher + def test_biocypher(core): assert core._dbms == "neo4j" @@ -87,6 +89,23 @@ def test_write_schema_info(core, _get_nodes, _get_edges, _get_rel_as_nodes): assert schema_loaded == schema +def test_show_full_ontology_structure_without_schema(): + bc = BioCypher( + head_ontology={ + "url": "test/so.owl", + "root_node": "sequence_variant", + } + ) + treevis = bc.show_ontology_structure(full=True) + + assert "sequence variant" in treevis + assert "functional effect variant" in treevis + assert "altered gene product level" in treevis + assert "decreased gene product level" in treevis + assert "functionally abnormal" in treevis + assert "lethal variant" in treevis + + # def test_access_translate(driver): # driver.start_ontology() diff --git a/test/test_integration.py b/test/test_integration.py index 3779a59b..54f60da3 100644 --- a/test/test_integration.py +++ b/test/test_integration.py @@ -62,28 +62,6 @@ def test_ontology_without_schema_config(core_no_schema): assert isinstance(core_no_schema._ontology._nx_graph, nx.DiGraph) -def test_show_full_ontology_without_schema_config(core_no_schema): - assert core_no_schema - - core_no_schema._head_ontology = { - "url": "http://semanticweb.cs.vu.nl/2009/11/sem/", - "root_node": "Core", - "format": "rdf", - } - core_no_schema._ontology_mapping = None - - core_no_schema._get_ontology() - - treevis = core_no_schema.show_ontology_structure(full=True) - - assert treevis is not None - assert "core" in treevis - assert "actor" in treevis - assert "event" in treevis - assert "place" in treevis - assert "time" in treevis - - @pytest.mark.parametrize("length", [4], scope="function") def test_write_schema_info_as_node(core, _get_nodes): core.write_nodes(_get_nodes) From 9fd6dbc2efe17a906a06ac469d21aafafd6bac30 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Tue, 7 Nov 2023 23:27:44 +0100 Subject: [PATCH 255/343] =?UTF-8?q?Bump=20version:=200.5.30=20=E2=86=92=20?= =?UTF-8?q?0.5.31?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- biocypher/_metadata.py | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index cf7d8ccf..4d58f113 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.5.30 +current_version = 0.5.31 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+) diff --git a/biocypher/_metadata.py b/biocypher/_metadata.py index 10b96e22..0f17fa35 100644 --- a/biocypher/_metadata.py +++ b/biocypher/_metadata.py @@ -19,7 +19,7 @@ import toml -_VERSION = "0.5.30" +_VERSION = "0.5.31" def get_metadata(): diff --git a/pyproject.toml b/pyproject.toml index 14dfff65..be8f56e6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "biocypher" -version = "0.5.30" +version = "0.5.31" description = "A unifying framework for biomedical research knowledge graphs" authors = [ "Sebastian Lobentanzer ", From 2f548f53a0365de24fa5d209781788897e2cecd1 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Wed, 8 Nov 2023 09:33:22 +0100 Subject: [PATCH 256/343] fix issue #228: fix doctest and run docs build on PRs --- .github/workflows/docs.yaml | 2 ++ docs/tutorial.md | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 6e0a8481..9f235cd4 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -1,6 +1,7 @@ name: Docs on: + pull_request: push: branches: - main @@ -31,6 +32,7 @@ jobs: uses: ./.github/actions/build_docs build_and_deploy_docs: + if: github.ref == 'refs/heads/main' runs-on: ubuntu-latest permissions: write-all steps: diff --git a/docs/tutorial.md b/docs/tutorial.md index 181079bb..67d0f2c5 100644 --- a/docs/tutorial.md +++ b/docs/tutorial.md @@ -272,11 +272,6 @@ bc.log_duplicates() # show duplicates in the input data bc.show_ontology_structure() # show ontological hierarchy ``` -```{testoutput} python -:hide: -... -``` - ## Section 2: Merging data (merging)= From dcfa6110e5df69a5e53f142d58b02349def4d7b5 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Wed, 8 Nov 2023 13:04:48 +0100 Subject: [PATCH 257/343] =?UTF-8?q?Bump=20version:=200.5.31=20=E2=86=92=20?= =?UTF-8?q?0.5.32?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- biocypher/_metadata.py | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 4d58f113..f53b5274 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.5.31 +current_version = 0.5.32 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+) diff --git a/biocypher/_metadata.py b/biocypher/_metadata.py index 0f17fa35..585cc727 100644 --- a/biocypher/_metadata.py +++ b/biocypher/_metadata.py @@ -19,7 +19,7 @@ import toml -_VERSION = "0.5.31" +_VERSION = "0.5.32" def get_metadata(): diff --git a/pyproject.toml b/pyproject.toml index be8f56e6..7c86f4b3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "biocypher" -version = "0.5.31" +version = "0.5.32" description = "A unifying framework for biomedical research knowledge graphs" authors = [ "Sebastian Lobentanzer ", From 66efa6ab0c6e1d7a4b788d130174a8ff7a44d8d5 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Mon, 20 Nov 2023 06:17:38 +0100 Subject: [PATCH 258/343] add pyopensci badge; will also generate a new .. release to enable Zenodo archiving --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 111d6390..5479b731 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ | __License__ | [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) | __Python__ | [![Python](https://img.shields.io/pypi/pyversions/biocypher)](https://www.python.org) | | __Package__ | [![PyPI version](https://img.shields.io/pypi/v/biocypher)](https://pypi.org/project/biocypher/) [![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) | __Build status__ | [![CI](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml) [![Docs build](https://github.com/biocypher/biocypher/actions/workflows/docs.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/docs.yaml) | | __Tests__ | [![Coverage](https://raw.githubusercontent.com/biocypher/biocypher/coverage/coverage.svg)](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml) | __Docker__ | [![Latest image](https://img.shields.io/docker/v/biocypher/base)](https://hub.docker.com/repository/docker/biocypher/base/general) [![Image size](https://img.shields.io/docker/image-size/biocypher/base/latest)](https://hub.docker.com/repository/docker/biocypher/base/general) | -| __Development__ | [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit) [![Code style](https://img.shields.io/badge/code%20style-black-000000.svg)](https://black.readthedocs.io/en/stable/) | __Contributions__ | [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CONTRIBUTING.md) [![Powered by the Bioregistry](https://img.shields.io/static/v1?label=Powered%20by&message=Bioregistry&color=BA274A&style=flat&logo=image/png;base64,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)](https://github.com/biopragmatics/bioregistry) | +| __Development__ | [![pyOpenSci](https://tinyurl.com/y22nb8up)](https://github.com/pyOpenSci/software-review/issues/110) [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit) [![Code style](https://img.shields.io/badge/code%20style-black-000000.svg)](https://black.readthedocs.io/en/stable/) | __Contributions__ | [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CONTRIBUTING.md) [![Powered by the Bioregistry](https://img.shields.io/static/v1?label=Powered%20by&message=Bioregistry&color=BA274A&style=flat&logo=image/png;base64,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)](https://github.com/biopragmatics/bioregistry) | From c37cf2f9223b367fc17d439d77bd3a7ac28ce90e Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Mon, 20 Nov 2023 06:18:13 +0100 Subject: [PATCH 259/343] =?UTF-8?q?Bump=20version:=200.5.32=20=E2=86=92=20?= =?UTF-8?q?0.5.33?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- biocypher/_metadata.py | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index f53b5274..0c439761 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.5.32 +current_version = 0.5.33 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+) diff --git a/biocypher/_metadata.py b/biocypher/_metadata.py index 585cc727..150f875a 100644 --- a/biocypher/_metadata.py +++ b/biocypher/_metadata.py @@ -19,7 +19,7 @@ import toml -_VERSION = "0.5.32" +_VERSION = "0.5.33" def get_metadata(): diff --git a/pyproject.toml b/pyproject.toml index 7c86f4b3..196e28b0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "biocypher" -version = "0.5.32" +version = "0.5.33" description = "A unifying framework for biomedical research knowledge graphs" authors = [ "Sebastian Lobentanzer ", From 6f13e2d280a9e226781f761c4d3038c3a3d894ec Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Mon, 20 Nov 2023 06:38:56 +0100 Subject: [PATCH 260/343] add zenodo doi --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5479b731..19f88b06 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ | | | | | | --- | --- | --- | --- | | __License__ | [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) | __Python__ | [![Python](https://img.shields.io/pypi/pyversions/biocypher)](https://www.python.org) | -| __Package__ | [![PyPI version](https://img.shields.io/pypi/v/biocypher)](https://pypi.org/project/biocypher/) [![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) | __Build status__ | [![CI](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml) [![Docs build](https://github.com/biocypher/biocypher/actions/workflows/docs.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/docs.yaml) | +| __Package__ | [![PyPI version](https://img.shields.io/pypi/v/biocypher)](https://pypi.org/project/biocypher/) [![Downloads](https://static.pepy.tech/badge/biocypher)](https://pepy.tech/project/biocypher) [![DOI](https://zenodo.org/badge/405143648.svg)](https://zenodo.org/doi/10.5281/zenodo.10158203) | __Build status__ | [![CI](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml) [![Docs build](https://github.com/biocypher/biocypher/actions/workflows/docs.yaml/badge.svg)](https://github.com/biocypher/biocypher/actions/workflows/docs.yaml) | | __Tests__ | [![Coverage](https://raw.githubusercontent.com/biocypher/biocypher/coverage/coverage.svg)](https://github.com/biocypher/biocypher/actions/workflows/tests_and_code_quality.yaml) | __Docker__ | [![Latest image](https://img.shields.io/docker/v/biocypher/base)](https://hub.docker.com/repository/docker/biocypher/base/general) [![Image size](https://img.shields.io/docker/image-size/biocypher/base/latest)](https://hub.docker.com/repository/docker/biocypher/base/general) | | __Development__ | [![pyOpenSci](https://tinyurl.com/y22nb8up)](https://github.com/pyOpenSci/software-review/issues/110) [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active) [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit) [![Code style](https://img.shields.io/badge/code%20style-black-000000.svg)](https://black.readthedocs.io/en/stable/) | __Contributions__ | [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com) [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](CONTRIBUTING.md) [![Powered by the Bioregistry](https://img.shields.io/static/v1?label=Powered%20by&message=Bioregistry&color=BA274A&style=flat&logo=image/png;base64,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)](https://github.com/biopragmatics/bioregistry) | From ddd563508136f9d2c8387a385c57527f3493ee62 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Mon, 27 Nov 2023 18:45:40 +0100 Subject: [PATCH 261/343] add list creation to API reference example --- docs/api.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/api.rst b/docs/api.rst index 11cb7a3c..d0dffaa1 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -219,6 +219,7 @@ downloads. Example usage: lifetime=7, is_dir=True, ) + resource_list = [resource1, resource2, resource3] paths = bc.download(resource_list) The files will be stored in the cache directory, in subfolders according to the From 3260aeaf58bea288be8ab43df0d0c9acc6e571b1 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Mon, 27 Nov 2023 19:09:29 +0100 Subject: [PATCH 262/343] warning/explanation if ontology is slow --- biocypher/_ontology.py | 23 +++++++++++++++++++++++ test/test_ontology.py | 19 ++++++++++++++++++- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/biocypher/_ontology.py b/biocypher/_ontology.py index c7e91639..08b884ee 100644 --- a/biocypher/_ontology.py +++ b/biocypher/_ontology.py @@ -14,6 +14,8 @@ other advanced operations. """ import os +import time +import logging from ._logger import logger @@ -29,6 +31,26 @@ from ._mapping import OntologyMapping +def warn_if_slow(threshold): + def decorator(func): + def wrapper(*args, **kwargs): + start_time = time.time() + result = func(*args, **kwargs) + elapsed_time = time.time() - start_time + if elapsed_time > threshold: + logging.warning( + "It seems the ontology is taking a long time to load. " + "This can sometimes happen due to slow resolving of " + "identifiers via identifiers.org. Most of the time, this " + "issue resolves itself after a few minutes." + ) + return result + + return wrapper + + return decorator + + class OntologyAdapter: """ Class that represents an ontology to be used in the Biocypher framework. Can @@ -194,6 +216,7 @@ def _remove_prefix(self, uri: str) -> str: else: return uri + @warn_if_slow(10) def _load_rdf_graph(self, ontology_file): """ Load the ontology into an RDFlib graph. The ontology file can be in diff --git a/test/test_ontology.py b/test/test_ontology.py index 44c152f4..3679ea7d 100644 --- a/test/test_ontology.py +++ b/test/test_ontology.py @@ -1,9 +1,11 @@ import os +import time +import logging import pytest import networkx as nx -from biocypher._ontology import Ontology, OntologyAdapter +from biocypher._ontology import Ontology, OntologyAdapter, warn_if_slow def test_biolink_adapter(biolink_adapter): @@ -162,3 +164,18 @@ def test_manual_format(): assert isinstance(ontology._nx_graph, nx.DiGraph) assert "event" in ontology._nx_graph.nodes + + +class TestWarnIfSlow: + @warn_if_slow(1) + def slow_method(self): + time.sleep(2) # This method deliberately takes 2 seconds to execute + + def test_warn_if_slow(self, caplog): + with caplog.at_level(logging.WARNING): + self.slow_method() + assert len(caplog.records) == 1 + assert ( + "It seems the ontology is taking a long time to load." + in caplog.text + ) From 80376a29dfca6abdc7fb9be36bb079b4505f939d Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Mon, 27 Nov 2023 23:48:53 +0100 Subject: [PATCH 263/343] remove slow test as it only works after the .. method has run. we need something that can warn while the method is .. still running, which involves threading. --- biocypher/_ontology.py | 46 +++++++++++++----------------------------- test/test_ontology.py | 17 ---------------- 2 files changed, 14 insertions(+), 49 deletions(-) diff --git a/biocypher/_ontology.py b/biocypher/_ontology.py index 08b884ee..c42a9474 100644 --- a/biocypher/_ontology.py +++ b/biocypher/_ontology.py @@ -27,30 +27,15 @@ import rdflib import networkx as nx -from . import _misc +from ._misc import ( + to_list, + to_lower_sentence_case, + create_tree_visualisation, + sentencecase_to_pascalcase, +) from ._mapping import OntologyMapping -def warn_if_slow(threshold): - def decorator(func): - def wrapper(*args, **kwargs): - start_time = time.time() - result = func(*args, **kwargs) - elapsed_time = time.time() - start_time - if elapsed_time > threshold: - logging.warning( - "It seems the ontology is taking a long time to load. " - "This can sometimes happen due to slow resolving of " - "identifiers via identifiers.org. Most of the time, this " - "issue resolves itself after a few minutes." - ) - return result - - return wrapper - - return decorator - - class OntologyAdapter: """ Class that represents an ontology to be used in the Biocypher framework. Can @@ -179,7 +164,7 @@ def _get_nx_id_and_label(node): node_label_str = str(g.value(node, rdflib.RDFS.label)).replace( "_", " " ) - node_label_str = _misc.to_lower_sentence_case(node_label_str) + node_label_str = to_lower_sentence_case(node_label_str) nx_id = node_label_str if switch_id_and_label else node_id_str nx_label = node_id_str if switch_id_and_label else node_label_str @@ -216,7 +201,6 @@ def _remove_prefix(self, uri: str) -> str: else: return uri - @warn_if_slow(10) def _load_rdf_graph(self, ontology_file): """ Load the ontology into an RDFlib graph. The ontology file can be in @@ -406,10 +390,8 @@ def _join_ontologies(self, adapter: OntologyAdapter) -> None: if not self._nx_graph: self._nx_graph = self._head_ontology.get_nx_graph().copy() - head_join_node = _misc.to_lower_sentence_case( - adapter.get_head_join_node() - ) - tail_join_node = _misc.to_lower_sentence_case(adapter.get_root_label()) + head_join_node = to_lower_sentence_case(adapter.get_head_join_node()) + tail_join_node = to_lower_sentence_case(adapter.get_root_label()) tail_ontology = adapter.get_nx_graph() # subtree of tail ontology at join node @@ -465,7 +447,7 @@ def _extend_ontology(self) -> None: continue - parents = _misc.to_list(value.get("is_a")) + parents = to_list(value.get("is_a")) child = key while parents: @@ -475,7 +457,7 @@ def _extend_ontology(self) -> None: self._nx_graph.add_node(parent) self._nx_graph.nodes[parent][ "label" - ] = _misc.sentencecase_to_pascalcase(parent) + ] = sentencecase_to_pascalcase(parent) # mark parent as user extension self._nx_graph.nodes[parent]["user_extension"] = True @@ -485,7 +467,7 @@ def _extend_ontology(self) -> None: self._nx_graph.add_node(child) self._nx_graph.nodes[child][ "label" - ] = _misc.sentencecase_to_pascalcase(child) + ] = sentencecase_to_pascalcase(child) # mark child as user extension self._nx_graph.nodes[child]["user_extension"] = True @@ -522,7 +504,7 @@ def _connect_biolink_classes(self) -> None: self._nx_graph.add_node(node) self._nx_graph.nodes[node][ "label" - ] = _misc.sentencecase_to_pascalcase(node) + ] = sentencecase_to_pascalcase(node) self._nx_graph.add_edge(node, "entity") @@ -611,7 +593,7 @@ def show_ontology_structure(self, to_disk: str = None, full: bool = False): if not to_disk: # create tree - tree = _misc.create_tree_visualisation(G) + tree = create_tree_visualisation(G) # add synonym information for node in self.mapping.extended_schema: diff --git a/test/test_ontology.py b/test/test_ontology.py index 3679ea7d..6d29be5d 100644 --- a/test/test_ontology.py +++ b/test/test_ontology.py @@ -1,6 +1,4 @@ import os -import time -import logging import pytest import networkx as nx @@ -164,18 +162,3 @@ def test_manual_format(): assert isinstance(ontology._nx_graph, nx.DiGraph) assert "event" in ontology._nx_graph.nodes - - -class TestWarnIfSlow: - @warn_if_slow(1) - def slow_method(self): - time.sleep(2) # This method deliberately takes 2 seconds to execute - - def test_warn_if_slow(self, caplog): - with caplog.at_level(logging.WARNING): - self.slow_method() - assert len(caplog.records) == 1 - assert ( - "It seems the ontology is taking a long time to load." - in caplog.text - ) From 24f1ac59eee9aaea03da951a880fb4b975dd7db1 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Tue, 28 Nov 2023 16:07:51 +0100 Subject: [PATCH 264/343] unused imports --- biocypher/_ontology.py | 2 -- test/test_ontology.py | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/biocypher/_ontology.py b/biocypher/_ontology.py index c42a9474..bb35760c 100644 --- a/biocypher/_ontology.py +++ b/biocypher/_ontology.py @@ -14,8 +14,6 @@ other advanced operations. """ import os -import time -import logging from ._logger import logger diff --git a/test/test_ontology.py b/test/test_ontology.py index 6d29be5d..44c152f4 100644 --- a/test/test_ontology.py +++ b/test/test_ontology.py @@ -3,7 +3,7 @@ import pytest import networkx as nx -from biocypher._ontology import Ontology, OntologyAdapter, warn_if_slow +from biocypher._ontology import Ontology, OntologyAdapter def test_biolink_adapter(biolink_adapter): From 35ae4a58b0f193c2b5b69d7b7da75af1ac831016 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Tue, 5 Dec 2023 12:41:19 +0100 Subject: [PATCH 265/343] admonition box for BioChatter --- docs/index.rst | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/docs/index.rst b/docs/index.rst index 89b6ebc1..5464638a 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -6,6 +6,13 @@ Democratising Knowledge Graphs ############################## +.. Admonition:: Hot Topics + :class: attention + + BioCypher is the simplest way to create an AI-enabled knowledge graph for + biomedical (or other) tasks. See :ref:`below ` for more + information. + Building a knowledge graph for biomedical tasks usually takes months or years. What if you could do it in weeks or days? We created BioCypher to make the process of creating a biomedical knowledge graph easier than ever, but still @@ -91,13 +98,15 @@ make this framework truly accessible and comprehensive, we need the input of the biomedical community. We are therefore inviting you to join us in this endeavour! +.. _connect_llm: + ===================================================== Connect your Knowledge Graph to Large Language Models ===================================================== To facilitate the use of knowledge graphs in downstream tasks, we have developed a framework to connect knowledge graphs to large language models. This framework -is called `biochatter `_ and is used in +is called `BioChatter `_ and is used in our web app `ChatGSE `_. See the links for more information. From 59dd8026d3be91d72a56814db39efd469c57857c Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Tue, 5 Dec 2023 12:44:08 +0100 Subject: [PATCH 266/343] try other link syntax --- docs/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.rst b/docs/index.rst index 5464638a..1416c248 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -10,7 +10,7 @@ Democratising Knowledge Graphs :class: attention BioCypher is the simplest way to create an AI-enabled knowledge graph for - biomedical (or other) tasks. See :ref:`below ` for more + biomedical (or other) tasks. See `below `_ for more information. Building a knowledge graph for biomedical tasks usually takes months or years. From ede0c6aa6a81325a6fcd717461b1fe182a032581 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Tue, 5 Dec 2023 12:51:04 +0100 Subject: [PATCH 267/343] link typo --- docs/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.rst b/docs/index.rst index 1416c248..c763f4b9 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -10,7 +10,7 @@ Democratising Knowledge Graphs :class: attention BioCypher is the simplest way to create an AI-enabled knowledge graph for - biomedical (or other) tasks. See `below `_ for more + biomedical (or other) tasks. See `below `_ for more information. Building a knowledge graph for biomedical tasks usually takes months or years. From 26c15cff63dcad40fe63afc0c1910485cf6f42ed Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Tue, 5 Dec 2023 12:54:40 +0100 Subject: [PATCH 268/343] last try with section syntax --- docs/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.rst b/docs/index.rst index c763f4b9..36a8daff 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -10,7 +10,7 @@ Democratising Knowledge Graphs :class: attention BioCypher is the simplest way to create an AI-enabled knowledge graph for - biomedical (or other) tasks. See `below `_ for more + biomedical (or other) tasks. See `below <_connect_llm>`_ for more information. Building a knowledge graph for biomedical tasks usually takes months or years. From 3187e909a398d2b3f224eb35b03c0f898fc83410 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Tue, 5 Dec 2023 12:59:12 +0100 Subject: [PATCH 269/343] section references no worky --- docs/index.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/index.rst b/docs/index.rst index 36a8daff..aa0aa142 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -10,8 +10,9 @@ Democratising Knowledge Graphs :class: attention BioCypher is the simplest way to create an AI-enabled knowledge graph for - biomedical (or other) tasks. See `below <_connect_llm>`_ for more - information. + biomedical (or other) tasks. See + `below `_ + for more information. Building a knowledge graph for biomedical tasks usually takes months or years. What if you could do it in weeks or days? We created BioCypher to make the From 5c80a46804e2c633c8d5a5f256d96892508140ba Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Fri, 8 Dec 2023 16:24:34 +0100 Subject: [PATCH 270/343] proof, that cache test are failing when explicitly setting the cache dir (only test code adapted) --- biocypher/_get.py | 11 ++++++++--- test/test_get.py | 6 ++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/biocypher/_get.py b/biocypher/_get.py index 29c1dc10..892327ab 100644 --- a/biocypher/_get.py +++ b/biocypher/_get.py @@ -114,9 +114,14 @@ def _download_or_cache(self, resource: Resource, cache: bool = True): if cache_record: # check if resource is expired (formatted in days) - dl = cache_record.get("date_downloaded") - lt = timedelta(days=resource.lifetime) - expired = dl + lt < datetime.now() + # download_time = datetime.strptime(cache_record.get("date_downloaded"), "%Y-%m-%d %H:%M:%S.%f") + download_time = cache_record.get("date_downloaded") + lifetime = timedelta(days=resource.lifetime) + print(type(download_time)) + print(download_time) + print(type(lifetime)) + print(lifetime) + expired = download_time + lifetime < datetime.now() else: expired = True diff --git a/test/test_get.py b/test/test_get.py index 7bc4f2ab..4bddf28a 100644 --- a/test/test_get.py +++ b/test/test_get.py @@ -11,7 +11,7 @@ @pytest.fixture def downloader(): - return Downloader(cache_dir=None) + return Downloader(cache_dir="./.cache") # TODO: test both cases None) @given( @@ -52,7 +52,9 @@ def test_download_file(downloader): # manipulate cache dict to test expiration (datetime format) downloader.cache_dict["test_resource"][ "date_downloaded" - ] = datetime.now() - timedelta(days=8) + ] = datetime.now() - timedelta( + days=8 + ) # TODO: concert to str paths = downloader.download(resource) # should download again From 930c2346f080e67de94f59a56c9f1860a254f765 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Fri, 8 Dec 2023 23:04:59 +0100 Subject: [PATCH 271/343] fix issue #300: fix caching --- .gitignore | 1 + biocypher/_get.py | 47 +++++++++++++++++---------- test/test_get.py | 81 +++++++++++++++++++++++++++++++++++------------ 3 files changed, 91 insertions(+), 38 deletions(-) diff --git a/.gitignore b/.gitignore index 236c4d64..e89668a6 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ dist/* .pytest_cache *.graphml .idea/* +.cache diff --git a/biocypher/_get.py b/biocypher/_get.py index 892327ab..59013da4 100644 --- a/biocypher/_get.py +++ b/biocypher/_get.py @@ -109,24 +109,10 @@ def _download_or_cache(self, resource: Resource, cache: bool = True): Returns: str or list: The path or paths to the downloaded resource(s). """ - # check if resource is cached - cache_record = self._get_cache_record(resource) - - if cache_record: - # check if resource is expired (formatted in days) - # download_time = datetime.strptime(cache_record.get("date_downloaded"), "%Y-%m-%d %H:%M:%S.%f") - download_time = cache_record.get("date_downloaded") - lifetime = timedelta(days=resource.lifetime) - print(type(download_time)) - print(download_time) - print(type(lifetime)) - print(lifetime) - expired = download_time + lifetime < datetime.now() - else: - expired = True + expired = self._is_cache_expired(resource) - # download resource if expired or not cache: + # download resource logger.info(f"Asking for download of {resource.name}.") if resource.is_dir: @@ -161,6 +147,33 @@ def _download_or_cache(self, resource: Resource, cache: bool = True): self._update_cache_record(resource) return paths + else: + cached_resource_location = os.path.join( + self.cache_dir, resource.name + ) + logger.info(f"Use cached version from {cached_resource_location}.") + return cached_resource_location + + def _is_cache_expired(self, resource: Resource) -> bool: + """ + Check if resource cache is expired. + + Args: + resource (Resource): The resource to download. + + Returns: + bool: cache is expired or not. + """ + cache_record = self._get_cache_record(resource) + if cache_record: + download_time = datetime.strptime( + cache_record.get("date_downloaded"), "%Y-%m-%d %H:%M:%S.%f" + ) + lifetime = timedelta(days=resource.lifetime) + expired = download_time + lifetime < datetime.now() + else: + expired = True + return expired def _retrieve( self, @@ -288,7 +301,7 @@ def _update_cache_record(self, resource: Resource): """ cache_record = {} cache_record["url"] = to_list(resource.url_s) - cache_record["date_downloaded"] = datetime.now() + cache_record["date_downloaded"] = str(datetime.now()) cache_record["lifetime"] = resource.lifetime self.cache_dict[resource.name] = cache_record with open(self.cache_file, "w") as f: diff --git a/test/test_get.py b/test/test_get.py index 4bddf28a..1d752942 100644 --- a/test/test_get.py +++ b/test/test_get.py @@ -10,8 +10,18 @@ @pytest.fixture -def downloader(): - return Downloader(cache_dir="./.cache") # TODO: test both cases None) +def downloader(request): + return request.getfixturevalue(request.param) + + +@pytest.fixture +def downloader_without_specified_cache_dir(): + return Downloader() + + +@pytest.fixture +def downloader_with_specified_cache_dir(): + return Downloader(cache_dir="./.cache") @given( @@ -29,11 +39,27 @@ def test_resource(resource): assert isinstance(resource.lifetime, int) +@pytest.mark.parametrize( + "downloader", + [ + "downloader_without_specified_cache_dir", + "downloader_with_specified_cache_dir", + ], + indirect=True, +) def test_downloader(downloader): assert isinstance(downloader.cache_dir, str) assert isinstance(downloader.cache_file, str) +@pytest.mark.parametrize( + "downloader", + [ + "downloader_without_specified_cache_dir", + "downloader_with_specified_cache_dir", + ], + indirect=True, +) def test_download_file(downloader): resource = Resource( "test_resource", @@ -46,22 +72,35 @@ def test_download_file(downloader): # test caching paths = downloader.download(resource) - # should not download again - assert paths[0] is None + # should not download again (assert that cache folder is returned) + if downloader == "downloader_without_specified_cache_dir": + assert "tmp" in paths[0] + elif downloader == "downloader_with_specified_cache_dir": + assert paths[0] is "./.cache" # manipulate cache dict to test expiration (datetime format) - downloader.cache_dict["test_resource"][ - "date_downloaded" - ] = datetime.now() - timedelta( - days=8 - ) # TODO: concert to str + downloader.cache_dict["test_resource"]["date_downloaded"] = str( + datetime.now() - timedelta(days=8) + ) paths = downloader.download(resource) # should download again assert len(paths) == 1 - assert paths[0] is not None - - + if downloader == "downloader_without_specified_cache_dir": + assert "test_resource/test_config.yaml" in paths[0] + assert "tmp" in paths[0] + elif downloader == "downloader_with_specified_cache_dir": + assert paths[0] is ".cache/test_resource/test_config.yaml" + + +@pytest.mark.parametrize( + "downloader", + [ + "downloader_without_specified_cache_dir", + "downloader_with_specified_cache_dir", + ], + indirect=True, +) def test_download_lists(downloader): resource1 = Resource( name="test_resource1", @@ -113,7 +152,7 @@ def test_download_lists(downloader): for path in paths: assert os.path.realpath(path) in expected_paths assert isinstance( - downloader.cache_dict["test_resource1"]["date_downloaded"], datetime + downloader.cache_dict["test_resource1"]["date_downloaded"], str ) assert isinstance(downloader.cache_dict["test_resource1"]["url"], list) assert len(downloader.cache_dict["test_resource1"]["url"]) == 2 @@ -143,7 +182,7 @@ def test_download_directory_and_caching(): paths = downloader.download(resource) # should not download again assert len(paths) == 1 - assert paths[0] is None + assert "tmp" in paths[0] def test_download_zip_and_expiration(): @@ -169,18 +208,18 @@ def test_download_zip_and_expiration(): assert os.path.exists(path) # use files downloaded here and manipulate cache file to test expiration - downloader.cache_dict["test_resource"][ - "date_downloaded" - ] = datetime.now() - timedelta(days=4) + downloader.cache_dict["test_resource"]["date_downloaded"] = str( + datetime.now() - timedelta(days=4) + ) paths = downloader.download(resource) # should not download again - assert paths[0] is None + assert "tmp" in paths[0] # minus 8 days from date_downloaded - downloader.cache_dict["test_resource"][ - "date_downloaded" - ] = datetime.now() - timedelta(days=8) + downloader.cache_dict["test_resource"]["date_downloaded"] = str( + datetime.now() - timedelta(days=8) + ) paths = downloader.download(resource) # should download again From 016010a7a0abac26b1bf73622e2028c045118214 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Fri, 8 Dec 2023 23:26:26 +0100 Subject: [PATCH 272/343] fix issue #300: rerun cicd --- test/test_get.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_get.py b/test/test_get.py index 1d752942..0f8df289 100644 --- a/test/test_get.py +++ b/test/test_get.py @@ -78,7 +78,7 @@ def test_download_file(downloader): elif downloader == "downloader_with_specified_cache_dir": assert paths[0] is "./.cache" - # manipulate cache dict to test expiration (datetime format) + # manipulate cache dict to test expiration downloader.cache_dict["test_resource"]["date_downloaded"] = str( datetime.now() - timedelta(days=8) ) From 64906c674be1dd1eab88440b92724bc81cf5b438 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Sat, 9 Dec 2023 12:46:51 +0100 Subject: [PATCH 273/343] date_downloaded in cache json is str, .. conversion to datetime only in python --- biocypher/_get.py | 4 +++- test/test_get.py | 25 ++++++++++++++----------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/biocypher/_get.py b/biocypher/_get.py index 29c1dc10..9bce9f2f 100644 --- a/biocypher/_get.py +++ b/biocypher/_get.py @@ -115,6 +115,8 @@ def _download_or_cache(self, resource: Resource, cache: bool = True): if cache_record: # check if resource is expired (formatted in days) dl = cache_record.get("date_downloaded") + # convert string to datetime + dl = datetime.strptime(dl, "%Y-%m-%d %H:%M:%S.%f") lt = timedelta(days=resource.lifetime) expired = dl + lt < datetime.now() else: @@ -283,7 +285,7 @@ def _update_cache_record(self, resource: Resource): """ cache_record = {} cache_record["url"] = to_list(resource.url_s) - cache_record["date_downloaded"] = datetime.now() + cache_record["date_downloaded"] = str(datetime.now()) cache_record["lifetime"] = resource.lifetime self.cache_dict[resource.name] = cache_record with open(self.cache_file, "w") as f: diff --git a/test/test_get.py b/test/test_get.py index 7bc4f2ab..4ee3821b 100644 --- a/test/test_get.py +++ b/test/test_get.py @@ -50,9 +50,9 @@ def test_download_file(downloader): assert paths[0] is None # manipulate cache dict to test expiration (datetime format) - downloader.cache_dict["test_resource"][ - "date_downloaded" - ] = datetime.now() - timedelta(days=8) + downloader.cache_dict["test_resource"]["date_downloaded"] = str( + datetime.now() - timedelta(days=8) + ) paths = downloader.download(resource) # should download again @@ -110,9 +110,12 @@ def test_download_lists(downloader): ] for path in paths: assert os.path.realpath(path) in expected_paths - assert isinstance( - downloader.cache_dict["test_resource1"]["date_downloaded"], datetime + # valid datetime + dt = datetime.strptime( + downloader.cache_dict["test_resource1"]["date_downloaded"], + "%Y-%m-%d %H:%M:%S.%f", ) + assert isinstance(dt, datetime) assert isinstance(downloader.cache_dict["test_resource1"]["url"], list) assert len(downloader.cache_dict["test_resource1"]["url"]) == 2 assert downloader.cache_dict["test_resource1"]["lifetime"] == 0 @@ -167,18 +170,18 @@ def test_download_zip_and_expiration(): assert os.path.exists(path) # use files downloaded here and manipulate cache file to test expiration - downloader.cache_dict["test_resource"][ - "date_downloaded" - ] = datetime.now() - timedelta(days=4) + downloader.cache_dict["test_resource"]["date_downloaded"] = str( + datetime.now() - timedelta(days=4) + ) paths = downloader.download(resource) # should not download again assert paths[0] is None # minus 8 days from date_downloaded - downloader.cache_dict["test_resource"][ - "date_downloaded" - ] = datetime.now() - timedelta(days=8) + downloader.cache_dict["test_resource"]["date_downloaded"] = str( + datetime.now() - timedelta(days=8) + ) paths = downloader.download(resource) # should download again From 8483df733f233677d4a0e42a6d7a92286f432883 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Sat, 9 Dec 2023 12:52:05 +0100 Subject: [PATCH 274/343] =?UTF-8?q?Bump=20version:=200.5.33=20=E2=86=92=20?= =?UTF-8?q?0.5.34?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- biocypher/_metadata.py | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 0c439761..fa82cdc2 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.5.33 +current_version = 0.5.34 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+) diff --git a/biocypher/_metadata.py b/biocypher/_metadata.py index 150f875a..a1aab6b2 100644 --- a/biocypher/_metadata.py +++ b/biocypher/_metadata.py @@ -19,7 +19,7 @@ import toml -_VERSION = "0.5.33" +_VERSION = "0.5.34" def get_metadata(): diff --git a/pyproject.toml b/pyproject.toml index 196e28b0..c6751fad 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "biocypher" -version = "0.5.33" +version = "0.5.34" description = "A unifying framework for biomedical research knowledge graphs" authors = [ "Sebastian Lobentanzer ", From 7658f537c6462a09ba716286044153f130083a43 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Mon, 18 Dec 2023 11:42:11 +0100 Subject: [PATCH 275/343] issue #300: adapt based on PR feedback; dont write to project dir; fix caching tests --- biocypher/_get.py | 119 ++++++++++++++++++++++++++-------------------- test/test_get.py | 28 +++++------ 2 files changed, 81 insertions(+), 66 deletions(-) diff --git a/biocypher/_get.py b/biocypher/_get.py index 1f55955b..420aebec 100644 --- a/biocypher/_get.py +++ b/biocypher/_get.py @@ -15,6 +15,7 @@ from __future__ import annotations from typing import Optional +import shutil from ._logger import logger @@ -109,61 +110,16 @@ def _download_or_cache(self, resource: Resource, cache: bool = True): Returns: str or list: The path or paths to the downloaded resource(s). """ - # check if resource is cached - cache_record = self._get_cache_record(resource) - - if cache_record: - # check if resource is expired (formatted in days) - dl = cache_record.get("date_downloaded") - # convert string to datetime - dl = datetime.strptime(dl, "%Y-%m-%d %H:%M:%S.%f") - lt = timedelta(days=resource.lifetime) - expired = dl + lt < datetime.now() - else: - expired = True + expired = self._is_cache_expired(resource) if expired or not cache: - # download resource + self._delete_expired_resource_cache(resource) logger.info(f"Asking for download of {resource.name}.") - - if resource.is_dir: - files = self._get_files(resource) - resource.url_s = [resource.url_s + "/" + file for file in files] - resource.is_dir = False - paths = self._download_or_cache(resource, cache) - elif isinstance(resource.url_s, list): - paths = [] - for url in resource.url_s: - fname = url[url.rfind("/") + 1 :] - paths.append( - self._retrieve( - url=url, - fname=fname, - path=os.path.join(self.cache_dir, resource.name), - ) - ) - else: - fname = resource.url_s[resource.url_s.rfind("/") + 1 :] - paths = self._retrieve( - url=resource.url_s, - fname=fname, - path=os.path.join(self.cache_dir, resource.name), - ) - - # sometimes a compressed file contains multiple files - # TODO ask for a list of files in the archive to be used from the - # adapter - - # update cache record - self._update_cache_record(resource) - - return paths + paths = self._download_resource(cache, resource) else: - cached_resource_location = os.path.join( - self.cache_dir, resource.name - ) - logger.info(f"Use cached version from {cached_resource_location}.") - return cached_resource_location + paths = self.get_cached_version(resource) + self._update_cache_record(resource) + return paths def _is_cache_expired(self, resource: Resource) -> bool: """ @@ -186,6 +142,67 @@ def _is_cache_expired(self, resource: Resource) -> bool: expired = True return expired + def _delete_expired_resource_cache(self, resource: Resource): + resource_cache_path = self.cache_dir + "/" + resource.name + if os.path.exists(resource_cache_path) and os.path.isdir( + resource_cache_path + ): + shutil.rmtree(resource_cache_path) + + def _download_resource(self, cache, resource): + """Download a resource. + + Args: + cache (bool): Whether to cache the resource or not. + resource (Resource): The resource to download. + + Returns: + str or list: The path or paths to the downloaded resource(s). + """ + if resource.is_dir: + files = self._get_files(resource) + resource.url_s = [resource.url_s + "/" + file for file in files] + resource.is_dir = False + paths = self._download_or_cache(resource, cache) + elif isinstance(resource.url_s, list): + paths = [] + for url in resource.url_s: + fname = url[url.rfind("/") + 1 :] + paths.append( + self._retrieve( + url=url, + fname=fname, + path=os.path.join(self.cache_dir, resource.name), + ) + ) + else: + fname = resource.url_s[resource.url_s.rfind("/") + 1 :] + paths = self._retrieve( + url=resource.url_s, + fname=fname, + path=os.path.join(self.cache_dir, resource.name), + ) + # sometimes a compressed file contains multiple files + # TODO ask for a list of files in the archive to be used from the + # adapter + return paths + + def get_cached_version(self, resource) -> list[str]: + """Get the cached version of a resource. + + Args: + resource (Resource): The resource to get the cached version of. + + Returns: + list[str]: The paths to the cached resource(s). + """ + cached_resource_location = os.path.join(self.cache_dir, resource.name) + logger.info(f"Use cached version from {cached_resource_location}.") + paths = [] + for file in os.listdir(cached_resource_location): + paths.append(os.path.join(cached_resource_location, file)) + return paths + def _retrieve( self, url: str, diff --git a/test/test_get.py b/test/test_get.py index 7ab301cf..c1ac3634 100644 --- a/test/test_get.py +++ b/test/test_get.py @@ -20,8 +20,10 @@ def downloader_without_specified_cache_dir(): @pytest.fixture -def downloader_with_specified_cache_dir(): - return Downloader(cache_dir="./.cache") +def downloader_with_specified_cache_dir(tmp_path): + tmp_cache_dir = tmp_path / ".cache" + tmp_cache_dir.mkdir() + return Downloader(cache_dir=str(tmp_cache_dir)) @given( @@ -67,17 +69,16 @@ def test_download_file(downloader): lifetime=7, ) paths = downloader.download(resource) + initial_download_time = os.path.getmtime(paths[0]) assert len(paths) == 1 assert os.path.exists(paths[0]) + assert "/test_resource/test_config.yaml" in paths[0] # test caching paths = downloader.download(resource) - # manipulate cache dict to test expiration (datetime format) - # should not download again (assert that cache folder is returned) - if downloader == "downloader_without_specified_cache_dir": - assert "tmp" in paths[0] - elif downloader == "downloader_with_specified_cache_dir": - assert paths[0] is "./.cache" + assert len(paths) == 1 + # should not download again + assert initial_download_time == os.path.getmtime(paths[0]) # manipulate cache dict to test expiration downloader.cache_dict["test_resource"]["date_downloaded"] = str( @@ -85,13 +86,9 @@ def test_download_file(downloader): ) paths = downloader.download(resource) - # should download again assert len(paths) == 1 - if downloader == "downloader_without_specified_cache_dir": - assert "test_resource/test_config.yaml" in paths[0] - assert "tmp" in paths[0] - elif downloader == "downloader_with_specified_cache_dir": - assert paths[0] is ".cache/test_resource/test_config.yaml" + # should download again + assert initial_download_time < os.path.getmtime(paths[0]) @pytest.mark.parametrize( @@ -156,6 +153,7 @@ def test_download_lists(downloader): dt = datetime.strptime( downloader.cache_dict["test_resource1"]["date_downloaded"], "%Y-%m-%d %H:%M:%S.%f", + ) assert isinstance(dt, datetime) assert isinstance(downloader.cache_dict["test_resource1"]["url"], list) assert len(downloader.cache_dict["test_resource1"]["url"]) == 2 @@ -184,7 +182,7 @@ def test_download_directory_and_caching(): # test caching paths = downloader.download(resource) # should not download again - assert len(paths) == 1 + assert len(paths) == 17 assert "tmp" in paths[0] From 73faa3622a01a54c8de83f497d47042758485404 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Mon, 18 Dec 2023 12:33:21 +0100 Subject: [PATCH 276/343] issue #300: fix file path for windows --- test/test_get.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_get.py b/test/test_get.py index c1ac3634..214cf344 100644 --- a/test/test_get.py +++ b/test/test_get.py @@ -72,7 +72,7 @@ def test_download_file(downloader): initial_download_time = os.path.getmtime(paths[0]) assert len(paths) == 1 assert os.path.exists(paths[0]) - assert "/test_resource/test_config.yaml" in paths[0] + assert f"{os.sep}test_resource{os.sep}test_config.yaml" in paths[0] # test caching paths = downloader.download(resource) From 1817703f247bcb8ebce9c540d15ca047838283ce Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 28 Dec 2023 08:54:28 +0100 Subject: [PATCH 277/343] update links for self-archived paper --- README.md | 14 +++++++++++--- docs/get-involved.md | 7 +------ docs/index.rst | 5 +++-- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 19f88b06..8f3a81a4 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,7 @@ ## ❓ Description + Knowledge graphs (KGs) are an [approach to knowledge representation](https://en.wikipedia.org/wiki/Knowledge_graph) that uses graph structure to facilitate exploration and analysis of complex data, often @@ -31,6 +32,7 @@ the docs [here](https://biocypher.org). ## 📖 Documentation + Tutorial and developer docs at https://biocypher.org. For a quickstart into your own pipeline, you can refer to our [project template](https://github.com/biocypher/project-template), and for an overview of @@ -39,6 +41,7 @@ features, visit our [GitHub Project Board](https://github.com/orgs/biocypher/projects/3/views/2). ## ⚙️ Installation / Usage + Install the package from PyPI using `pip install biocypher`. More comprehensive installation and configuration instructions can be found [here](https://biocypher.org/installation.html). @@ -48,6 +51,7 @@ and the various pipelines we have created. You can find these on the [Components Project Board](https://github.com/orgs/biocypher/projects/3/views/2). ## 🤝 Getting involved + We are very happy about contributions from the community, large and small! If you would like to contribute to BioCypher development, please refer to our [contribution guidelines](CONTRIBUTING.md). :) @@ -60,11 +64,15 @@ please join our community at https://biocypher.zulipchat.com! > This disclaimer was adapted from the [Pooch](https://github.com/fatiando/pooch) project. ## ✍️ Citation -The BioCypher paper has been peer-reviewed in -[Nature Biotechnology](https://www.nature.com/articles/s41587-023-01848-y). -Before, it was available as a preprint at https://arxiv.org/abs/2212.13543. + +The BioCypher paper has been peer-reviewed in [Nature +Biotechnology](https://www.nature.com/articles/s41587-023-01848-y). It is +available as a self-archived version on +[Zenodo](https://zenodo.org/records/10320714). Before, it was available as a +preprint at https://arxiv.org/abs/2212.13543. ## Acknowledgements + This project has received funding from the European Union’s Horizon 2020 research and innovation programme under grant agreement No 965193 for DECIDER and No 116030 for TransQST. diff --git a/docs/get-involved.md b/docs/get-involved.md index d02c3f1c..a7e4a5d8 100644 --- a/docs/get-involved.md +++ b/docs/get-involved.md @@ -18,7 +18,7 @@ ::: :::{grid-item-card} Join the mailing list -:link: https://dashboard.mailerlite.com/forms/374012/83295282984387838/share +:link: https://biocypher.zulipchat.com/ :text-align: center {octicon}`mail;3em` ::: @@ -59,11 +59,6 @@ discussions focused. It also is free of charge for open-source and academic projects, which means that they sponsor the cloud hosting for our channel (as for many other open-source projects) - thanks! -If you prefer to only be updated about the most important announcements and -events, you can also subscribe to our [mailing -list](https://dashboard.mailerlite.com/forms/374012/83295282984387838/share). We -will only post there with low frequency, and you can unsubscribe at any time. - If you want to contribute, please have a look at our [contribution guidelines](https://github.com/biocypher/biocypher/blob/main/CONTRIBUTING.md), including our [code of diff --git a/docs/index.rst b/docs/index.rst index aa0aa142..a94650ae 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -25,7 +25,8 @@ biomedical community. If you're new to knowledge graphs and want to familiarise with the concepts that drive BioCypher, we recommend to check out the graphical abstract below and read -`our paper `_! +`our paper `_ (self-archived +version `here `_)! .. grid:: 2 :gutter: 2 @@ -37,7 +38,7 @@ drive BioCypher, we recommend to check out the graphical abstract below and read :octicon:`mark-github;3em` :octicon:`repo;3em` .. grid-item-card:: Read the paper - :link: https://www.nature.com/articles/s41587-023-01848-y + :link: https://zenodo.org/records/10320714 :text-align: center :octicon:`book;3em` :octicon:`light-bulb;3em` From e2cf9855a0638152584f8c9444ed15a3fe4a089e Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 4 Jan 2024 16:09:56 +0100 Subject: [PATCH 278/343] todo comment --- test/test_get.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/test_get.py b/test/test_get.py index 214cf344..7ef92ee2 100644 --- a/test/test_get.py +++ b/test/test_get.py @@ -228,4 +228,5 @@ def test_download_zip_and_expiration(): def test_cache_api_request(): + # TODO pass From fddee7a3c49c86e4f87dec644d2eda3c6c63bc69 Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Thu, 4 Jan 2024 16:27:07 +0100 Subject: [PATCH 279/343] =?UTF-8?q?Bump=20version:=200.5.34=20=E2=86=92=20?= =?UTF-8?q?0.5.35?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- biocypher/_metadata.py | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index fa82cdc2..c2d5a9e2 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.5.34 +current_version = 0.5.35 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+) diff --git a/biocypher/_metadata.py b/biocypher/_metadata.py index a1aab6b2..ccadbc0c 100644 --- a/biocypher/_metadata.py +++ b/biocypher/_metadata.py @@ -19,7 +19,7 @@ import toml -_VERSION = "0.5.34" +_VERSION = "0.5.35" def get_metadata(): diff --git a/pyproject.toml b/pyproject.toml index c6751fad..6fe80e7e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "biocypher" -version = "0.5.34" +version = "0.5.35" description = "A unifying framework for biomedical research knowledge graphs" authors = [ "Sebastian Lobentanzer ", From 0388dd48ce312d934c14542620d322207ef989bc Mon Sep 17 00:00:00 2001 From: Sebastian Lobentanzer Date: Wed, 17 Jan 2024 12:12:46 +0100 Subject: [PATCH 280/343] docs small addition --- docs/installation.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/installation.md b/docs/installation.md index 00355571..4b96df56 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -72,13 +72,17 @@ in your project as a local dependency. (config)= # Configuration + BioCypher comes with a default set of configuration parameters. You can overwrite them by creating a `biocypher_config.yaml` file in the root directory or the `config` directory of your project. You only need to specify the ones you wish to override from default. If you want to create global user settings, you can create a `biocypher_config.yaml` in your default BioCypher user directory (as found using `appdirs.user_config_dir('biocypher')`). For instance, on Mac -OS, this would be `~/Library/Caches/biocypher/biocypher_config.yaml`. +OS, this would be `~/Library/Caches/biocypher/biocypher_config.yaml`. Finally, +you can also point an instance of the +[BioCypher](https://biocypher.org/modules/biocypher.BioCypher.html#biocypher.BioCypher) +class to any YAML file using the `biocypher_config_path` parameter. ```{note} From 62df295e434571a793c9878a712f5c655a3b4214 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Wed, 31 Jan 2024 10:40:33 +0100 Subject: [PATCH 281/343] #307: TDD add failing unit test to point out the current behavior --- .gitignore | 1 + test/ontologies/multiple_parent_nodes.owl | 83 ++++++++++++++++++++++ test/ontologies/multiple_parent_nodes.ttl | 85 +++++++++++++++++++++++ test/test_ontology.py | 18 +++++ 4 files changed, 187 insertions(+) create mode 100644 test/ontologies/multiple_parent_nodes.owl create mode 100644 test/ontologies/multiple_parent_nodes.ttl diff --git a/.gitignore b/.gitignore index e89668a6..59051e2c 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ dist/* *.graphml .idea/* .cache +*.iml \ No newline at end of file diff --git a/test/ontologies/multiple_parent_nodes.owl b/test/ontologies/multiple_parent_nodes.owl new file mode 100644 index 00000000..94712a85 --- /dev/null +++ b/test/ontologies/multiple_parent_nodes.owl @@ -0,0 +1,83 @@ + + + + The OWL 2 Schema vocabulary (OWL 2) + + This ontology partially describes the built-in classes and properties that together form the basis of the RDF/XML syntax of OWL 2. The content of this ontology is based on Tables 6.1 and 6.2 in Section 6.4 of the OWL 2 RDF-Based Semantics specification, available at http://www.w3.org/TR/owl2-rdf-based-semantics/. Please note that those tables do not include the different annotations (labels, comments and rdfs:isDefinedBy links) used in this file. Also note that the descriptions provided in this ontology do not provide a complete and correct formal description of either the syntax or the semantics of the introduced terms (please see the OWL 2 recommendations for the complete and normative specifications). Furthermore, the information provided by this ontology may be misleading if not used with care. This ontology SHOULD NOT be imported into OWL ontologies. Importing this file into an OWL 2 DL ontology will cause it to become an OWL 2 Full ontology and may have other, unexpected, consequences. + + + + + + + + + $Date: 2009/11/15 10:54:12 $ + + + + + Class + The class of OWL classes. + + + + + + Root + The class of OWL individuals. + + + + + Level1A + + Level1A. + + + + Level1B + + Level1B. + + + + Level2A + + Level2A. + + + + Level2B + + Level2B. + + + + Level2C + + Level2C. + + + + Child + + + + + + + + + + Child. + + + diff --git a/test/ontologies/multiple_parent_nodes.ttl b/test/ontologies/multiple_parent_nodes.ttl new file mode 100644 index 00000000..dc046eaf --- /dev/null +++ b/test/ontologies/multiple_parent_nodes.ttl @@ -0,0 +1,85 @@ +@prefix dc: . +@prefix grddl: . +@prefix owl: . +@prefix rdf: . +@prefix rdfs: . +@prefix xml: . +@prefix xsd: . + + a owl:Ontology ; + dc:title "The OWL 2 Schema vocabulary (OWL 2)" ; + rdfs:comment """ + This ontology partially describes the built-in classes and + properties that together form the basis of the RDF/XML syntax of OWL 2. + The content of this ontology is based on Tables 6.1 and 6.2 + in Section 6.4 of the OWL 2 RDF-Based Semantics specification, + available at http://www.w3.org/TR/owl2-rdf-based-semantics/. + Please note that those tables do not include the different annotations + (labels, comments and rdfs:isDefinedBy links) used in this file. + Also note that the descriptions provided in this ontology do not + provide a complete and correct formal description of either the syntax + or the semantics of the introduced terms (please see the OWL 2 + recommendations for the complete and normative specifications). + Furthermore, the information provided by this ontology may be + misleading if not used with care. This ontology SHOULD NOT be imported + into OWL ontologies. Importing this file into an OWL 2 DL ontology + will cause it to become an OWL 2 Full ontology and may have other, + unexpected, consequences. + """ ; + rdfs:isDefinedBy + , + , + ; + rdfs:seeAlso , + ; + owl:imports ; + owl:versionIRI ; + owl:versionInfo "$Date: 2009/11/15 10:54:12 $" ; + grddl:namespaceTransformation . + + +owl:Class a rdfs:Class ; + rdfs:label "Class" ; + rdfs:comment "The class of OWL classes." ; + rdfs:isDefinedBy ; + rdfs:subClassOf rdfs:Class . + +owl:Root a owl:Class ; + rdfs:label "Root" ; + rdfs:comment "The class of OWL individuals." ; + rdfs:isDefinedBy . + +owl:Level1A a owl:Class ; + rdfs:label "Level1A" ; + rdfs:subClassOf owl:Root ; + rdfs:comment "Level1A." . + +owl:Level1B a owl:Class ; + rdfs:label "Level1B" ; + rdfs:subClassOf owl:Root ; + rdfs:comment "Level1B." . + +owl:Level2A a owl:Class ; + rdfs:label "Level2A" ; + rdfs:subClassOf owl:Level1A ; + rdfs:comment "Level2A." . + +owl:Level2B a owl:Class ; + rdfs:label "Level2B" ; + rdfs:subClassOf owl:Level1A ; + rdfs:comment "Level2B." . + +owl:Level2C a owl:Class ; + rdfs:label "Level2C" ; + rdfs:subClassOf owl:Level1B ; + rdfs:comment "Level2C." . + +owl:Child a owl:Class ; + rdfs:label "Child" ; + rdfs:subClassOf [ owl:intersectionOf ( owl:Level2A + owl:Level2B + owl:Level2C + ); + rdf:type owl:Class + ] ; + rdfs:comment "Child." . diff --git a/test/test_ontology.py b/test/test_ontology.py index 44c152f4..0131dd71 100644 --- a/test/test_ontology.py +++ b/test/test_ontology.py @@ -162,3 +162,21 @@ def test_manual_format(): assert isinstance(ontology._nx_graph, nx.DiGraph) assert "event" in ontology._nx_graph.nodes + + +def test_multiple_parents(): + ontology_adapter = OntologyAdapter(ontology_file="test/ontologies/multiple_parent_nodes.ttl", root_label="Root") + result = ontology_adapter.get_nx_graph() + # Expected hierarchy: + # root + # ├── level1A + # │ ├── level2A + # │ │ └── child + # │ └── level2B + # │ └── child + # └── level1B + # └── level2C + # └── child + expected_edges = [('level1A', 'root'), ('level2A', 'level1A'), ('level1B', 'root'), ('level2C', 'level1B'), ('child', 'level2A'), ('child', 'level2B'), ('child', 'level2C'), ('level2B', 'level1A')] + for edge in expected_edges: + assert edge in result.edges From 2297452fb9dd06ae892a082ea52eb5d7ed5e1c14 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Wed, 31 Jan 2024 12:33:09 +0100 Subject: [PATCH 282/343] #307: adapt OntologyAdapter to handle multiple parents; add test case for missing label --- biocypher/_ontology.py | 131 +++++++++++++++++----- test/ontologies/missing_label.ttl | 22 ++++ test/ontologies/multiple_parent_nodes.owl | 24 +--- test/ontologies/multiple_parent_nodes.ttl | 38 +------ test/test_ontology.py | 17 ++- 5 files changed, 145 insertions(+), 87 deletions(-) create mode 100644 test/ontologies/missing_label.ttl diff --git a/biocypher/_ontology.py b/biocypher/_ontology.py index bb35760c..d23c282c 100644 --- a/biocypher/_ontology.py +++ b/biocypher/_ontology.py @@ -93,7 +93,7 @@ def __init__( self._reverse_labels = reverse_labels self._remove_prefixes = remove_prefixes - # Load the ontology into an rdflib Graph according to the file extension + # Load the ontology into a rdflib Graph according to the file extension self._rdf_graph = self._load_rdf_graph(ontology_file) self._nx_graph = self._rdf_to_nx( @@ -107,42 +107,37 @@ def _rdf_to_nx(self, g, root_label, switch_id_and_label=True): G = nx.DiGraph() # Define a recursive function to add subclasses to the graph - def add_subclasses(node): - # Only add nodes that have a label - if (node, rdflib.RDFS.label, None) not in g: + def add_subclasses(parent_node): + if not has_label(parent_node, g): return - nx_id, nx_label = _get_nx_id_and_label(node) - - if nx_id not in G: - G.add_node(nx_id) - G.nodes[nx_id]["label"] = nx_label + nx_parent_node_id, nx_parent_node_label = _get_nx_id_and_label(parent_node) - # Recursively add all subclasses of the node to the graph - for s, _, o in g.triples((None, rdflib.RDFS.subClassOf, node)): - # Only add nodes that have a label - if (s, rdflib.RDFS.label, None) not in g: - continue + if nx_parent_node_id not in G: + add_node(nx_parent_node_id, nx_parent_node_label) - s_id, s_label = _get_nx_id_and_label(s) - G.add_node(s_id) - G.nodes[s_id]["label"] = s_label + child_nodes = get_child_nodes(parent_node, g) - G.add_edge(s_id, nx_id) - add_subclasses(s) - add_parents(s) + if child_nodes: + for child_node in child_nodes: + if not has_label(child_node, g): + continue + nx_child_node_id, nx_child_node_label = _get_nx_id_and_label(child_node) + add_node(nx_child_node_id, nx_child_node_label) + G.add_edge(nx_child_node_id, nx_parent_node_id) + for child_node in child_nodes: + add_subclasses(child_node) + add_parents(child_node) def add_parents(node): - # Only add nodes that have a label - if (node, rdflib.RDFS.label, None) not in g: + if not has_label(node, g): return nx_id, nx_label = _get_nx_id_and_label(node) # Recursively add all parents of the node to the graph for s, _, o in g.triples((node, rdflib.RDFS.subClassOf, None)): - # Only add nodes that have a label - if (o, rdflib.RDFS.label, None) not in g: + if not has_label(o, g): continue o_id, o_label = _get_nx_id_and_label(o) @@ -151,12 +146,33 @@ def add_parents(node): if o_id in G: continue - G.add_node(o_id) - G.nodes[o_id]["label"] = o_label + add_node(o_id, o_label) G.add_edge(nx_id, o_id) add_parents(o) + def has_label(node: rdflib.URIRef, g: rdflib.Graph) -> bool: + """ Does the node have a label in g? + + Args: + node (rdflib.URIRef): The node to check + g (rdflib.Graph): The graph to check in + + Returns: + bool: True if the node has a label, False otherwise + """ + return (node, rdflib.RDFS.label, None) in g + + def add_node(nx_node_id: str, nx_node_label: str): + """ Add a node to the graph. + + Args: + nx_node_id (str): The ID of the node + nx_node_label (str): The label of the node + """ + G.add_node(nx_node_id) + G.nodes[nx_node_id]["label"] = nx_node_label + def _get_nx_id_and_label(node): node_id_str = self._remove_prefix(str(node)) node_label_str = str(g.value(node, rdflib.RDFS.label)).replace( @@ -168,6 +184,69 @@ def _get_nx_id_and_label(node): nx_label = node_id_str if switch_id_and_label else node_label_str return nx_id, nx_label + def get_child_nodes(parent_node: rdflib.URIRef, g: rdflib.Graph) -> list: + """ Get the child nodes of a node in the ontology. + Accounts for the case of multiple parents defined in intersectionOf. + + Args: + parent_node (rdflib.URIRef): The parent node to get the children of + g (rdflib.Graph): The graph to get the children from + + Returns: + list: A list of the child nodes + """ + child_nodes = [] + for s, p, o in g.triples((None, rdflib.RDFS.subClassOf, None)): + if (o, rdflib.RDF.type, rdflib.OWL.Class) in g and (o, rdflib.OWL.intersectionOf, None) in g: + # Check if node has multiple parent nodes defined in intersectionOf (one of them = parent_node) + parent_nodes = get_nodes_in_intersectionof(o) + if parent_node in parent_nodes: + child_nodes.append(s) + for node in parent_nodes: + add_parents(node) + elif o == parent_node: + # only one parent node + child_nodes.append(s) + return child_nodes + + def get_nodes_in_intersectionof(o: rdflib.URIRef) -> list: + """ Get the nodes in an intersectionOf node. + + Args: + o (rdflib.URIRef): The intersectionOf node + + Returns: + list: A list of the nodes in the intersectionOf node + """ + anonymous_intersection_nodes = [] + for _, _, anonymous_object in g.triples((o, rdflib.OWL.intersectionOf, None)): + anonymous_intersection_nodes.append(anonymous_object) + anonymous_intersection_node = anonymous_intersection_nodes[0] + nodes_in_intersection = retrieve_rdf_linked_list(anonymous_intersection_node) + return nodes_in_intersection + + def retrieve_rdf_linked_list(subject: rdflib.URIRef) -> list: + """ Recursively retrieves a linked list from RDF. + Example RDF list with the items [item1, item2]: + list_node - first -> item1 + list_node - rest -> list_node2 + list_node2 - first -> item2 + list_node2 - rest -> nil + + Args: + subject (rdflib.URIRef): One list_node of the RDF list + + Returns: + list: The items of the RDF list + """ + rdf_list = [] + for s, p, o in g.triples((subject, rdflib.RDF.first, None)): + rdf_list.append(o) + for s, p, o in g.triples((subject, rdflib.RDF.rest, None)): + if o != rdflib.RDF.nil: + rdf_list.extend(retrieve_rdf_linked_list(o)) + return rdf_list + # Add all subclasses of the root node to the graph add_subclasses(root) diff --git a/test/ontologies/missing_label.ttl b/test/ontologies/missing_label.ttl new file mode 100644 index 00000000..7c16faa9 --- /dev/null +++ b/test/ontologies/missing_label.ttl @@ -0,0 +1,22 @@ +@prefix owl: . +@prefix rdfs: . + +owl:Class a rdfs:Class ; + rdfs:label "Class" ; + rdfs:comment "The class of OWL classes." ; + rdfs:isDefinedBy ; + rdfs:subClassOf rdfs:Class . + +owl:Root a owl:Class ; + rdfs:label "Root" ; + rdfs:comment "The class of OWL individuals." ; + rdfs:isDefinedBy . + +owl:Level1A a owl:Class ; + rdfs:label "Level1A" ; + rdfs:subClassOf owl:Root ; + rdfs:comment "Level1A." . + +owl:Level1B a owl:Class ; + rdfs:subClassOf owl:Root ; + rdfs:comment "Level1B." . diff --git a/test/ontologies/multiple_parent_nodes.owl b/test/ontologies/multiple_parent_nodes.owl index 94712a85..c01808cd 100644 --- a/test/ontologies/multiple_parent_nodes.owl +++ b/test/ontologies/multiple_parent_nodes.owl @@ -1,27 +1,7 @@ - - - The OWL 2 Schema vocabulary (OWL 2) - - This ontology partially describes the built-in classes and properties that together form the basis of the RDF/XML syntax of OWL 2. The content of this ontology is based on Tables 6.1 and 6.2 in Section 6.4 of the OWL 2 RDF-Based Semantics specification, available at http://www.w3.org/TR/owl2-rdf-based-semantics/. Please note that those tables do not include the different annotations (labels, comments and rdfs:isDefinedBy links) used in this file. Also note that the descriptions provided in this ontology do not provide a complete and correct formal description of either the syntax or the semantics of the introduced terms (please see the OWL 2 recommendations for the complete and normative specifications). Furthermore, the information provided by this ontology may be misleading if not used with care. This ontology SHOULD NOT be imported into OWL ontologies. Importing this file into an OWL 2 DL ontology will cause it to become an OWL 2 Full ontology and may have other, unexpected, consequences. - - - - - - - - - $Date: 2009/11/15 10:54:12 $ - - + xmlns:owl="http://www.w3.org/2002/07/owl#"> Class @@ -32,7 +12,7 @@ Root - The class of OWL individuals. + The Root class. diff --git a/test/ontologies/multiple_parent_nodes.ttl b/test/ontologies/multiple_parent_nodes.ttl index dc046eaf..640343ba 100644 --- a/test/ontologies/multiple_parent_nodes.ttl +++ b/test/ontologies/multiple_parent_nodes.ttl @@ -1,42 +1,6 @@ -@prefix dc: . -@prefix grddl: . @prefix owl: . @prefix rdf: . @prefix rdfs: . -@prefix xml: . -@prefix xsd: . - - a owl:Ontology ; - dc:title "The OWL 2 Schema vocabulary (OWL 2)" ; - rdfs:comment """ - This ontology partially describes the built-in classes and - properties that together form the basis of the RDF/XML syntax of OWL 2. - The content of this ontology is based on Tables 6.1 and 6.2 - in Section 6.4 of the OWL 2 RDF-Based Semantics specification, - available at http://www.w3.org/TR/owl2-rdf-based-semantics/. - Please note that those tables do not include the different annotations - (labels, comments and rdfs:isDefinedBy links) used in this file. - Also note that the descriptions provided in this ontology do not - provide a complete and correct formal description of either the syntax - or the semantics of the introduced terms (please see the OWL 2 - recommendations for the complete and normative specifications). - Furthermore, the information provided by this ontology may be - misleading if not used with care. This ontology SHOULD NOT be imported - into OWL ontologies. Importing this file into an OWL 2 DL ontology - will cause it to become an OWL 2 Full ontology and may have other, - unexpected, consequences. - """ ; - rdfs:isDefinedBy - , - , - ; - rdfs:seeAlso , - ; - owl:imports ; - owl:versionIRI ; - owl:versionInfo "$Date: 2009/11/15 10:54:12 $" ; - grddl:namespaceTransformation . - owl:Class a rdfs:Class ; rdfs:label "Class" ; @@ -46,7 +10,7 @@ owl:Class a rdfs:Class ; owl:Root a owl:Class ; rdfs:label "Root" ; - rdfs:comment "The class of OWL individuals." ; + rdfs:comment "The Root class." ; rdfs:isDefinedBy . owl:Level1A a owl:Class ; diff --git a/test/test_ontology.py b/test/test_ontology.py index 0131dd71..ecc591e8 100644 --- a/test/test_ontology.py +++ b/test/test_ontology.py @@ -164,8 +164,9 @@ def test_manual_format(): assert "event" in ontology._nx_graph.nodes -def test_multiple_parents(): - ontology_adapter = OntologyAdapter(ontology_file="test/ontologies/multiple_parent_nodes.ttl", root_label="Root") +@pytest.mark.parametrize("ontology_file", ["test/ontologies/multiple_parent_nodes.ttl", "test/ontologies/multiple_parent_nodes.owl"]) +def test_multiple_parents(ontology_file): + ontology_adapter = OntologyAdapter(ontology_file=ontology_file, root_label="Root") result = ontology_adapter.get_nx_graph() # Expected hierarchy: # root @@ -180,3 +181,15 @@ def test_multiple_parents(): expected_edges = [('level1A', 'root'), ('level2A', 'level1A'), ('level1B', 'root'), ('level2C', 'level1B'), ('child', 'level2A'), ('child', 'level2B'), ('child', 'level2C'), ('level2B', 'level1A')] for edge in expected_edges: assert edge in result.edges + + +def test_missing_label_on_node(): + ontology_adapter = OntologyAdapter(ontology_file="test/ontologies/missing_label.ttl", root_label="Root") + result = ontology_adapter.get_nx_graph() + # Expected hierarchy: + # root + # ├── level1A + # (└── level1B) <- missing label on this node (should not be part of the graph) + expected_edges = [('level1A', 'root')] + for edge in expected_edges: + assert edge in result.edges From 1f7dd30dbfbbe9a9842e7f8fde5b54d77c41aefa Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Wed, 31 Jan 2024 12:42:36 +0100 Subject: [PATCH 283/343] #307: run pre-commit hooks --- .gitignore | 2 +- biocypher/_ontology.py | 37 ++++++++++++++++------- test/ontologies/multiple_parent_nodes.owl | 2 +- test/ontologies/multiple_parent_nodes.ttl | 6 ++-- test/test_ontology.py | 29 +++++++++++++++--- 5 files changed, 55 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 59051e2c..b86d98f6 100644 --- a/.gitignore +++ b/.gitignore @@ -30,4 +30,4 @@ dist/* *.graphml .idea/* .cache -*.iml \ No newline at end of file +*.iml diff --git a/biocypher/_ontology.py b/biocypher/_ontology.py index d23c282c..e22c2590 100644 --- a/biocypher/_ontology.py +++ b/biocypher/_ontology.py @@ -111,7 +111,9 @@ def add_subclasses(parent_node): if not has_label(parent_node, g): return - nx_parent_node_id, nx_parent_node_label = _get_nx_id_and_label(parent_node) + nx_parent_node_id, nx_parent_node_label = _get_nx_id_and_label( + parent_node + ) if nx_parent_node_id not in G: add_node(nx_parent_node_id, nx_parent_node_label) @@ -122,7 +124,10 @@ def add_subclasses(parent_node): for child_node in child_nodes: if not has_label(child_node, g): continue - nx_child_node_id, nx_child_node_label = _get_nx_id_and_label(child_node) + ( + nx_child_node_id, + nx_child_node_label, + ) = _get_nx_id_and_label(child_node) add_node(nx_child_node_id, nx_child_node_label) G.add_edge(nx_child_node_id, nx_parent_node_id) for child_node in child_nodes: @@ -152,7 +157,7 @@ def add_parents(node): add_parents(o) def has_label(node: rdflib.URIRef, g: rdflib.Graph) -> bool: - """ Does the node have a label in g? + """Does the node have a label in g? Args: node (rdflib.URIRef): The node to check @@ -164,7 +169,7 @@ def has_label(node: rdflib.URIRef, g: rdflib.Graph) -> bool: return (node, rdflib.RDFS.label, None) in g def add_node(nx_node_id: str, nx_node_label: str): - """ Add a node to the graph. + """Add a node to the graph. Args: nx_node_id (str): The ID of the node @@ -184,8 +189,10 @@ def _get_nx_id_and_label(node): nx_label = node_id_str if switch_id_and_label else node_label_str return nx_id, nx_label - def get_child_nodes(parent_node: rdflib.URIRef, g: rdflib.Graph) -> list: - """ Get the child nodes of a node in the ontology. + def get_child_nodes( + parent_node: rdflib.URIRef, g: rdflib.Graph + ) -> list: + """Get the child nodes of a node in the ontology. Accounts for the case of multiple parents defined in intersectionOf. Args: @@ -197,7 +204,11 @@ def get_child_nodes(parent_node: rdflib.URIRef, g: rdflib.Graph) -> list: """ child_nodes = [] for s, p, o in g.triples((None, rdflib.RDFS.subClassOf, None)): - if (o, rdflib.RDF.type, rdflib.OWL.Class) in g and (o, rdflib.OWL.intersectionOf, None) in g: + if (o, rdflib.RDF.type, rdflib.OWL.Class) in g and ( + o, + rdflib.OWL.intersectionOf, + None, + ) in g: # Check if node has multiple parent nodes defined in intersectionOf (one of them = parent_node) parent_nodes = get_nodes_in_intersectionof(o) if parent_node in parent_nodes: @@ -210,7 +221,7 @@ def get_child_nodes(parent_node: rdflib.URIRef, g: rdflib.Graph) -> list: return child_nodes def get_nodes_in_intersectionof(o: rdflib.URIRef) -> list: - """ Get the nodes in an intersectionOf node. + """Get the nodes in an intersectionOf node. Args: o (rdflib.URIRef): The intersectionOf node @@ -219,14 +230,18 @@ def get_nodes_in_intersectionof(o: rdflib.URIRef) -> list: list: A list of the nodes in the intersectionOf node """ anonymous_intersection_nodes = [] - for _, _, anonymous_object in g.triples((o, rdflib.OWL.intersectionOf, None)): + for _, _, anonymous_object in g.triples( + (o, rdflib.OWL.intersectionOf, None) + ): anonymous_intersection_nodes.append(anonymous_object) anonymous_intersection_node = anonymous_intersection_nodes[0] - nodes_in_intersection = retrieve_rdf_linked_list(anonymous_intersection_node) + nodes_in_intersection = retrieve_rdf_linked_list( + anonymous_intersection_node + ) return nodes_in_intersection def retrieve_rdf_linked_list(subject: rdflib.URIRef) -> list: - """ Recursively retrieves a linked list from RDF. + """Recursively retrieves a linked list from RDF. Example RDF list with the items [item1, item2]: list_node - first -> item1 list_node - rest -> list_node2 diff --git a/test/ontologies/multiple_parent_nodes.owl b/test/ontologies/multiple_parent_nodes.owl index c01808cd..d41e2780 100644 --- a/test/ontologies/multiple_parent_nodes.owl +++ b/test/ontologies/multiple_parent_nodes.owl @@ -59,5 +59,5 @@ Child. - + diff --git a/test/ontologies/multiple_parent_nodes.ttl b/test/ontologies/multiple_parent_nodes.ttl index 640343ba..531d1aac 100644 --- a/test/ontologies/multiple_parent_nodes.ttl +++ b/test/ontologies/multiple_parent_nodes.ttl @@ -42,8 +42,8 @@ owl:Child a owl:Class ; rdfs:label "Child" ; rdfs:subClassOf [ owl:intersectionOf ( owl:Level2A owl:Level2B - owl:Level2C - ); - rdf:type owl:Class + owl:Level2C + ); + rdf:type owl:Class ] ; rdfs:comment "Child." . diff --git a/test/test_ontology.py b/test/test_ontology.py index ecc591e8..32ecba19 100644 --- a/test/test_ontology.py +++ b/test/test_ontology.py @@ -164,9 +164,17 @@ def test_manual_format(): assert "event" in ontology._nx_graph.nodes -@pytest.mark.parametrize("ontology_file", ["test/ontologies/multiple_parent_nodes.ttl", "test/ontologies/multiple_parent_nodes.owl"]) +@pytest.mark.parametrize( + "ontology_file", + [ + "test/ontologies/multiple_parent_nodes.ttl", + "test/ontologies/multiple_parent_nodes.owl", + ], +) def test_multiple_parents(ontology_file): - ontology_adapter = OntologyAdapter(ontology_file=ontology_file, root_label="Root") + ontology_adapter = OntologyAdapter( + ontology_file=ontology_file, root_label="Root" + ) result = ontology_adapter.get_nx_graph() # Expected hierarchy: # root @@ -178,18 +186,29 @@ def test_multiple_parents(ontology_file): # └── level1B # └── level2C # └── child - expected_edges = [('level1A', 'root'), ('level2A', 'level1A'), ('level1B', 'root'), ('level2C', 'level1B'), ('child', 'level2A'), ('child', 'level2B'), ('child', 'level2C'), ('level2B', 'level1A')] + expected_edges = [ + ("level1A", "root"), + ("level2A", "level1A"), + ("level1B", "root"), + ("level2C", "level1B"), + ("child", "level2A"), + ("child", "level2B"), + ("child", "level2C"), + ("level2B", "level1A"), + ] for edge in expected_edges: assert edge in result.edges def test_missing_label_on_node(): - ontology_adapter = OntologyAdapter(ontology_file="test/ontologies/missing_label.ttl", root_label="Root") + ontology_adapter = OntologyAdapter( + ontology_file="test/ontologies/missing_label.ttl", root_label="Root" + ) result = ontology_adapter.get_nx_graph() # Expected hierarchy: # root # ├── level1A # (└── level1B) <- missing label on this node (should not be part of the graph) - expected_edges = [('level1A', 'root')] + expected_edges = [("level1A", "root")] for edge in expected_edges: assert edge in result.edges From 0c265ccd25672ff4e01ca81d30709948fd83acf9 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Wed, 31 Jan 2024 13:19:49 +0100 Subject: [PATCH 284/343] #307: rertun cicd --- biocypher/_ontology.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/biocypher/_ontology.py b/biocypher/_ontology.py index e22c2590..e25c3b47 100644 --- a/biocypher/_ontology.py +++ b/biocypher/_ontology.py @@ -147,7 +147,7 @@ def add_parents(node): o_id, o_label = _get_nx_id_and_label(o) - # Skip nodes already in the graph + # Skip if node already in the graph if o_id in G: continue From 2444954e4664ee84143e6efcee51cd9541433896 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Thu, 1 Feb 2024 12:48:53 +0100 Subject: [PATCH 285/343] #307: add warning log if multiple inheritance is present; improve the unit tests; refactoring --- biocypher/_logger.py | 2 +- biocypher/_misc.py | 74 +++++++++++++++++++++++++++++--------------- test/test_misc.py | 45 +++++++++++++++++++++++++++ 3 files changed, 95 insertions(+), 26 deletions(-) diff --git a/biocypher/_logger.py b/biocypher/_logger.py index 5f65a73b..4817ed73 100644 --- a/biocypher/_logger.py +++ b/biocypher/_logger.py @@ -48,7 +48,7 @@ def get_logger(name: str = "biocypher") -> logging.Logger: # create logger logger = logging.getLogger(name) logger.setLevel(logging.DEBUG) - logger.propagate = False + logger.propagate = True # formatting file_formatter = logging.Formatter( diff --git a/biocypher/_misc.py b/biocypher/_misc.py index b516a048..fae8bea0 100644 --- a/biocypher/_misc.py +++ b/biocypher/_misc.py @@ -76,56 +76,80 @@ def ensure_iterable(value: Any) -> Iterable: return value if isinstance(value, LIST_LIKE) else (value,) -def create_tree_visualisation(inheritance_tree: Union[dict, nx.Graph]) -> str: +def create_tree_visualisation(inheritance_graph: Union[dict, nx.Graph]) -> Tree: """ Creates a visualisation of the inheritance tree using treelib. """ + inheritance_tree = _get_inheritance_tree(inheritance_graph) + classes, root = _find_root_node(inheritance_tree) + + tree = Tree() + tree.create_node(root, root) + while classes: + for child in classes: + parent = inheritance_tree[child] + if parent in tree.nodes.keys() or parent == root: + tree.create_node(child, child, parent=parent) + + for node in tree.nodes.keys(): + if node in classes: + classes.remove(node) + + return tree + + +def _get_inheritance_tree(inheritance_graph: Union[dict, nx.Graph]) -> dict: + """Transforms an inheritance_graph into an inheritance_tree. + + Args: + inheritance_graph: A dict or nx.Graph representing the inheritance graph. + + Returns: + A dict representing the inheritance tree. + """ + if isinstance(inheritance_graph, nx.Graph): + inheritance_tree = nx.to_dict_of_lists(inheritance_graph) + + multiple_parents_present = _multiple_inheritance_present( + inheritance_tree + ) + if multiple_parents_present: + logger.warning( + "The ontology contains multiple inheritance (one child node has multiple parent nodes). This is not visualized in the following hierarchy tree (the child node is only added once). If you want to browse all relationships of the parsed ontology write a graphml file to disk and view this file." + ) - if isinstance(inheritance_tree, nx.Graph): - inheritance_tree = nx.to_dict_of_lists(inheritance_tree) # unlist values inheritance_tree = {k: v[0] for k, v in inheritance_tree.items() if v} + return inheritance_tree + elif not _multiple_inheritance_present(inheritance_graph): + return inheritance_graph + - # find root node +def _multiple_inheritance_present(inheritance_tree: dict) -> bool: + """Checks if multiple inheritance is present in the inheritance_tree.""" + return any(len(value) > 1 for value in inheritance_tree.values()) + + +def _find_root_node(inheritance_tree: dict) -> tuple[set, str]: classes = set(inheritance_tree.keys()) parents = set(inheritance_tree.values()) root = list(parents - classes) - if len(root) > 1: if "entity" in root: root = "entity" # default: good standard? TODO - else: raise ValueError( "Inheritance tree cannot have more than one root node. " f"Found {len(root)}: {root}." ) - else: root = root[0] - if not root: # find key whose value is None root = list(inheritance_tree.keys())[ list(inheritance_tree.values()).index(None) ] - - tree = Tree() - - tree.create_node(root, root) - - while classes: - for child in classes: - parent = inheritance_tree[child] - - if parent in tree.nodes.keys() or parent == root: - tree.create_node(child, child, parent=parent) - - for node in tree.nodes.keys(): - if node in classes: - classes.remove(node) - - return tree + return classes, root # string conversion, adapted from Biolink Model Toolkit diff --git a/test/test_misc.py b/test/test_misc.py index 99d4ef8e..6f749446 100644 --- a/test/test_misc.py +++ b/test/test_misc.py @@ -1,4 +1,7 @@ +import logging + import pytest +import treelib import networkx as nx from biocypher._misc import create_tree_visualisation @@ -35,9 +38,16 @@ def _get_disjoint_tree() -> dict: def test_tree_vis(_get_inheritance_tree): tree_vis = create_tree_visualisation(_get_inheritance_tree) + expected_tree_vis = create_tree_visualisation( + nx.DiGraph(_get_inheritance_tree) + ) + assert tree_vis.DEPTH == 1 assert tree_vis.WIDTH == 2 assert tree_vis.root == "A" + assert tree_vis.to_json(with_data=True) == expected_tree_vis.to_json( + with_data=True + ) def test_tree_vis_from_networkx(_get_inheritance_tree): @@ -45,9 +55,16 @@ def test_tree_vis_from_networkx(_get_inheritance_tree): tree_vis = create_tree_visualisation(graph) + expected_tree_vis = create_tree_visualisation( + nx.DiGraph(_get_inheritance_tree) + ) + assert tree_vis.DEPTH == 1 assert tree_vis.WIDTH == 2 assert tree_vis.root == "A" + assert tree_vis.to_json(with_data=True) == expected_tree_vis.to_json( + with_data=True + ) def test_disjoint_tree(_get_disjoint_tree): @@ -55,6 +72,34 @@ def test_disjoint_tree(_get_disjoint_tree): create_tree_visualisation(_get_disjoint_tree) +def test_tree_vis_multiple_inheritance(caplog): + inheritance_tree_data = { + "root": [], + "level1A": ["root"], + "level1B": ["root"], + "level2A": ["level1A", "level1B"], + } + inheritance_tree = nx.DiGraph(inheritance_tree_data) + with caplog.at_level(logging.INFO): + tree_vis = create_tree_visualisation(inheritance_tree) + + expected_tree = { + "root": [], + "level1A": ["root"], + "level1B": ["root"], + "level2A": ["level1A"], + } + expected_tree_vis = create_tree_visualisation(nx.DiGraph(expected_tree)) + + assert any( + "The ontology contains multiple inheritance" in record.message + for record in caplog.records + ) + assert tree_vis.to_json(with_data=True) == expected_tree_vis.to_json( + with_data=True + ) + + if __name__ == "__main__": # to look at it print(create_tree_visualisation(nx.DiGraph(_get_inheritance_tree)).show()) From 4956a137e06063ad9ce7b0c3ca91c087b9566024 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Thu, 1 Feb 2024 13:05:47 +0100 Subject: [PATCH 286/343] #307: rerun cicd --- biocypher/_misc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/biocypher/_misc.py b/biocypher/_misc.py index fae8bea0..28255a7d 100644 --- a/biocypher/_misc.py +++ b/biocypher/_misc.py @@ -136,7 +136,7 @@ def _find_root_node(inheritance_tree: dict) -> tuple[set, str]: root = list(parents - classes) if len(root) > 1: if "entity" in root: - root = "entity" # default: good standard? TODO + root = "entity" # TODO: default: good standard? else: raise ValueError( "Inheritance tree cannot have more than one root node. " From deda66fc954ef0b5a650df5e63dda570b29fbbca Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Thu, 1 Feb 2024 15:26:12 +0100 Subject: [PATCH 287/343] #306: check Neo4j naming compliance when writing node and edge files --- biocypher/_logger.py | 2 +- biocypher/_write.py | 50 ++++++++++++++++++++++--- test/conftest.py | 51 ++++++++++++++++++++++++++ test/test_write_neo4j.py | 79 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 176 insertions(+), 6 deletions(-) diff --git a/biocypher/_logger.py b/biocypher/_logger.py index 5f65a73b..4817ed73 100644 --- a/biocypher/_logger.py +++ b/biocypher/_logger.py @@ -48,7 +48,7 @@ def get_logger(name: str = "biocypher") -> logging.Logger: # create logger logger = logging.getLogger(name) logger.setLevel(logging.DEBUG) - logger.propagate = False + logger.propagate = True # formatting file_formatter = logging.Formatter( diff --git a/biocypher/_write.py b/biocypher/_write.py index 4e8a420d..cc4da65a 100644 --- a/biocypher/_write.py +++ b/biocypher/_write.py @@ -13,6 +13,7 @@ suitable for import into a DBMS. """ +import re import glob from ._logger import logger @@ -22,7 +23,6 @@ from abc import ABC, abstractmethod from types import GeneratorType from typing import TYPE_CHECKING, Union, Optional -from datetime import datetime from collections import OrderedDict, defaultdict import os @@ -34,7 +34,6 @@ __all__ = ["get_writer"] if TYPE_CHECKING: - from ._ontology import Ontology from ._translate import Translator from ._deduplicate import Deduplicator @@ -954,7 +953,9 @@ def _write_next_part(self, label: str, lines: list): bool: The return value. True for success, False otherwise. """ # translate label to PascalCase - label_pascal = self.translator.name_sentence_to_pascal(label) + label_pascal = self.translator.name_sentence_to_pascal( + check_label_name(label) + ) # list files in self.outdir files = glob.glob( @@ -1086,7 +1087,10 @@ def _write_node_headers(self): _id = ":ID" # translate label to PascalCase - pascal_label = self.translator.name_sentence_to_pascal(label) + compliant_label = check_label_name(label) + pascal_label = self.translator.name_sentence_to_pascal( + compliant_label + ) header = f"{pascal_label}-header.csv" header_path = os.path.join( @@ -1165,7 +1169,10 @@ def _write_edge_headers(self): for label, props in self.edge_property_dict.items(): # translate label to PascalCase - pascal_label = self.translator.name_sentence_to_pascal(label) + compliant_label = check_label_name(label) + pascal_label = self.translator.name_sentence_to_pascal( + compliant_label + ) # paths header = f"{pascal_label}-header.csv" @@ -1310,6 +1317,39 @@ def _construct_import_call(self) -> str: return import_call +def check_label_name(label: str) -> str: + """Check if the label is compliant with Neo4j naming conventions + https://neo4j.com/docs/cypher-manual/current/syntax/naming/ + Args: + label (str): The label to check + Returns: + str: The compliant label + """ + # Check if the name contains only alphanumeric characters, underscore, or dollar sign + # and dot (for class hierarchy of BioCypher) + allowed_chars = r"a-zA-Z0-9_$ ." + matches = re.findall(f"[{allowed_chars}]", label) + non_matches = re.findall(f"[^{allowed_chars}]", label) + if non_matches: + non_matches = list(set(non_matches)) + logger.warning( + f"Label is not compliant with Neo4j naming rules. Removed non compliant characters: {non_matches}" + ) + + def first_character_compliant(character: str) -> bool: + return character.isalpha() or character == "$" + + if not first_character_compliant(matches[0]): + for c in matches: + if first_character_compliant(c): + matches = matches[matches.index(c) :] + break + logger.warning( + "Label does not start with an alphabetic character or with $. Removed non compliant characters." + ) + return "".join(matches).strip() + + class _ArangoDBBatchWriter(_Neo4jBatchWriter): """ Class for writing node and edge representations to disk using the format diff --git a/test/conftest.py b/test/conftest.py index fcbf5b7f..2ffce0ae 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -111,6 +111,28 @@ def _get_nodes(length: int) -> list: return nodes +@pytest.fixture(scope="function") +def _get_nodes_non_compliant_names(length: int) -> list: + nodes = [] + for i in range(length): + bnp = BioCypherNode( + node_id=f"p{i+1}", + node_label="Patient (person)", + preferred_id="snomedct", + properties={}, + ) + nodes.append(bnp) + bnm = BioCypherNode( + node_id=f"m{i+1}", + node_label="1$He524ll Date: Thu, 1 Feb 2024 15:53:24 +0100 Subject: [PATCH 288/343] #306: add unit test for check_label_name function --- test/test_write_neo4j.py | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/test/test_write_neo4j.py b/test/test_write_neo4j.py index 6b257346..ad50caea 100644 --- a/test/test_write_neo4j.py +++ b/test/test_write_neo4j.py @@ -6,7 +6,7 @@ import pandas as pd -from biocypher._write import _Neo4jBatchWriter +from biocypher._write import check_label_name, _Neo4jBatchWriter from biocypher._create import BioCypherEdge, BioCypherNode, BioCypherRelAsNode @@ -249,8 +249,6 @@ def mock_get_ancestors(self, label): ] for file_name in os.listdir(tmp_path): assert file_name in expected_file_names - # df = pd.read_csv(os.path.join(tmp_path, file_name)) - # print(df) assert any( "Label is not compliant with Neo4j naming rules" in record.message for record in caplog.records @@ -661,16 +659,12 @@ def mock_get_ancestors(self, label): passed = bw._write_edge_data(edges, batch_size=int(1e4)) tmp_path = bw.outdir - print(os.listdir(tmp_path)) - expected_file_names = [ "Is_Mutated_In-part000.csv", "CompliantEdge-part000.csv", ] for file_name in os.listdir(tmp_path): assert file_name in expected_file_names - # df = pd.read_csv(os.path.join(tmp_path, file_name)) - # print(df) assert any( "Label is not compliant with Neo4j naming rules" in record.message for record in caplog.records @@ -1079,3 +1073,24 @@ def test_tab_delimiter(bw_tab, _get_nodes): call = bw_tab._construct_import_call() assert '--delimiter="\\t"' in call + + +def test_check_label_name(): + # Test case 1: label with compliant characters + assert check_label_name("Compliant_Label") == "Compliant_Label" + + # Test case 2: label with non-compliant characters + assert check_label_name("Non@Compl<>i(an)t_Labe#l") == "NonCompliant_Label" + + # Test case 3: label starts with a number + assert check_label_name("15Invalid_Label") == "Invalid_Label" + + # Test case 4: label starts with a non-alphanumeric character + assert check_label_name("@Invalid_Label") == "Invalid_Label" + + # Additional test case: label with dot (for class hierarchy of BioCypher) + assert check_label_name("valid.label") == "valid.label" + + # Additional test case: label with dot and non-compliant characters + assert check_label_name("In.valid.Label@1") == "In.valid.Label1" + # Assert warning log is written From 6a908274d94ef4e517bbb8e9d7b33a3c6e800a08 Mon Sep 17 00:00:00 2001 From: slobentanzer Date: Thu, 1 Feb 2024 16:20:12 +0100 Subject: [PATCH 289/343] rename label parser method --- biocypher/_write.py | 8 ++++---- test/test_write_neo4j.py | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/biocypher/_write.py b/biocypher/_write.py index cc4da65a..3c09bb9b 100644 --- a/biocypher/_write.py +++ b/biocypher/_write.py @@ -954,7 +954,7 @@ def _write_next_part(self, label: str, lines: list): """ # translate label to PascalCase label_pascal = self.translator.name_sentence_to_pascal( - check_label_name(label) + parse_label(label) ) # list files in self.outdir @@ -1087,7 +1087,7 @@ def _write_node_headers(self): _id = ":ID" # translate label to PascalCase - compliant_label = check_label_name(label) + compliant_label = parse_label(label) pascal_label = self.translator.name_sentence_to_pascal( compliant_label ) @@ -1169,7 +1169,7 @@ def _write_edge_headers(self): for label, props in self.edge_property_dict.items(): # translate label to PascalCase - compliant_label = check_label_name(label) + compliant_label = parse_label(label) pascal_label = self.translator.name_sentence_to_pascal( compliant_label ) @@ -1317,7 +1317,7 @@ def _construct_import_call(self) -> str: return import_call -def check_label_name(label: str) -> str: +def parse_label(label: str) -> str: """Check if the label is compliant with Neo4j naming conventions https://neo4j.com/docs/cypher-manual/current/syntax/naming/ Args: diff --git a/test/test_write_neo4j.py b/test/test_write_neo4j.py index ad50caea..e86c79a3 100644 --- a/test/test_write_neo4j.py +++ b/test/test_write_neo4j.py @@ -6,7 +6,7 @@ import pandas as pd -from biocypher._write import check_label_name, _Neo4jBatchWriter +from biocypher._write import parse_label, _Neo4jBatchWriter from biocypher._create import BioCypherEdge, BioCypherNode, BioCypherRelAsNode @@ -1077,20 +1077,20 @@ def test_tab_delimiter(bw_tab, _get_nodes): def test_check_label_name(): # Test case 1: label with compliant characters - assert check_label_name("Compliant_Label") == "Compliant_Label" + assert parse_label("Compliant_Label") == "Compliant_Label" # Test case 2: label with non-compliant characters - assert check_label_name("Non@Compl<>i(an)t_Labe#l") == "NonCompliant_Label" + assert parse_label("Non@Compl<>i(an)t_Labe#l") == "NonCompliant_Label" # Test case 3: label starts with a number - assert check_label_name("15Invalid_Label") == "Invalid_Label" + assert parse_label("15Invalid_Label") == "Invalid_Label" # Test case 4: label starts with a non-alphanumeric character - assert check_label_name("@Invalid_Label") == "Invalid_Label" + assert parse_label("@Invalid_Label") == "Invalid_Label" # Additional test case: label with dot (for class hierarchy of BioCypher) - assert check_label_name("valid.label") == "valid.label" + assert parse_label("valid.label") == "valid.label" # Additional test case: label with dot and non-compliant characters - assert check_label_name("In.valid.Label@1") == "In.valid.Label1" + assert parse_label("In.valid.Label@1") == "In.valid.Label1" # Assert warning log is written From 65793feab26952e9e70c2e7d5abce65df97de0ba Mon Sep 17 00:00:00 2001 From: slobentanzer Date: Thu, 1 Feb 2024 16:23:58 +0100 Subject: [PATCH 290/343] remove assignment step --- biocypher/_write.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/biocypher/_write.py b/biocypher/_write.py index 3c09bb9b..06d37604 100644 --- a/biocypher/_write.py +++ b/biocypher/_write.py @@ -1087,9 +1087,8 @@ def _write_node_headers(self): _id = ":ID" # translate label to PascalCase - compliant_label = parse_label(label) pascal_label = self.translator.name_sentence_to_pascal( - compliant_label + parse_label(label) ) header = f"{pascal_label}-header.csv" @@ -1169,9 +1168,8 @@ def _write_edge_headers(self): for label, props in self.edge_property_dict.items(): # translate label to PascalCase - compliant_label = parse_label(label) pascal_label = self.translator.name_sentence_to_pascal( - compliant_label + parse_label(label) ) # paths From cbf131d98be43fab4355fe5217aa814495549e6a Mon Sep 17 00:00:00 2001 From: slobentanzer Date: Thu, 1 Feb 2024 16:24:53 +0100 Subject: [PATCH 291/343] docstring --- biocypher/_write.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/biocypher/_write.py b/biocypher/_write.py index 06d37604..21958e38 100644 --- a/biocypher/_write.py +++ b/biocypher/_write.py @@ -1316,8 +1316,12 @@ def _construct_import_call(self) -> str: def parse_label(label: str) -> str: - """Check if the label is compliant with Neo4j naming conventions - https://neo4j.com/docs/cypher-manual/current/syntax/naming/ + """ + + Check if the label is compliant with Neo4j naming conventions, + https://neo4j.com/docs/cypher-manual/current/syntax/naming/, and if not, + remove non-compliant characters. + Args: label (str): The label to check Returns: From 38e524f4728041eabd830a79475b1be054756aa6 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Thu, 1 Feb 2024 17:26:59 +0100 Subject: [PATCH 292/343] #307: update the docs --- docs/tutorial-ontology.md | 64 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 61 insertions(+), 3 deletions(-) diff --git a/docs/tutorial-ontology.md b/docs/tutorial-ontology.md index 367eb8c4..69798336 100644 --- a/docs/tutorial-ontology.md +++ b/docs/tutorial-ontology.md @@ -34,7 +34,12 @@ PascalCase ("Protein", "PairwiseMolecularInteraction"). BioCypher uses the same paradigm: in most cases (input, schema configuration, internally), the lower sentence case is used, while in the output (Neo4j labels, file system names) the PascalCase is more suitable; Neo4j labels and system file names don't deal well -with spaces and special characters. We also remove the "biolink:" +with spaces and special characters. +Therefore the output file names are checked for their compliance with the +[Neo4j naming rules](https://neo4j.com/docs/cypher-manual/current/syntax/naming/). +All non compliant characters are removed from the file name (e.g. if the ontology +class is called "desk (piece of furniture)", the brackets would be removed +and the file name will be "DeskPieceOfFurniture"). We also remove the "biolink:" [CURIE](https://en.wikipedia.org/wiki/CURIE) prefix for use in file names and Neo4j labels. @@ -65,7 +70,8 @@ ontology, such as the EBI molecular interactions ontology need to define very specific genetics concepts, and thus extend the Biolink model at the terminal node ``sequence variant`` with the corresponding subtree of the [Sequence Ontology](http://www.sequenceontology.org/). The [OBO -Foundry](https://obofoundry.org) collects many such specialised ontologies. +Foundry](https://obofoundry.org) and the [BioPortal](https://bioportal.bioontology.org/) +collect many such specialised ontologies. The default format for ingesting ontology definitions into BioCypher is the Web Ontology Language (OWL); BioCypher can read ``.owl``, ``.rdf``, and ``.ttl`` @@ -77,9 +83,19 @@ nodes as fusion points for all "tail" ontologies. For more info, see the [section on hybridising ontologies](tut_hybridising). ## Visualising ontologies + BioCypher provides a simple way of visualising the ontology hierarchy. This is useful for debugging and for getting a quick overview of the ontology and which -parts are actually used in the knowledge graph to be created. To get an overview +parts are actually used in the knowledge graph to be created. +Depending on your use case you can either [visualise the parts of the ontology used in the +knowledge graph](vis_parts) (sufficient for most of the use cases) or the [full ontology](vis_full). +In case the used ontology is more complex and contains multiple inheritance please refer to +[visualise complex ontologies](vis_complex). + +(vis_parts)= +### Visualise the parts of the ontology used in the knowledge graph + +To get an overview of the structure of our project, we can run the following command via the interface: @@ -142,6 +158,48 @@ class `entity` via `polypeptide`, `biological entity`, and `named thing`, all of which are not part of the input data. ``` +(vis_full)= +### Visualise the full ontology + +If you want to see the complete ontology tree, you can call `show_ontology_structure` +with the parameter `full=True`. + +```{code-block} python +:caption: Visualising the full ontology hierarchy +from biocypher import BioCypher +bc = BioCypher( + offline=True, # no need to connect or to load data + schema_config_path="tutorial/06_schema_config.yaml", +) +bc.show_ontology_structure(full=True) + +``` + +(vis_complex)= +### Visualise complex ontologies + +Not all ontologies can be easily visualised as a tree. For instance, ontologies +with multiple inheritance, where classes in the ontology can have multiple parent classes. +This violates the definition of a tree, where each node can only have one parent node. +Consequently, ontologies with multiple inheritance cannot be visualised as a tree. + +BioCypher can still handle these ontologies, and you can call `show_ontology_structure()` +to get a visualisation of the ontology. +But be aware that each ontology class is only added once to the hierarchy tree +(a class with multiple parent classes is only placed under one parent in the hierarchy tree). +Thus, the ontology class might not be placed, where you would expect it. +This only refers to the visualisation. +The underlying ontology is still correct and contains all ontology classes and their relationships. + +```{note} +When calling `show_ontology_structure()` BioCypher automatically checks if +the ontology contains multiple inheritance and logs a warning message if this is the case. +``` + +If you need to get a visualisation of the ontology with multiple inheritance, +you can call `show_ontology_structure()` with the parameter `to_disk=/some/path/where_to_store_the_file`. +This creates a `GraphML` file and stores it under the specified path. + ## Using ontologies: plain Biolink BioCypher maps any input data to the underlying ontology; in the basic case, the Biolink model. This mapping is defined in the schema configuration From 904afac11dc10fc7685fad14c65dde0b154c7c95 Mon Sep 17 00:00:00 2001 From: slobentanzer Date: Thu, 1 Feb 2024 18:26:06 +0100 Subject: [PATCH 293/343] some phrasing and formatting --- docs/tutorial-ontology.md | 77 +++++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 35 deletions(-) diff --git a/docs/tutorial-ontology.md b/docs/tutorial-ontology.md index 69798336..8af0a330 100644 --- a/docs/tutorial-ontology.md +++ b/docs/tutorial-ontology.md @@ -34,12 +34,12 @@ PascalCase ("Protein", "PairwiseMolecularInteraction"). BioCypher uses the same paradigm: in most cases (input, schema configuration, internally), the lower sentence case is used, while in the output (Neo4j labels, file system names) the PascalCase is more suitable; Neo4j labels and system file names don't deal well -with spaces and special characters. -Therefore the output file names are checked for their compliance with the -[Neo4j naming rules](https://neo4j.com/docs/cypher-manual/current/syntax/naming/). -All non compliant characters are removed from the file name (e.g. if the ontology -class is called "desk (piece of furniture)", the brackets would be removed -and the file name will be "DeskPieceOfFurniture"). We also remove the "biolink:" +with spaces and special characters. Therefore, we check the output file names +for their compliance with the [Neo4j naming +rules](https://neo4j.com/docs/cypher-manual/current/syntax/naming/). All non +compliant characters are removed from the file name (e.g. if the ontology class +is called "desk (piece of furniture)", the brackets would be removed and the +file name will be "DeskPieceOfFurniture"). We also remove the "biolink:" [CURIE](https://en.wikipedia.org/wiki/CURIE) prefix for use in file names and Neo4j labels. @@ -66,12 +66,13 @@ same project. For instance, one might want to extend the rather basic classes relating to molecular interactions in Biolink (the most specific being `pairwise molecular interaction`) with more specific classes from a more domain-specific ontology, such as the EBI molecular interactions ontology -([PSI-MI](https://www.ebi.ac.uk/ols/ontologies/mi)). A different project may +([PSI-MI](https://www.ebi.ac.uk/ols/ontologies/mi)). A different project may need to define very specific genetics concepts, and thus extend the Biolink model at the terminal node ``sequence variant`` with the corresponding subtree of the [Sequence Ontology](http://www.sequenceontology.org/). The [OBO -Foundry](https://obofoundry.org) and the [BioPortal](https://bioportal.bioontology.org/) -collect many such specialised ontologies. +Foundry](https://obofoundry.org) and the +[BioPortal](https://bioportal.bioontology.org/) collect many such specialised +ontologies. The default format for ingesting ontology definitions into BioCypher is the Web Ontology Language (OWL); BioCypher can read ``.owl``, ``.rdf``, and ``.ttl`` @@ -86,14 +87,15 @@ nodes as fusion points for all "tail" ontologies. For more info, see the BioCypher provides a simple way of visualising the ontology hierarchy. This is useful for debugging and for getting a quick overview of the ontology and which -parts are actually used in the knowledge graph to be created. -Depending on your use case you can either [visualise the parts of the ontology used in the -knowledge graph](vis_parts) (sufficient for most of the use cases) or the [full ontology](vis_full). -In case the used ontology is more complex and contains multiple inheritance please refer to -[visualise complex ontologies](vis_complex). +parts are actually used in the knowledge graph to be created. Depending on your +use case you can either visualise the [parts of the ontology](vis_parts) used in +the knowledge graph (sufficient for most use cases) or the [full +ontology](vis_full). If the used ontology is more complex and contains multiple +inheritance please refer to the section on [visualising complex +ontologies](vis_complex). (vis_parts)= -### Visualise the parts of the ontology used in the knowledge graph +### Visualise only the parts of the ontology used in the knowledge graph To get an overview of the structure of our project, we can run the following command via the @@ -161,8 +163,8 @@ of which are not part of the input data. (vis_full)= ### Visualise the full ontology -If you want to see the complete ontology tree, you can call `show_ontology_structure` -with the parameter `full=True`. +If you want to see the complete ontology tree, you can call +`show_ontology_structure` with the parameter `full=True`. ```{code-block} python :caption: Visualising the full ontology hierarchy @@ -178,27 +180,32 @@ bc.show_ontology_structure(full=True) (vis_complex)= ### Visualise complex ontologies -Not all ontologies can be easily visualised as a tree. For instance, ontologies -with multiple inheritance, where classes in the ontology can have multiple parent classes. -This violates the definition of a tree, where each node can only have one parent node. -Consequently, ontologies with multiple inheritance cannot be visualised as a tree. - -BioCypher can still handle these ontologies, and you can call `show_ontology_structure()` -to get a visualisation of the ontology. -But be aware that each ontology class is only added once to the hierarchy tree -(a class with multiple parent classes is only placed under one parent in the hierarchy tree). -Thus, the ontology class might not be placed, where you would expect it. -This only refers to the visualisation. -The underlying ontology is still correct and contains all ontology classes and their relationships. +Not all ontologies can be easily visualised as a tree, such as ontologies with +multiple inheritance, where classes in the ontology can have multiple parent +classes. This violates the definition of a tree, where each node can only have +one parent node. Consequently, ontologies with multiple inheritance cannot be +visualised as a tree. + +BioCypher can still handle these ontologies, and you can call +`show_ontology_structure()` to get a visualisation of the ontology. However, +each ontology class will only be added to the hierarchy tree once (a class with +multiple parent classes is only placed under one parent in the hierarchy tree). +Since this will occur the first time the class is seen, the ontology class might +not be placed where you would expect it. This only applies to the visualisation; +the underlying ontology is still correct and contains all ontology classes and +their relationships. ```{note} -When calling `show_ontology_structure()` BioCypher automatically checks if -the ontology contains multiple inheritance and logs a warning message if this is the case. + +When calling `show_ontology_structure()`, BioCypher automatically checks if the +ontology contains multiple inheritance and logs a warning message if so. + ``` If you need to get a visualisation of the ontology with multiple inheritance, -you can call `show_ontology_structure()` with the parameter `to_disk=/some/path/where_to_store_the_file`. -This creates a `GraphML` file and stores it under the specified path. +you can call `show_ontology_structure()` with the parameter +`to_disk=/some/path/where_to_store_the_file`. This creates a `GraphML` file and +stores it at the specified location. ## Using ontologies: plain Biolink BioCypher maps any input data to the underlying ontology; in the basic case, the @@ -385,10 +392,10 @@ In some cases, an ontology may contain a biological concept, but the name of the concept does for some reason not agree with the users desired knowledge graph structure. For instance, the user may not want to represent protein complexes in the graph as `macromolecular complex` nodes due to ease of use and/or -readability criteria and rather call these nodes `complex`. In such cases, the +readability criteria and rather call these nodes `complex`. In such cases, the user can introduce a synonym for the ontology class. This is done by selecting another, more desirable name for the respective class(es) and specifying the -`synonym_for` field in their schema configuration. In this case, as we would +`synonym_for` field in their schema configuration. In this case, as we would like to represent protein complexes as `complex` nodes, we can do so as follows: ```{code-block} yaml From d19cf519215484c85ece2d09f764b912e02343a8 Mon Sep 17 00:00:00 2001 From: slobentanzer Date: Thu, 1 Feb 2024 19:01:27 +0100 Subject: [PATCH 294/343] =?UTF-8?q?Bump=20version:=200.5.35=20=E2=86=92=20?= =?UTF-8?q?0.5.36?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- biocypher/_metadata.py | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index c2d5a9e2..9922f4fd 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.5.35 +current_version = 0.5.36 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+) diff --git a/biocypher/_metadata.py b/biocypher/_metadata.py index ccadbc0c..69cc7cd3 100644 --- a/biocypher/_metadata.py +++ b/biocypher/_metadata.py @@ -19,7 +19,7 @@ import toml -_VERSION = "0.5.35" +_VERSION = "0.5.36" def get_metadata(): diff --git a/pyproject.toml b/pyproject.toml index 6fe80e7e..6ea86525 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "biocypher" -version = "0.5.35" +version = "0.5.36" description = "A unifying framework for biomedical research knowledge graphs" authors = [ "Sebastian Lobentanzer ", From 3ba2e0b808b3dd7dbe928abe07d6416abbe7ec59 Mon Sep 17 00:00:00 2001 From: slobentanzer Date: Thu, 1 Feb 2024 19:10:17 +0100 Subject: [PATCH 295/343] =?UTF-8?q?Bump=20version:=200.5.36=20=E2=86=92=20?= =?UTF-8?q?0.5.37?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- biocypher/_metadata.py | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 9922f4fd..d047e4af 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.5.36 +current_version = 0.5.37 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+) diff --git a/biocypher/_metadata.py b/biocypher/_metadata.py index 69cc7cd3..3a54163f 100644 --- a/biocypher/_metadata.py +++ b/biocypher/_metadata.py @@ -19,7 +19,7 @@ import toml -_VERSION = "0.5.36" +_VERSION = "0.5.37" def get_metadata(): diff --git a/pyproject.toml b/pyproject.toml index 6ea86525..3d70cb82 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "biocypher" -version = "0.5.36" +version = "0.5.37" description = "A unifying framework for biomedical research knowledge graphs" authors = [ "Sebastian Lobentanzer ", From f117db0c94898e160d3f87ed486386cd224ca848 Mon Sep 17 00:00:00 2001 From: slobentanzer Date: Fri, 2 Feb 2024 16:42:45 +0100 Subject: [PATCH 296/343] BioChatter link in docs --- docs/index.rst | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/docs/index.rst b/docs/index.rst index a94650ae..6ac5db2b 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -12,7 +12,7 @@ Democratising Knowledge Graphs BioCypher is the simplest way to create an AI-enabled knowledge graph for biomedical (or other) tasks. See `below `_ - for more information. + and the [BioChatter website](https://biochatter.org) for more information. Building a knowledge graph for biomedical tasks usually takes months or years. What if you could do it in weeks or days? We created BioCypher to make the @@ -108,20 +108,19 @@ Connect your Knowledge Graph to Large Language Models To facilitate the use of knowledge graphs in downstream tasks, we have developed a framework to connect knowledge graphs to large language models. This framework -is called `BioChatter `_ and is used in -our web app `ChatGSE `_. See the links for more -information. +is called `BioChatter `_ and is used in our `web apps +`_. See the links for more information. .. grid:: 2 :gutter: 2 - .. grid-item-card:: ChatGSE web app + .. grid-item-card:: BioChatter Light web app :link: https://chat.biocypher.org/ :text-align: center :octicon:`comment-discussion;3em` :octicon:`dependabot;3em` - .. grid-item-card:: biochatter repository + .. grid-item-card:: BioChatter repository :link: https://github.com/biocypher/biochatter :text-align: center From e9117d32ad21e0fc7b3351f200dbfd6ea857adf7 Mon Sep 17 00:00:00 2001 From: slobentanzer Date: Fri, 2 Feb 2024 16:47:37 +0100 Subject: [PATCH 297/343] format link correctly --- docs/index.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/index.rst b/docs/index.rst index 6ac5db2b..b28f5d71 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -10,9 +10,9 @@ Democratising Knowledge Graphs :class: attention BioCypher is the simplest way to create an AI-enabled knowledge graph for - biomedical (or other) tasks. See - `below `_ - and the [BioChatter website](https://biochatter.org) for more information. + biomedical (or other) tasks. See `below + `_ + and the `BioChatter website `_ for more information. Building a knowledge graph for biomedical tasks usually takes months or years. What if you could do it in weeks or days? We created BioCypher to make the From e3f2a318bd35cbcbefac2eed22bb85e6608661e6 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Mon, 5 Feb 2024 15:27:15 +0100 Subject: [PATCH 298/343] #310: improve runtime of rdflib to networkx transformation; explicit test case for reverse_labels --- biocypher/_ontology.py | 208 ++++++++++++++++++++++++++++- test/ontologies/missing_label.ttl | 2 +- test/ontologies/reverse_labels.ttl | 23 ++++ test/test_ontology.py | 43 +++--- 4 files changed, 252 insertions(+), 24 deletions(-) create mode 100644 test/ontologies/reverse_labels.ttl diff --git a/biocypher/_ontology.py b/biocypher/_ontology.py index e25c3b47..07dc757a 100644 --- a/biocypher/_ontology.py +++ b/biocypher/_ontology.py @@ -14,6 +14,9 @@ other advanced operations. """ import os +import time + +import pandas as pd from ._logger import logger @@ -22,6 +25,8 @@ from typing import Optional from datetime import datetime +from rdflib import Graph +from rdflib.extras.external_graph_libs import rdflib_to_networkx_digraph import rdflib import networkx as nx @@ -93,14 +98,213 @@ def __init__( self._reverse_labels = reverse_labels self._remove_prefixes = remove_prefixes - # Load the ontology into a rdflib Graph according to the file extension self._rdf_graph = self._load_rdf_graph(ontology_file) + start_time = time.time() + self._nx_graph_old = self._rdf_to_nx_old( + self._rdf_graph, root_label, reverse_labels + ) + end_time = time.time() + elapsed_time = end_time - start_time + print("Old implementation runtime: {:.2f} seconds".format(elapsed_time)) + print(f"Expected {self._nx_graph_old}") + + start_time = time.time() self._nx_graph = self._rdf_to_nx( self._rdf_graph, root_label, reverse_labels ) + end_time = time.time() + elapsed_time = end_time - start_time + print("New implementation runtime: {:.2f} seconds".format(elapsed_time)) + + def _rdf_to_nx( + self, _rdf_graph: rdflib.Graph, root_label: str, reverse_labels: bool + ) -> nx.DiGraph: + one_to_one_triples, one_to_many_dict = self._get_relevant_rdf_triples( + _rdf_graph + ) + nx_graph = self._convert_to_nx(one_to_one_triples, one_to_many_dict) + renamed_graph = self._rename_nodes(nx_graph, reverse_labels) + print(f"Nx ontology {renamed_graph}") + filtered_graph = self._get_all_ancestors( + renamed_graph, root_label, reverse_labels + ) + print(f"Nx ontology filtered {filtered_graph}") + return nx.DiGraph(filtered_graph) + + def _get_relevant_rdf_triples(self, g: rdflib.Graph) -> tuple: + one_to_one_inheritance_graph = self._get_one_to_one_inheritance_triples( + g + ) + intersection = self._get_multiple_inheritance_dict(g) + return one_to_one_inheritance_graph, intersection + + def _get_one_to_one_inheritance_triples( + self, g: rdflib.Graph + ) -> rdflib.Graph: + """Get the one to one inheritance triples from the RDF graph. + + Args: + g (rdflib.Graph): The RDF graph + + Returns: + rdflib.Graph: The one to one inheritance graph + """ + one_to_one_inheritance_graph = Graph() + for s, p, o in g.triples((None, rdflib.RDFS.subClassOf, None)): + if self.has_label(s, g): + one_to_one_inheritance_graph.add((s, p, o)) + return one_to_one_inheritance_graph - def _rdf_to_nx(self, g, root_label, switch_id_and_label=True): + def _get_multiple_inheritance_dict(self, g: rdflib.Graph) -> dict: + """Get the multiple inheritance dictionary from the RDF graph. + + Args: + g (rdflib.Graph): The RDF graph + + Returns: + dict: The multiple inheritance dictionary + """ + multiple_inheritance = g.triples( + (None, rdflib.OWL.intersectionOf, None) + ) + intersection = {} + for ( + node, + has_multiple_parents, + first_node_of_intersection_list, + ) in multiple_inheritance: + parents = self._retrieve_rdf_linked_list( + first_node_of_intersection_list + ) + child_name = None + for s_, _, _ in g.triples((None, rdflib.RDFS.subClassOf, node)): + child_name = s_ + if child_name: + intersection[node] = { + "child_name": child_name, + "parent_node_names": parents, + } + return intersection + + def has_label(self, node: rdflib.URIRef, g: rdflib.Graph) -> bool: + """Does the node have a label in g? + + Args: + node (rdflib.URIRef): The node to check + g (rdflib.Graph): The graph to check in + Returns: + bool: True if the node has a label, False otherwise + """ + return (node, rdflib.RDFS.label, None) in g + + def _retrieve_rdf_linked_list(self, subject: rdflib.URIRef) -> list: + """Recursively retrieves a linked list from RDF. + Example RDF list with the items [item1, item2]: + list_node - first -> item1 + list_node - rest -> list_node2 + list_node2 - first -> item2 + list_node2 - rest -> nil + Args: + subject (rdflib.URIRef): One list_node of the RDF list + Returns: + list: The items of the RDF list + """ + g = self._rdf_graph + rdf_list = [] + for s, p, o in g.triples((subject, rdflib.RDF.first, None)): + rdf_list.append(o) + for s, p, o in g.triples((subject, rdflib.RDF.rest, None)): + if o != rdflib.RDF.nil: + rdf_list.extend(self._retrieve_rdf_linked_list(o)) + return rdf_list + + def _convert_to_nx( + self, one_to_one: rdflib.Graph, one_to_many: dict + ) -> nx.DiGraph: + """Convert the one to one and one to many inheritance graphs to networkx. + + Args: + one_to_one (rdflib.Graph): The one to one inheritance graph + one_to_many (dict): The one to many inheritance dictionary + + Returns: + nx.DiGraph: The networkx graph + """ + nx_graph = rdflib_to_networkx_digraph( + one_to_one, edge_attrs=lambda s, p, o: {}, calc_weights=False + ) + for key, value in one_to_many.items(): + nx_graph.add_edges_from( + [ + (value["child_name"], parent) + for parent in value["parent_node_names"] + ] + ) + nx_graph.remove_node(key) + return nx_graph + + def _rename_nodes( + self, nx_graph: nx.DiGraph, reverse_labels: bool + ) -> nx.DiGraph: + """Rename the nodes in the networkx graph (remove prefix and switch id and label). + + Args: + nx_graph (nx.DiGraph): The networkx graph + reverse_labels (bool): If True, id and label are switched + + Returns: + nx.DiGraph: The renamed networkx graph + """ + mapping = { + node: self._get_nx_id_and_label(node, reverse_labels)[0] + for node in nx_graph.nodes + } + renamed = nx.relabel_nodes(nx_graph, mapping, copy=False) + return renamed + + def _get_all_ancestors( + self, renamed: nx.DiGraph, root_label: str, reverse_labels: bool + ) -> nx.DiGraph: + """Get all ancestors of the root node in the networkx graph. + + Args: + renamed (nx.DiGraph): The renamed networkx graph + root_label (str): The label of the root node in the ontology + + Returns: + nx.DiGraph: The filtered networkx graph + """ + root = self._get_nx_id_and_label( + self._find_root_label(self._rdf_graph, root_label), reverse_labels + )[0] + ancestors = nx.ancestors(renamed, root) + ancestors.add(root) + filtered_graph = renamed.subgraph(ancestors) + return filtered_graph + + def _get_nx_id_and_label( + self, node, switch_id_and_label: bool + ) -> tuple[str, str]: + """Rename node id and label for nx graph. + + Args: + node (str): The node to rename + switch_id_and_label (bool): If True, switch id and label + + Returns: + tuple[str, str]: The renamed node id and label + """ + node_id_str = self._remove_prefix(str(node)) + node_label_str = str( + self._rdf_graph.value(node, rdflib.RDFS.label) + ).replace("_", " ") + node_label_str = to_lower_sentence_case(node_label_str) + nx_id = node_label_str if switch_id_and_label else node_id_str + nx_label = node_id_str if switch_id_and_label else node_label_str + return nx_id, nx_label + + def _rdf_to_nx_old(self, g, root_label, switch_id_and_label=True): root = self._find_root_label(g, root_label) # Create a directed graph to represent the ontology as a tree diff --git a/test/ontologies/missing_label.ttl b/test/ontologies/missing_label.ttl index 7c16faa9..7f2785e4 100644 --- a/test/ontologies/missing_label.ttl +++ b/test/ontologies/missing_label.ttl @@ -19,4 +19,4 @@ owl:Level1A a owl:Class ; owl:Level1B a owl:Class ; rdfs:subClassOf owl:Root ; - rdfs:comment "Level1B." . + rdfs:comment "Level1B label missing." . diff --git a/test/ontologies/reverse_labels.ttl b/test/ontologies/reverse_labels.ttl new file mode 100644 index 00000000..ebbdf8b6 --- /dev/null +++ b/test/ontologies/reverse_labels.ttl @@ -0,0 +1,23 @@ +@prefix owl: . +@prefix rdfs: . + +owl:Class a rdfs:Class ; + rdfs:label "Class" ; + rdfs:comment "The class of OWL classes." ; + rdfs:isDefinedBy ; + rdfs:subClassOf rdfs:Class . + +owl:Root a owl:Class ; + rdfs:label "Root" ; + rdfs:comment "The class of OWL individuals." ; + rdfs:isDefinedBy . + +owl:1 a owl:Class ; + rdfs:label "Level1A" ; + rdfs:subClassOf owl:Root ; + rdfs:comment "Level1A." . + +owl:2 a owl:Class ; + rdfs:label "Level1B" ; + rdfs:subClassOf owl:Root ; + rdfs:comment "Level1B." . diff --git a/test/test_ontology.py b/test/test_ontology.py index 32ecba19..b0f72f7d 100644 --- a/test/test_ontology.py +++ b/test/test_ontology.py @@ -9,7 +9,6 @@ def test_biolink_adapter(biolink_adapter): assert biolink_adapter.get_root_label() == "entity" assert biolink_adapter.get_nx_graph().number_of_nodes() > 100 - assert "biological entity" in biolink_adapter.get_ancestors("gene") assert "macromolecular machine mixin" in biolink_adapter.get_ancestors( "macromolecular complex" @@ -18,14 +17,12 @@ def test_biolink_adapter(biolink_adapter): def test_so_adapter(so_adapter): assert so_adapter.get_root_label() == "sequence_variant" - # here without underscores assert "sequence variant" in so_adapter.get_ancestors("lethal variant") def test_go_adapter(go_adapter): assert go_adapter.get_root_label() == "molecular_function" - assert "molecular function" in go_adapter.get_ancestors( "rna helicase activity" ) @@ -33,7 +30,6 @@ def test_go_adapter(go_adapter): def test_mondo_adapter(mondo_adapter): assert mondo_adapter.get_root_label() == "disease" - assert "human disease" in mondo_adapter.get_ancestors("cystic fibrosis") @@ -44,13 +40,11 @@ def test_ontology_adapter_root_node_missing(): def test_ontology_functions(hybrid_ontology): assert isinstance(hybrid_ontology, Ontology) - first_tail_ontology = hybrid_ontology._tail_ontologies.get( "so" ).get_nx_graph() assert len(first_tail_ontology) == 6 assert nx.is_directed_acyclic_graph(first_tail_ontology) - # subgraph combination combined_length = len(hybrid_ontology._head_ontology.get_nx_graph()) for adapter in hybrid_ontology._tail_ontologies.values(): @@ -58,14 +52,11 @@ def test_ontology_functions(hybrid_ontology): # need to add 1 for the 'merge_nodes' = False case combined_length += 1 hybrid_length = len(hybrid_ontology._nx_graph) - # subtract number of tail ontologies num_tail = len(hybrid_ontology._tail_ontologies) # subtract user extensions num_ext = len(hybrid_ontology._extended_nodes) - assert hybrid_length - num_ext == combined_length - num_tail - dgpl_ancestors = list( hybrid_ontology.get_ancestors("decreased gene product level") ) @@ -77,13 +68,10 @@ def test_ontology_functions(hybrid_ontology): assert "named thing" in dgpl_ancestors assert "entity" in dgpl_ancestors assert "thing with taxon" in dgpl_ancestors - lethal_var = hybrid_ontology._nx_graph.nodes["lethal variant"] assert lethal_var["label"] == "SO_0001773" - # second tail ontology: here we don't merge the nodes, but attach 'human # disease' as a child of 'disease' - cf_ancestors = list(hybrid_ontology.get_ancestors("cystic fibrosis")) assert "cystic fibrosis" in cf_ancestors assert "autosomal recessive disease" in cf_ancestors @@ -94,21 +82,17 @@ def test_ontology_functions(hybrid_ontology): assert "disease or phenotypic feature" in cf_ancestors assert "biological entity" in cf_ancestors assert "entity" in cf_ancestors - # mixins? - # user extensions dsdna_ancestors = list(hybrid_ontology.get_ancestors("dsDNA sequence")) assert "chemical entity" in dsdna_ancestors assert "association" in hybrid_ontology.get_ancestors( "mutation to tissue association" ) - # properties protein = hybrid_ontology._nx_graph.nodes["protein"] assert protein["label"] == "Protein" assert "taxon" in protein["properties"].keys() - # synonyms assert "complex" in hybrid_ontology._nx_graph.nodes assert "macromolecular complex" not in hybrid_ontology._nx_graph.nodes @@ -116,21 +100,17 @@ def test_ontology_functions(hybrid_ontology): def test_show_ontology(hybrid_ontology): treevis = hybrid_ontology.show_ontology_structure() - assert treevis is not None def test_show_full_ontology(hybrid_ontology): treevis = hybrid_ontology.show_ontology_structure(full=True) - assert treevis is not None def test_write_ontology(hybrid_ontology, tmp_path): passed = hybrid_ontology.show_ontology_structure(to_disk=tmp_path) - file_path = os.path.join(tmp_path, "ontology_structure.graphml") - assert passed assert os.path.isfile(file_path) @@ -159,7 +139,6 @@ def test_manual_format(): }, ontology_mapping=None, ) - assert isinstance(ontology._nx_graph, nx.DiGraph) assert "event" in ontology._nx_graph.nodes @@ -212,3 +191,25 @@ def test_missing_label_on_node(): expected_edges = [("level1A", "root")] for edge in expected_edges: assert edge in result.edges + assert len(result.edges) == len(expected_edges) + + +def test_reverse_labels(): + ontology_adapter = OntologyAdapter( + ontology_file="test/ontologies/reverse_labels.ttl", + root_label="Root", + reverse_labels=False, + ) + ontology_adapter_reversed = OntologyAdapter( + ontology_file="test/ontologies/reverse_labels.ttl", + root_label="Root", + reverse_labels=True, + ) + + expected_switched = ["level1B", "root", "level1A"] + for node in ontology_adapter_reversed.get_nx_graph().nodes: + assert node in expected_switched + + expected_not_switched = ["Root", "1", "2"] + for node in ontology_adapter.get_nx_graph().nodes: + assert node in expected_not_switched From 15ec8e3b7fc03209307815cb686861c28d59ad8a Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Tue, 13 Feb 2024 11:40:39 +0100 Subject: [PATCH 299/343] #310: comment call to old implementation to make installation of a patched version possible --- biocypher/_ontology.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/biocypher/_ontology.py b/biocypher/_ontology.py index 07dc757a..c604548e 100644 --- a/biocypher/_ontology.py +++ b/biocypher/_ontology.py @@ -100,14 +100,14 @@ def __init__( self._rdf_graph = self._load_rdf_graph(ontology_file) - start_time = time.time() - self._nx_graph_old = self._rdf_to_nx_old( - self._rdf_graph, root_label, reverse_labels - ) - end_time = time.time() - elapsed_time = end_time - start_time - print("Old implementation runtime: {:.2f} seconds".format(elapsed_time)) - print(f"Expected {self._nx_graph_old}") + # start_time = time.time() + # self._nx_graph_old = self._rdf_to_nx_old( + # self._rdf_graph, root_label, reverse_labels + # ) + # end_time = time.time() + # elapsed_time = end_time - start_time + # print("Old implementation runtime: {:.2f} seconds".format(elapsed_time)) + # print(f"Expected {self._nx_graph_old}") start_time = time.time() self._nx_graph = self._rdf_to_nx( From 8e2af2a6025d8d6257a3dad101afd7d62edde8dc Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Fri, 23 Feb 2024 16:59:36 +0100 Subject: [PATCH 300/343] #310: fix tests (remove if a mixin is asserted; comment experimental: add connections of disjoint classes to entity) --- biocypher/_ontology.py | 26 ++++++++++++++++++++++---- test/test_ontology.py | 6 +----- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/biocypher/_ontology.py b/biocypher/_ontology.py index c604548e..b5d83d70 100644 --- a/biocypher/_ontology.py +++ b/biocypher/_ontology.py @@ -16,8 +16,6 @@ import os import time -import pandas as pd - from ._logger import logger logger.debug(f"Loading module {__name__}.") @@ -124,7 +122,10 @@ def _rdf_to_nx( _rdf_graph ) nx_graph = self._convert_to_nx(one_to_one_triples, one_to_many_dict) - renamed_graph = self._rename_nodes(nx_graph, reverse_labels) + nx_graph_with_labels = self._add_labels_to_nodes( + nx_graph, reverse_labels + ) + renamed_graph = self._rename_nodes(nx_graph_with_labels, reverse_labels) print(f"Nx ontology {renamed_graph}") filtered_graph = self._get_all_ancestors( renamed_graph, root_label, reverse_labels @@ -244,6 +245,23 @@ def _convert_to_nx( nx_graph.remove_node(key) return nx_graph + def _add_labels_to_nodes( + self, nx_graph: nx.DiGraph, reverse_labels: bool + ) -> nx.DiGraph: + """Add labels to the nodes in the networkx graph. + + Args: + nx_graph (nx.DiGraph): The networkx graph + reverse_labels (bool): If True, id and label are switched + + Returns: + nx.DiGraph: The networkx graph with labels + """ + for node in nx_graph.nodes: + nx_id, nx_label = self._get_nx_id_and_label(node, reverse_labels) + nx_graph.nodes[node]["label"] = nx_label + return nx_graph + def _rename_nodes( self, nx_graph: nx.DiGraph, reverse_labels: bool ) -> nx.DiGraph: @@ -625,7 +643,7 @@ def _main(self) -> None: self._extend_ontology() # experimental: add connections of disjoint classes to entity - self._connect_biolink_classes() + # self._connect_biolink_classes() self._add_properties() diff --git a/test/test_ontology.py b/test/test_ontology.py index b0f72f7d..89ded35f 100644 --- a/test/test_ontology.py +++ b/test/test_ontology.py @@ -10,9 +10,6 @@ def test_biolink_adapter(biolink_adapter): assert biolink_adapter.get_root_label() == "entity" assert biolink_adapter.get_nx_graph().number_of_nodes() > 100 assert "biological entity" in biolink_adapter.get_ancestors("gene") - assert "macromolecular machine mixin" in biolink_adapter.get_ancestors( - "macromolecular complex" - ) def test_so_adapter(so_adapter): @@ -49,7 +46,7 @@ def test_ontology_functions(hybrid_ontology): combined_length = len(hybrid_ontology._head_ontology.get_nx_graph()) for adapter in hybrid_ontology._tail_ontologies.values(): combined_length += len(adapter.get_nx_graph()) - # need to add 1 for the 'merge_nodes' = False case + # need to add 1 for the 'merge_nodes' = False case for mondo ontology combined_length += 1 hybrid_length = len(hybrid_ontology._nx_graph) # subtract number of tail ontologies @@ -67,7 +64,6 @@ def test_ontology_functions(hybrid_ontology): assert "biological entity" in dgpl_ancestors assert "named thing" in dgpl_ancestors assert "entity" in dgpl_ancestors - assert "thing with taxon" in dgpl_ancestors lethal_var = hybrid_ontology._nx_graph.nodes["lethal variant"] assert lethal_var["label"] == "SO_0001773" # second tail ontology: here we don't merge the nodes, but attach 'human From adc8f461fc50731bf9c0f65278d904cd960470fd Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Fri, 23 Feb 2024 17:08:16 +0100 Subject: [PATCH 301/343] #310: comment debug print statements --- biocypher/_ontology.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/biocypher/_ontology.py b/biocypher/_ontology.py index b5d83d70..5d345c59 100644 --- a/biocypher/_ontology.py +++ b/biocypher/_ontology.py @@ -113,7 +113,7 @@ def __init__( ) end_time = time.time() elapsed_time = end_time - start_time - print("New implementation runtime: {:.2f} seconds".format(elapsed_time)) + # print("New implementation runtime: {:.2f} seconds".format(elapsed_time)) def _rdf_to_nx( self, _rdf_graph: rdflib.Graph, root_label: str, reverse_labels: bool @@ -126,11 +126,11 @@ def _rdf_to_nx( nx_graph, reverse_labels ) renamed_graph = self._rename_nodes(nx_graph_with_labels, reverse_labels) - print(f"Nx ontology {renamed_graph}") + # print(f"Nx ontology {renamed_graph}") filtered_graph = self._get_all_ancestors( renamed_graph, root_label, reverse_labels ) - print(f"Nx ontology filtered {filtered_graph}") + # print(f"Nx ontology filtered {filtered_graph}") return nx.DiGraph(filtered_graph) def _get_relevant_rdf_triples(self, g: rdflib.Graph) -> tuple: From bbe7754895af126517f015b73ff675c569e2443c Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Fri, 23 Feb 2024 18:06:35 +0100 Subject: [PATCH 302/343] #310: remove old implementation --- biocypher/_ontology.py | 180 ----------------------------------------- 1 file changed, 180 deletions(-) diff --git a/biocypher/_ontology.py b/biocypher/_ontology.py index 5d345c59..227978c0 100644 --- a/biocypher/_ontology.py +++ b/biocypher/_ontology.py @@ -98,22 +98,9 @@ def __init__( self._rdf_graph = self._load_rdf_graph(ontology_file) - # start_time = time.time() - # self._nx_graph_old = self._rdf_to_nx_old( - # self._rdf_graph, root_label, reverse_labels - # ) - # end_time = time.time() - # elapsed_time = end_time - start_time - # print("Old implementation runtime: {:.2f} seconds".format(elapsed_time)) - # print(f"Expected {self._nx_graph_old}") - - start_time = time.time() self._nx_graph = self._rdf_to_nx( self._rdf_graph, root_label, reverse_labels ) - end_time = time.time() - elapsed_time = end_time - start_time - # print("New implementation runtime: {:.2f} seconds".format(elapsed_time)) def _rdf_to_nx( self, _rdf_graph: rdflib.Graph, root_label: str, reverse_labels: bool @@ -322,173 +309,6 @@ def _get_nx_id_and_label( nx_label = node_id_str if switch_id_and_label else node_label_str return nx_id, nx_label - def _rdf_to_nx_old(self, g, root_label, switch_id_and_label=True): - root = self._find_root_label(g, root_label) - - # Create a directed graph to represent the ontology as a tree - G = nx.DiGraph() - - # Define a recursive function to add subclasses to the graph - def add_subclasses(parent_node): - if not has_label(parent_node, g): - return - - nx_parent_node_id, nx_parent_node_label = _get_nx_id_and_label( - parent_node - ) - - if nx_parent_node_id not in G: - add_node(nx_parent_node_id, nx_parent_node_label) - - child_nodes = get_child_nodes(parent_node, g) - - if child_nodes: - for child_node in child_nodes: - if not has_label(child_node, g): - continue - ( - nx_child_node_id, - nx_child_node_label, - ) = _get_nx_id_and_label(child_node) - add_node(nx_child_node_id, nx_child_node_label) - G.add_edge(nx_child_node_id, nx_parent_node_id) - for child_node in child_nodes: - add_subclasses(child_node) - add_parents(child_node) - - def add_parents(node): - if not has_label(node, g): - return - - nx_id, nx_label = _get_nx_id_and_label(node) - - # Recursively add all parents of the node to the graph - for s, _, o in g.triples((node, rdflib.RDFS.subClassOf, None)): - if not has_label(o, g): - continue - - o_id, o_label = _get_nx_id_and_label(o) - - # Skip if node already in the graph - if o_id in G: - continue - - add_node(o_id, o_label) - - G.add_edge(nx_id, o_id) - add_parents(o) - - def has_label(node: rdflib.URIRef, g: rdflib.Graph) -> bool: - """Does the node have a label in g? - - Args: - node (rdflib.URIRef): The node to check - g (rdflib.Graph): The graph to check in - - Returns: - bool: True if the node has a label, False otherwise - """ - return (node, rdflib.RDFS.label, None) in g - - def add_node(nx_node_id: str, nx_node_label: str): - """Add a node to the graph. - - Args: - nx_node_id (str): The ID of the node - nx_node_label (str): The label of the node - """ - G.add_node(nx_node_id) - G.nodes[nx_node_id]["label"] = nx_node_label - - def _get_nx_id_and_label(node): - node_id_str = self._remove_prefix(str(node)) - node_label_str = str(g.value(node, rdflib.RDFS.label)).replace( - "_", " " - ) - node_label_str = to_lower_sentence_case(node_label_str) - - nx_id = node_label_str if switch_id_and_label else node_id_str - nx_label = node_id_str if switch_id_and_label else node_label_str - return nx_id, nx_label - - def get_child_nodes( - parent_node: rdflib.URIRef, g: rdflib.Graph - ) -> list: - """Get the child nodes of a node in the ontology. - Accounts for the case of multiple parents defined in intersectionOf. - - Args: - parent_node (rdflib.URIRef): The parent node to get the children of - g (rdflib.Graph): The graph to get the children from - - Returns: - list: A list of the child nodes - """ - child_nodes = [] - for s, p, o in g.triples((None, rdflib.RDFS.subClassOf, None)): - if (o, rdflib.RDF.type, rdflib.OWL.Class) in g and ( - o, - rdflib.OWL.intersectionOf, - None, - ) in g: - # Check if node has multiple parent nodes defined in intersectionOf (one of them = parent_node) - parent_nodes = get_nodes_in_intersectionof(o) - if parent_node in parent_nodes: - child_nodes.append(s) - for node in parent_nodes: - add_parents(node) - elif o == parent_node: - # only one parent node - child_nodes.append(s) - return child_nodes - - def get_nodes_in_intersectionof(o: rdflib.URIRef) -> list: - """Get the nodes in an intersectionOf node. - - Args: - o (rdflib.URIRef): The intersectionOf node - - Returns: - list: A list of the nodes in the intersectionOf node - """ - anonymous_intersection_nodes = [] - for _, _, anonymous_object in g.triples( - (o, rdflib.OWL.intersectionOf, None) - ): - anonymous_intersection_nodes.append(anonymous_object) - anonymous_intersection_node = anonymous_intersection_nodes[0] - nodes_in_intersection = retrieve_rdf_linked_list( - anonymous_intersection_node - ) - return nodes_in_intersection - - def retrieve_rdf_linked_list(subject: rdflib.URIRef) -> list: - """Recursively retrieves a linked list from RDF. - Example RDF list with the items [item1, item2]: - list_node - first -> item1 - list_node - rest -> list_node2 - list_node2 - first -> item2 - list_node2 - rest -> nil - - Args: - subject (rdflib.URIRef): One list_node of the RDF list - - Returns: - list: The items of the RDF list - """ - rdf_list = [] - for s, p, o in g.triples((subject, rdflib.RDF.first, None)): - rdf_list.append(o) - for s, p, o in g.triples((subject, rdflib.RDF.rest, None)): - if o != rdflib.RDF.nil: - rdf_list.extend(retrieve_rdf_linked_list(o)) - return rdf_list - - # Add all subclasses of the root node to the graph - add_subclasses(root) - - return G - def _find_root_label(self, g, root_label): # Loop through all labels in the ontology for label_subject, _, label_in_ontology in g.triples( From 63e591c55f217a97ce5bd01d1a256dae62a7b26f Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Sat, 24 Feb 2024 19:42:47 +0100 Subject: [PATCH 303/343] \#316 ontology parsing fix for snomed ct post coordinated expressions --- biocypher/_ontology.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/biocypher/_ontology.py b/biocypher/_ontology.py index 227978c0..1a8180cc 100644 --- a/biocypher/_ontology.py +++ b/biocypher/_ontology.py @@ -168,6 +168,14 @@ def _get_multiple_inheritance_dict(self, g: rdflib.Graph) -> dict: child_name = None for s_, _, _ in g.triples((None, rdflib.RDFS.subClassOf, node)): child_name = s_ + + # Handle Snomed CT post coordinated expressions + if not child_name: + for s_, _, _ in g.triples( + (None, rdflib.OWL.equivalentClass, node) + ): + child_name = s_ + if child_name: intersection[node] = { "child_name": child_name, @@ -229,7 +237,8 @@ def _convert_to_nx( for parent in value["parent_node_names"] ] ) - nx_graph.remove_node(key) + if key in nx_graph.nodes: + nx_graph.remove_node(key) return nx_graph def _add_labels_to_nodes( From 7539daaae1edb42acedbc868b3e6fc095473cfa2 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Sat, 24 Feb 2024 20:01:12 +0100 Subject: [PATCH 304/343] \#316 remove commented print statements --- biocypher/_ontology.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/biocypher/_ontology.py b/biocypher/_ontology.py index 1a8180cc..2a9188cb 100644 --- a/biocypher/_ontology.py +++ b/biocypher/_ontology.py @@ -14,7 +14,6 @@ other advanced operations. """ import os -import time from ._logger import logger @@ -113,11 +112,9 @@ def _rdf_to_nx( nx_graph, reverse_labels ) renamed_graph = self._rename_nodes(nx_graph_with_labels, reverse_labels) - # print(f"Nx ontology {renamed_graph}") filtered_graph = self._get_all_ancestors( renamed_graph, root_label, reverse_labels ) - # print(f"Nx ontology filtered {filtered_graph}") return nx.DiGraph(filtered_graph) def _get_relevant_rdf_triples(self, g: rdflib.Graph) -> tuple: From 0a8bf62f9a382fa9a83b60d1e684fa8bfd9b5696 Mon Sep 17 00:00:00 2001 From: slobentanzer Date: Tue, 27 Feb 2024 16:39:54 +0100 Subject: [PATCH 305/343] cache dir option --- docs/installation.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/installation.md b/docs/installation.md index 4b96df56..2daf286a 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -145,6 +145,9 @@ biocypher: ### BioCypher module configuration ### # Set to change the output directory output_directory: biocypher-out + # Set to change the Resource cache directory + cache_directory: .cache + # Optional tail ontologies tail_ontologies: so: From fb28a2bc7c21e3e19105648af19a73b8cbe6d11a Mon Sep 17 00:00:00 2001 From: fengsh Date: Tue, 27 Feb 2024 20:55:35 -0500 Subject: [PATCH 306/343] add doc for building pole standalone docker image --- docs/build-pole-standalone-image.md | 31 +++++++++++++++++++++++++++ docs/pole-docker-compose-changes.png | Bin 0 -> 88643 bytes 2 files changed, 31 insertions(+) create mode 100644 docs/build-pole-standalone-image.md create mode 100644 docs/pole-docker-compose-changes.png diff --git a/docs/build-pole-standalone-image.md b/docs/build-pole-standalone-image.md new file mode 100644 index 00000000..dbf2a37c --- /dev/null +++ b/docs/build-pole-standalone-image.md @@ -0,0 +1,31 @@ +# How to build standalone pole image + +1. Clone pole repository +``` +git clone https://github.com/biocypher/pole.git +cd pole +``` +2. Attach volumes to container by modifying docker-compose.yml +![docker-compose.yml changes](pole-docker-compose-changes.png) +3. Run stage deploy of docker-compose.yml +``` +docker compose up deploy +``` +4. Create pole standalone docker file pole-standalone.Dockerfile +``` +# pole-standalone.Dockerfile + +FROM neo4j:4.4-enterprise + +COPY ./biocypher_neo4j_volume /data + +RUN chown -R 7474:7474 /data + +EXPOSE 7474 +EXPOSE 7687 +``` +5. Build pole standalone image +``` +docker build -t pole-standalone:latest -f pole-standalone.Dockerfile . +``` + diff --git a/docs/pole-docker-compose-changes.png b/docs/pole-docker-compose-changes.png new file mode 100644 index 0000000000000000000000000000000000000000..49a3d381990c159ab4793b6dda6726d653133fab GIT binary patch literal 88643 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 z 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
    w;bA=!&-f!nK^7Ih5oI^jaKjAar%o-a}B z{Xz+CkQ>Cy^h?JL{DKeKVZ>A7aG8P2+Kg;8fnJ!uV!Q1)0>y|xLleF>s&)lLSKPD!(7tL_X$SH_~eH{$Y>la-S)wEEW9iIkL-lv%po zqvNe76_1thPBSs3-P$kMI^Ran&a8OaSCpt=^!D@iH|G?a9=77|a@f%cDKZ9H)0_dr zvT};@A4KYlS#TdtEfePrZvkPXwjn(1FUojHi_n)LIyqjRKucry_*7bigMpHsn!3&I zQv7!XX#sEUWGh}0zuX~{J?L^eBxlyFr`3C^f%pLmfxPHBc<$s&EYE zt9k6~n@*Y}oKty6nPG>r;fjBlEELA&RUeMu)2`T!@%#VKGcufxyieEiqHCXZ<-Zu+ z0T(E5jgyt}*3_GxjDuYQ6JC7Y3Cq1qKUGH4XtfyZd~Ti0X*E+C7vt+6A=WFNc5eed ztp~saS`1g|3L*rXoyivT;+B5crAdY2%kBu9%~y|)l-Pr)9*%`x-`O_Fz=*kgpToL4 zIF^R&4pP7oc#*o?egaxKu$nenlDs$=K^3<~FBUuot@*&3t)X(Fax=rUpSJ*=RuuI2AgQK)cbv}PLUe|gbzMm~J<|L-~?H&z#`YAI|Dj{`< z1peX9Cv00il+Q_Nt3JIvSOLcmjZel&_2Q{k@ct$5!=XJovQdTpt6xq28_%cx!+i#~ zgGS(u35r84r^`sl*P|f5Akzx=XZP|#5AY_X7%q^6|GYKc=5l$P&?WdDD@u~0e6}Y( zf2Z*K({uXmq6f#pqe7>$=DIcEqFM(FpwBn6($w!`V~dglz*fFqz%6aukD3?ZJMaIPD5~NoWF7z$D$-N*6adO+)PMRy0S)f@#z~V*wC`Fnbe9xl zC(a)K^8czZ2lY8+LEhvybdfZqTme`66V=)VtKSb)+5^-!16;}uz`KI6#_|n|FTOn( zy&e@3DkAT7R)W5~yT%yRk(;`@OQ70W#OM}+xeVh6l6CZkMh>O_8nBo7;mXv}Kjxc5 zI5=#B_lGvK6pmN(Cv@t+re2?cA5l}9ZzVF53=*o^dfF3galDM*)bF&cuWpo}L_&I& z_#8e-Wdu-o`)8hKdt^aty5p3K0h}#7tGdniJzSuQ=H@=6B`KeM66cN1ul`GWsF!hK zv241}tM?lYrmli+ymzu(*SzF)H8_gvy7nUE{?2xQCj3gyzdoaJrF`}v_C<#}Ph_L# zcn(%T!Nd7xzF{1W*b;sm9@c`f&C=wvX@RwZUr5d&^DYy>qHM}^c^R3xFzIc7*OXC5 zf1>o@e6;(Na&MGR;+2)9gsSP{bZCKl4ZKA>MIP0-*eJ?qiG z$0=lv^`D#vBD_@dzzS=vCabwxps?V}NzYN1Kog#CpC8=Gg`SDo%Z48(kvl8FKW(yG zNXu=Xh~Z#6c%BaVFncVvZS7Xu-_m0okNIcRtBA2wpCxW5nkunXC57q^Cij3KNe&?dskq$T0C37~r zGLfuRJLJoJ@C07HMq<>f`}8r8TaJ+1a%O0-Yt=b=&i!__L|xA1aJ;(8t2@BD1?}GI zvoigzW@DKCLlW#4`VW(!z9Ec1X5`GII8i-cEL~%?y&aA+d<0;c9YX{y@CcA?+K$?6 z{n+aR%|_bc!<-D}`x<9}Q$b(f?a7B&e%*^+eSnbuiY2G>#tg%j!X+_m4Y(4}<@)0U zwD;tL|2tr0yFKqJ)=&50yV<6+wTO{hD;PphFT6|mLLczt@jHen5@Fyi}SgQhd%rZQ?uXMg8A;1+vOb9N`&8n5={oGfnS!VmN;g?W=F+Vs&T(#nrH8g z2+3>S`SN3uVL)9;!c>)hhotOd$|w)lP;uvve1PQt3>NqcZ}4?jZo=hI6`b-__@c^h z)&zc?3X?*Xm4m}IwpOev;!B&JQVaK&o0@m1-_l21)NSPJN0P9A-R&dKII<`q0%%fp2Dytci{1G8B#aZ%M~J2;%#ni z-9~?=DfFo95pj&)2j#I-iA3u@C!Tk+q=m`fSa&$WtuM-m(0!*Rpmo)21K8 zH{JbiVM8-Ckim{SmHE0<>QNh%+a09U_WJ=DQ#P?=2!_h~D#Cl{P7gU5PBm5=*-n=o z$>=-#k2D=$qE~2@V#Ap*?KA2sy!hQT{YB74j7`WHU+sF5E7!{jo>09oEnGwVMv6q? zj}98j9zOQ9))(U;OmpZrwm=aP-(L+sX*apG`nsFAH6-9WFlMk2Vy!o8OXYt}3x;~G zdYeHLn=AT>DSYv|@yU3dcZ@6bTmRQogFM+do0hZpTAlg!{@?=U{mSEow9E?7(nmPD8g! z(5o1$r|Ysvdjgpq%5TW63<^?uZOQP0{gXB*YM|ha0+-Az#mv)QYQ^{OlN(I;c9c(^ z#J-Peo++N@6Ybkqq&>MMBuVXNDSA6i1&nh;LPzpy@bbuLrQE|iC*W(pnPS1@O1jYd_D(LM(zv2)CfFvOe9>KOu1g6)qJBr%WMLft${aVq5<|oJ zt|vLk*--vahsU6Au}a_SawAp$CG5lNUkyS3S7?`eWemSD-%@vO8cuiAQdeab_NbIU zH{4=UsU7YLgyEz=%bMa!xv0YppwXqREMwoU5%L5R%;Zqv3=L&jKuv^FvM#OYvK$Mo zLMCPDFGjU%brFLJoyNO z8KS4&)B`d4pO7H&g8JOjl@Kjs83k$hHZ@gbt@1@gh0xQ~$_UE0s`}inBRkUDyl%X| zCqU5?a(KGq+IsUgr1vn7=l+^FQ0(6OI7k;X1=OnjClRYaqO;Ds|nGtzU&G6Nf-NZy1)-a*i_%Kv6*RG|qo|9YaIYw@j% z)7VhDP=&r~JJI~W()q2$xtbM-3S6H0NguiusL>Wsbb*b_k(_nvfvAUa%MRE6+m8oj z3B}zd>a~c}0um^$V}J8^a0m+Mi^dwOm-XPlvBTI)x6EM<0oM<>+C;(H5QNEl+W?L z-2jLph}J~l%iP_kA#lH?lK32M!2AO%Ycx#hnDbJ=uhdVHZpNJA#JqXQuR+0>ab^1| zIcOpEcxL(~2(g53ZI@~0a#Q_~Zwo0@>9UE%hlDM{b)e4#^p5~jiBE7Og2Hj3xangd z8Xu-YKYOd;JEvgR;1HihXH1J-h`M*1bSW&JAxC^)gS&+?cu?<8Mr^l>z1_;!Iq3d& zrt{&@FPEx-&0IYpEM?01eHUleSLPSiFd+XKiRxWD~~hnz0g|~NW#4x z`F~&?0t0vq`Trm++14ki)u|s8#*dC7R`z98^%GZd-Ng!#&IdvRok9rq7UQuT$R)ft za=pr!*9qv@p9!nWZyUQuF`cI{n79-i-paIyb?}A-=dJ}-6`J$UXtW_xlr3Ps6Y!4J z;k3r&Uw6E!hir`YN(@mJn`1|xqV?}$5w06Kj+LlyQ@c)~NcL?|yn`42v6>Xc^9VPa zs)3owoUhjx(^ZY?pDdt}PRPvn%VBx7J*Gamo-+=RcrWytvp08d=Dv?6jn_qV!D}^) zlyZ|-21wi#e`JD9F(?TX!HbUw5UeZ2q761__+_dWsce0(Pf!M(nD7TpY*}vBTFJRMMBZ#_V}G{ zK5t6)FKTPU&Le4c&aU>8RyyMV{k()#XiVHywdRYZUf_U`p97rEtidDvo&tG0r^@{m z_TU++|8TTcnK5cF?&lC7kR&FsNR?d(l2~J)Dr||~-9f5h zvBud9ibQr!Djmd(G~s7jHwz~@^TA-YQ4_H}KD?$o8Udmapk}=R4VocIX^;THRTJtc zz7ODq95F3jzB5f1ve*qmD5n~^jLFrk)uQ*xilVpF{8P!be3fhESd}+}yUANae7=o` zL3yG0=w`F6^+~~rLvn7I>s$AriW?U3E!!|TzK9Iy2#zVOhb5&}GAWrCWO#-E1Szyl z%_Z`2So>F*B94=gbT*@U(#QI=L_a*uMJUg#s`z8*y}l<55Gx;!h7*jrEX;DXSz+p# zt6p+fNKF?0a&vBKMmBdqKK%Lle7nn1S3z-|mV@dp=Ih{v;roNB)qJI!gop*qSTOxV zo>pvRJP#$Vw*oay1P4xymLimS93QgUBQT^WVvHxSFMYE>?-!(GT@0iX)Azasx$vEo zY3(k@Ne`WRxFbDGtdkY`&B8=u)DV)Y1T~1J9UnOyK5Mss?WCP?QK#xxZ>+{_V)xSP z>?Pd%qTssTq8{w#jRAZG|K_9L#smqKyJM?RR(AKMIH?$xZF9X2S^|TkNaNykowilE z)aTv2J4PSgt9WW2+{d}h)c1j)h)$@^uNZ#GTqDJjAnJ5|Mf(CB`lb&{KU`*ZwcWsf z|LRLN^K;(&+i~!;3@jktFFNy{kKZd zUju!08k{f-O%xAawMRMYezOsF1$TIq$CQ27SAN1y zRC(d#u$|;={j7}{QyVDkRB)88d=bIP&~4P~7XjmsAtgQXG_n=-mLiY7_T4ITZrdk? z4zL_v1j`T!6KJS=y{D%xpLTDZvzXZA077o^gqsp@ccH5RfFe~RzQjVuFl|OBDGwvj zjddSew@?w3geM@cGxd{m*!kG4s*2_6Xm(Tc8uw)WfU0IWCH=v^;}!b>pV5X-Iq7jE zB>#yXI^Q{{Vl8F&bWgg4Te{#JZFm0p-B}>OMtzlZN$!Xr(sWmoMCBbHfp?2RM?tN&FrA*dG^UPWsduDDCT-70sWg0m&L6^ zO=FK(zudd2tUA&~^l=D}(FrwcbC56->*8H(0FZdRTp+3$qT= ze0tKKthFT$+nZ0nC|L)}W*pUc$OB=z3mheR)#Aq8Fx`oF=XWlSk$!`QP#PF0p8s_GHmOdcU_Pjndr$W!?!HrUYQV|6OQd_T!OJ=A~&Ln?1yGC%@e-FX4j-khnv*fe}Qz745Z|BKC>n}#V$b@}Yu($uxM0xE{{g`eN|_fz*% zb=1zuIT#A8ge5lAA26+u1{XhJ46?_Qsk__L`?}?@?2{^9`*Aj4_DR8Zqsp{Q$dl(W zJ}+&Z%nv3uB-$WI!cLBw!iW5>;{((({5XfzZ~JuN8jYsGm1*R|wkr!tZVqy8pN1;? z`HCD=-IsjmWY()4rf~q(bcu2KtxORIpJ&f>mRT?j{~(%K`1PuT(ABllGVAa z$g4~mrN4wmAu{qOo)8Aqh5u+Uftf{HA#GOEt@ZY#FfmAd=R>w+sIo07QA{~NhFPY| zgw~#)rFLsBAqkPdyM=PX;bNy*RH9Z&_--;a4W`=!ee-iPyu$}(Pz9(FxnasHt!21E zdj_;7iEOqn0k~NwOn+7@oJ1VHQU~;n2f|1QV zb791b)tN2Pp}pRh_LBSYFfX5mFgg7^)@`2bg!`qEgbc9IUZ^|9fw`t4;x6xKni=$V zU=#t!)r+_=8z03e!05+Tq_17^nd^o`xeOr@V#fY zOl34S;XT%LnL4bjCV0eBlZ^$~C}aT!4`RtQL-#IkLvCUOP8a-h*qDZ{997=VSYtz>n&aPh5fDDRi@`v8IZw-%-=_be!{cZf@d*F>V(3x6O>+l`Wtj;Q1Wy zo-!t7HC06*>$hj*c>Wa*GP+HD5wBKkSR)_G5OqtuIhLsKd4+4xuxLmv=uyY=6mquU zY>y?}VlQ!rADi1*1w=rE z&O@)X<#o}d=ocTUeSlL-ioAC4kkQLXE^I0Oj;-~QbdIezX2r;1fz69h8MoZ@R<8t3 z_2;o7NSidAG3oJoxp*p61)mgYOiYR|RTnL0`Y=(5X3`=Gw>y&2`S_u;9(Kp#&$1*> z%81$Ppzdh&)NePta}jO*0!s~d zE<&~0-g-EZz|XC$2je9SJ}JJLat#srEQdOgD)CI#Jl<=M11rG^vP&z6Bv^-g&6YEK z7+sw^%G0iFWAP&gaxtFrunhtnVoU_HO&jG2c`mDsP z^OHu3d0q1n7OGSD(TPY~ydG~?liNF97`;3d`|dhnlrb;~MwjJfcV0gHQf!U$8ASPk z{&=5bu))P=z6w~|o8aKVyhL&d?sH=bamk6R-@=M@K#GGgdA_f`%U%k+h#ct%R~fT7 z=mnu*KyshxHDBm*fVncfceQdy@?&-4D%Cz2X0ya>R=qASCl{nemppAH?HV{;ADA2X zd9JE=7|lrXXRuybC$n(x-RYsiut%h`ioa29nxpHUI*+Z8BF&e7W9km?Kf?O{CJIRA z{@p{GM_vF_rTF`L4e~vJh|^faTcX!e_97IXV{@haDP*^SXHZ^BeJnr!>Q2VuF{+~x zy&zXy-WlJ>W%hj92yA-}tb+GL&DZ^}F`Vl$3m~#Wcf8 z{F4JqH^RsS3B7dfNu$dic`xJ{o7oOfb{naxpw?ztq@);Neyd&{L%7A`;7eCcd*p7T zeZQ&TGq91yZaUY5H&P5X_V+sLG!bEE$qJXX{BWio&&@>I4q(QF_2uQg@Uk?8ImV&b zR#5`}SUSUqWmQ!b`B2OzX7qZy*Jc7ke0rE6U6X7?SQxs#>BfQd$&#`_liizv&zC{W zI!-~>d{FCHmyKd~yWikxzg^MkKA*2PdCsq>Jt|1)vPVY3Rr&!!g3Yxz`+}~r$TobR zkCQ;7Ov)hbgtkFA4NgBA_##|M<*?1jBcnD=us+KsO|JTTCEZZFTgea6ctkm3?U26(HfZm725xbP`)>h=6n zkheW&RE3zQ4YL&mCxksSj(sh}v=D4v*af!7Q=KgF)(kdxAn)pI2jKH z$X8FxKAHf@WB{TI)n3v~Z^^wBW5Nska00^kGK0b}VTrh~U_pmV?j@gF4F;>F8VS() zUcptpPIPo?U#_n1Npn$T3XKz?fc;_9w*Ya?Qb<+Brd%b2%cyIxmQ??+y}n)FEuiPO zM{j#CS+m(fg0G;Jkq6tDB%DHB=W8O6EKQ)v`_>=O3(fU1@r*1*4A<)?%hC})SoNk z%NJ>D&Gq*+SvgA)*KPxz`=`US*54@Cv?Sx{&Fz>6G0HvT zZ7`iqWcteO8+hh^6OHufi^HlnzxN9t%;-;%*abmyOFYl<_CRwpwu_k`i)TA^=39IH z$nFl!7BcHPY?9Weij4QZ#&qzWPrmK->9})OAh6lUZ&eXCk`ff_$=|FRqGb|P7*?He zMbhOVUcBh;A=ORhGM_AhC8VhPe8Svxc-?xYBr#Xrpd7>5v3I!QU;LeR7I?G4X}@b# zQrhoOes{fgAIl8Vae-Y7W_qVBI6=5BYbs_LA=%~PwH2zbS3WbObymuw>=+^d#L;(o zimfTcA1f1W6!VEAMoEj2C{@+4Se$Oulg-E;Y%R9C?QNE&1p?<`Yi2c_u+gHvFQ-FF zYIzy&il7kT1NfpI2S@dFYpHxZHMWqsdUKSu%1>DmK1~)UgA?QEsDZ2tj(KiOo7v3L z^Z*7di=op`1D$Un=j{OX=;lsm8YVr~JXoeNK%B=1)YqSV^4Rqrcg}1RgMqI%LjYgp z2pI$0+5J2#Hj4;Kc4M(Rmrl~`Vg?4e4fKz?cq&Gg_4~BBPk-7XWg-IcSk2V~e!^L) zyzF#;%S&xIie5&yved4D6fu6sKY}J1B2yVd-G(SC~l`cHE!Q2anV~y>{!WF3ZY8HX0~Y z?x=r82L72{X67cejDa)KQcMbxic*18DWYg@-`IkSf4@$i37_x zX})FYfHDbUyU9f6>X#R79sO6GZOSC?&xPjQXa?5KzOvOl6Y+b-pUpEWly-dfdeUIE z+80KACR76*OYrLD;X&8l#?t$ot1}OfF5pP?HtjuAh*NQ&g%fS?X#|hmiybV{OVStvf4?b0U=L_-qXZ=fRkaf<4RZ3AMpPw(NjCpc+Y(@ zl`d-D7Z3>~ao3?!rUF?4ZnK2l$O|G}_80cJ^$taHPOja(o3`C6=z-{Zpop-+OFiiDkVx`(HHZxgBi32= z+h{~>Ub}vAUyb)37dvo4f@*KZA{v^1oYUI0)h!IZ+UwPYiZXcfVke?>y?m5;JvqUR zG(Oit#a>rpN$)PWUGySb(v2V`w>vyxT4scw;y|c&4PMq(H2AX)$ZGST0eF=8_qD>z z;r}2i4ix;$-u$XXevwv<$zfCR7&?qSx|#PcP@HAboq|ZbtD`w&Y`%y9$)?<%bh?n; z#d+TO2y%A3Qo7Ny_OlkYcZPmGKa!XJIo-bno2xT3^O&67dONpL16po~5kY_lWUt=p zAn0&=3jbJ^TqE%$L@B)))?3@%#Kd>HX}Y;za!j*21=G@5HLSlgdpm$3FMj(tBpOYC zSVfUAuPa~IwDcA@O?iK;%e?ij!28D8Q+XPD)jrgp*<36{N$?7+y_`K(?*AtR0{H>? z4XZZQt9LK{m{=rZ%P}Y!Q;CZB==$8#J+7WHoB-fFu()00z@p zg%KYHZuau&PO9}lC0{})@$^~@8O&45b(EzA8u>a1vrdEtLG6IIuF`(s>ojG)ck|Cq zjzBkfuIt?FuJe;`dy!X8>0Z3cI6(&mFoz4D2y=X&G$F5#;tu8xc z_zH*W6{Q?%awHBsuK6^+*Jkk5&iJ;FU*82hXT-rG_tiR=Gjbgv1-bleOed?jW16$* z8uj8wF4mtZ2c^qURo9nMy6P{vbr#l(<||yz3l?m_m=BVstM`AarJ>^Ir{$+jQ1u!Z z9&%GxXelm!P!_8c6Ox5L5Cj$AqdUfHRfl`*thxQ%pnoBA&n;+8AsmWB*5#b3psJr# zK3}fw;luRaSRXde*=YL^f(w7Xf1#;m=-_F%IQg-ntt6rBVj9Ae8(Lgffb%$TP&kaI zxz=UpBxl*xm#n#|lnk2IVzwTgM{?3qv))Deo3k*i)u*hw{>8X+V1!wW_jLg;Kdi+8 zV&9oYgys+lAA!cN#hgy_H7>WL>46?CB$w+l2?=EdqkB5!X&zM6)YNR$;h`bX z${(;}CK>pHfWO$2M};a}LWCuoxxkD4OP0E|%bgJ}F3qUaFh+j?76m1DqNg?szrGD?Yl`^hG46|=tb4?#(UwgH#R16SJmeWYlFDjOM9b*p=qJ%d#+FAC3JZoFVh0c ziDz0BO&Qpo66+09X3vSFvhD|=f*Flu3xfGJSwHC5bm7ki1RkVbtfi;esjGQ6S{7RW zQb_|iTn-#o1v`f?okGjdytD8q0`u$Fr6lcEOelMmVG`8~azrH__lvqcl z=w_Wnv!M_;cDz*J&E^9r3MH5FC+d`b@LqJ@l=ev&^@-}j^~(Yu6xtPh?226)vIdn` zCknOHOgsf%?Vs#9SNKV|V%?4E=&Zav?OzE0jdz!8;T3`-cCwU$3=392U9>Vg9X3bJ zw;I`rQ3&r<@zyZ!bK?-9#C{(pBAA2|5TZ+(w$x~11zNb`LEiq6S>x!_hKz5U`yzx2 z+`JOXkG@wLh7f^9c{-(*>tJv+LE-b4g=av45--tME?~WHY6JQfRJH?*SZiZz$L~*H^e2 zYVbu?bm8SC#kJ{6Gsc^~goilttaKWT1@8_;Yn`(7e%cUZVTFuE>+ME)qpeX5NRhBD z_*_-~DqK5{{?6m%`x?jwOG{_V-sW`BV$yCYbT?HeX*s6-ww~kO6LUT7Y>xKi z%oRa7LN={|KU2~X>;Dtn0uiN7&yQ&@BA8U$;{KasqrIFKzT`^h&GQtMVL6j&yqG%* ziW8~(Ge))sEWWPgh_T^?SZR6b4TQ(h1*FrYg!}MeBSW02Sh(eWQs> zFhF5{%Jt)c%Uui8!rrlbpXTdyoj1gv1U%p4GcWgYr`>Q%w>YRSeGP*L@>b?t6kAbVbjreE;0nj^<)u1>^)fHY%%h29jFG zRAg*wuS-fh5XQJT5AOA8*(8sdAN4eCJxfL~{=1Z4W1@94aASzw^(+$V> z|1K`$TU2c1C!X;DEB*gUs)-JM6{BMMNn<3ZN_in zofFm*b8hT$q=<*uwh*JRcv0bEd!M!BnETG$HycMQ7sQt#%inKKDInm&?k@J)R$Z5) zeg~_%Bnb9ODJ%_ll_nO#TNfkRJht%Foks7;BvKIXUFEshb&0IzK}Ax@U}xx&NLPQ% z-qxK%@*C%RCcNJUMI!GVrq^Tga)@?c5LZ=|`?wDTmd{;wCypMZaP9G0-GdpBC-nMt z)8q8i1peYRs_jD#i`CcrIok1)W#*qBOf_yP~f}c@BjyrhBRc`JE2N z+8a*4N2VQIcH(G9!rae`2S)|9xa)1_Dyq+f94?Mq1bU7XF;#;G-KZd(&QKZ7X&Wi7|J9KQw<}dnxq>F!TkqFnUzCqCkM-TUG zqXnv(R=mG%M$WkL+KWX}faxvU4mQ#0K1Taz*f`l}t=9=QP2V|s?}5v=wxgWi-D8Xl z4VgxJ~;){jxQ*1jPnaNeC&TUjI0sjZ_2_TPNXcAM4fZK0C-H*Diur0Aqc zyLIU*z|TWyUvxj%Ur}a24k@=Kth?2z9qoGA`s=wtD!OwkKb65OOmwz<%ap3K%O8kd3(#;d(&* zv={!~*k=#E)iG{0r6(hJi$Yut{(bKxtf=j4U-!dmtI9j?e0hc1apqwcet$ zaP4XW$JeA6535iq{=#hR4LdDsL8o?rfB;V26mP8zeeZN2TgeY=g=UG|aZtMU);RgvK05myr66>u3yyzr$N z7P$Wa?XUS|8EMt#YV4K#bE&1X39t?N!$%awGGPzOO!zues(WT(e+c{fZd;=(yZbC% zzqQ*?ssJbc)3{Z3oOIF~?0$Fw<>y%Dgk=>pE{C-ZE;HQFLqkh%m|OO}x$dKE!$70x zr<(`DJJ+6hXGm>vR zsJ%^LIm$Wo8jS?(wTpk+klOq*TIJI|VZ8(Cz6Nk08}QQx-5HJS*MV}VLei!GZ;}5I z|7gzY%(MLG+62^k;_qt{VqoT;zk0BYFCT=4k1k)SLd?QG2nekZS|17&Ht-Q+*Aei{ z(X6iKwG_v*g)%QKV8U_|)=pB==G1NQ1@q*tc{Nq%45}FM8Oe=v@B!60eT%f8Hl}JQ zHyS`2MY4A!A-PxAm)IWt@x{y1G@C!9dx|Fv)qOV+^shv><~+7g*Qxm~{OkAF-FkOBt{y&}E1 zY`=L`5TMHEpI(1{=YYQH{JYO(WxFALAl~Se=OW$2G-sJQLxs6V6NR(3_DPT|z zdbfXVT+4mOeTDqB^af*xA^7MloCQZPDs0&5lZnZ_IBQRjP;h>7gQZOmFyYnSas(GB zLYM_Boch`wQF`IL3V;?Fsys_$0R6R)?$h2YV8vnw7mQuVI?yRChZZIrsW3#Jic2Bc1UFNTW-~&cauN5d4hr z!L^Pb`>qdKPJ|p1r;UOec7*)8v_&g9#Wj#Fk0v8(Dx_ z7e0-URTj7Y9|U16b42C*9+R7Sg2^sbKt3OVSD5MYsPGeiRiFaQ@o7th3{%3-5@AW?rjAS^Y zyeXegr8@!pI539xDAq7|Dj{5GMD7(_`P!xv_|TI)`XYVw7lQE%HFx~3!ozm>!hzlM zRns@=(hvW9Aw)mi{?*|ZO26#;{_8IlaxRs#?*yS?o+wC?0M+RUg|>Y*ej_IhlcAB63IXLxgWH2#qK% z=bwO1QR#6BZ7AkU%9Dq;m#5F2j||E0d@PJd+)xOmEN-B zuD5?1xa3vTd?C_}UiCHhSTXj}{al3?B{s%_n6yn93)4nE3fW;d?R^2ft(Wm8W_iq{ zr#H9Ww!n?(Xgq++~p9kPuvgySux4aM!`zU4lEj!#?|*@80|F z`~Ld)HM3?-PggIxx~jVRDXd1_%QD5jVB{mhEuI zaSpe9q%o%EPkqt3hj_Ks-oyumAdUH^|OT%!A&X(M8YU&JK6}IL7ViF`DUN| z-1{CWMQYJn^N$!TmOC?SmlVC0gb9s} zc2gtk`H0J}?5HDDkCaV$m>QoW8Z5w(Cx>+lu0cmdDZ|948%}I0$~PKZnn95=3Gq?2 zDNZ-GMxXgoR)~y+RH*(7S42yQVqV;z^HSlWM*e=~+ZJl-61oDYshI$qIT2}mnxYmI zkKm-xm}rw(*JfUx={N;?PdVvlv|eFRL{ufjd{UWubyC64;g&qYO}cmX+P{5g8+^ysR{;!lY^mHtUM0ZZwjiLd7l|6Lg6?7Hd z&8sPLVZNK{y3Qk>%S&?v~(DWB=;uZYpV`gc*eL{a+GD@8S-0lD*{E|rG z+C>rNl45>4k-;uncC}#fFr}DD%ND13@7ga7LXp#^jEq=fagBq6a zgT9SFJle@3uA_tybi~O=RljiF(MWJKRCjWc`AbcE`h9SZID9lZGN}?ZU842>!s$1) zto`9AU7|fQRYM2Tci{g;wS)1+lNn*%%F;JeP)zLXIFny}7ZxFVM!K{~kT#M;k+Cd! zRN~;XDfoJ4R*i^Cs@vaUQe%i2fqG?ZmvU$*5y}_Sg*#zPFd~(g205}I@xT)rtu%yc zmF!!KBbQ4a%)42_^Uu6~-v7btf0pwdltP?0UGUaA@#bDx$8Jkuj6B#nI3k!AUoow2~1OTAYr$Gs3O}}$0Kgds*dP@gan}}i!mW+R- zf<};*kc>(T{#c~++U2ynf~~S5tmdGuU9l$5ErWt)11&;@i86#_Pk)p{MYCJs!YxtE zJf|mqCKG?EfGy=e_=8xtPWAqT>(JQvEVyP!sawEPmyjGYcFRo0sNXY(mUP&>WgpyRnZc7NjHH*_eZRYxSI9Q+;`YoXwIl; z6I5SDV#irZ86^{QOt9k9bJ4uK|Cr{S0bW>qLTTvtCPzh*63wuu&R_e%Ai_5KmBRS( z30go(NR^<{j-B*>!Rr5C`28Q_zQyhDfD{uUtt~? zIA6bf^rVh`po`^7kx-r$%0XB&15voatQIDBT+l=`=g49o*hIK&CyXAlWzK71d5J|T z0uBEH>7#vDTtsE2*CxOs7Op-rT%` z(TvKrr93tPrBv`r7_=ByL7Bu}K*esVu_J=SI+;;1SCjLxi7i6=@H2Y~3_BHtM;(|} z=pnpWQ$)fR5Dg{@g|@rASyMf@3C{zg?svT7r!dO3PkH#A`r2V6A&E5hgLKn-8p!*S z3jVm1w?En}Xp38fr8|xkS(wm=k~^K^UXrSZ<^K?q?96E9@Gcm6PFlW;xn!s^x~`Tl z8b>0KGxMbfQN*WHZ4w#qLrDWUo{&Kq=)k5=uQ7yHo(27Xf${~A{|(C5kJ$hJkCabW z99>AuY+}P0;1L{^3prwH)8%#xdV>6Clb4iv;ZtGKdkC`MkK>WG48 zLle!cM`h#($=-hyWBsBmDFnMNIkH(%^fw0|$g0Rd-!g@x$WG*ugaSew99F$6LgkGU zIJd9rFi4I_#5y0W=nDjxy5%$-*()WDKWW$wAk8Qt)}s-6BA-z!HpU@k>c)`&zJgx9f-fC=g{Vs@2((D! zKO+@IAm&|zZp_!zNDow_a*8L*!@x44f3=_$jDRf4#nig6rilbm{Swf!mG7ChpX2gr z9e0CZn@yTAcMIZXfIT7>Tj?5qB$4H*%oQV+c>@*kR4J;Hp>^R(v^-~S$|e8WbLFtb?bJt|MP_~$!tbIQ8N+-HiSgC zi9hm|6v|AJ_*@MMeh_S#5 zSdx$n+LFeXFoy1%B?$NPq_-&&vhj-|stCAR1SV_(B-3#A*ovbBa?B7+qpe$4 zgFkOvG+cN}h>~k{%}{wU7!z&$8zT!@#gal-QS0~1Q7Xst)JH7zA!yg=4f_AU>4)o+ z+@!8}W{@<@X$T(w5DNT7sz-8B!Bd4oZV*?EOY`OaR9KBUPxtr?{a!90KTb`lFVo=y z8zWefaqbib<0CUxNi-zR&|#45u%%1$iQZv%t%14I7g(p9JtCbXrRj z`CN4rkAft}2`ZG(9~^|(@KIUn;HKxA0^Th|+4u=wogxuINOlxC8N&-(jo6@06zxUH z=~<_$9u$|MGxpcYIj~4`=^tscZ|j`gFsn_ovoDA;7WoIclkYL%I8op6gVBkC^J;+# zAckCCz{53X^sEj0%G%YBIqfo`0M`#=V=c=%1ATNsEvqTWEMvA6qQrH7FMyLS+Rzdv zQyXb{^Bx7Uk-n$M=_uqs5`am^jI~|-4wzS|hqqoE;05_$_h0{0{QW<<8AuUo{}oQ( zM^K0Got&8HW1|rSC`0XsMHz9OU2<#t&u-b57|efQ(@#AxoyLcc)T*3yx9mW);a=04 zl%_d#)|$(B)|-6HirBS&+JEK}@EW+Ik6~k197F1oZVb| z>R#Un>uA1ABgYm|l*iAXVe?a`w8Rm6l#gy}ud6$GZ?NxYl($>Ss7r+Lk6|&64qgb- z)K5=^Ysrqf6ZuFrwzf%2lZc?eC7BJ%U_7R z`-M1|nhMug$&L4=Zc?U4z+tyJ1LRM)q5YfU^1njqZDE4bCrK)Eq?#I6z=WF@M@w13d))&Kl|REK~#hsBZA$xx00Sj zeE(b>+Qfm7*5q*BUSFZ@YF)10XLW34TRx{?wf+!*t;+wSU`9kPNGqS~>tZgD&%Qs#epll&7QVR*wBwFB<(J&E&7?=bv&oMji{$pHdmku#+T^9{N-ri1%-;OB651w^;AY z2EAZYFRQY`!@b7ZkwkU}PaC5HzJ}*l)#HnUGjm6HKA^=Dw`TEeF}J6{@L)1W)K`6o zoD>w5V!CNWJkKA-ks#@x6K9-EvMdT=lg!EUhw~k4$Cem!RiRp}9Ig@8^$tUWmpOgF==MRP!FhLtq zFEoQx<*p*8Bi-SWwNWHphgn*CW%nQ*4+Xk={|XzWNYm; zAT;TQO76~4C8|`6SzPu`2y{+TMuMydF~u!Q$A0ExoooPb6lTJ~PWXWca`Rh)uyrUO zoYPq^KsYq`Rvp|EZzoee0T~iqF}t!DDkP0E=4><cshOzV8eSZjmr@e z>Dhp^bRpSEtE`L@X!dO13Y!9q)8M_cxYBoV`CCg;Ar92T;Mr4+h(st|b z9*PM5PAMM;R$W|UO=1x<@WK#t#~2VRxXn)&(B2ehfR55$%Q@EVBd-3&hup)XGnfD zSFV)lJ1@iS_FjUfy=s=Pbi0c!#w2QZ5nc$$YIB-dtPHI&s;{BPiD>fe%nPL~NF<9* z?T(<#BnwfJ#oh-H@9Puq8#0|)3-d;7la36CgAND7EEm+7@pEW?6OkMik9lI(0&JNL8a*{*pvfEn0bW-vv!nKT!LVuqVk*rl2Xx!lW$c_;>CvMS#c&Sr9Om z?2mkJtbrHN!7na;cN;))5ec%tr}kCrAyS|&YMd-p8&rwkt?b4eyQu+3Pvw@IhEZ{_ zQFnK+WiQdocCoV*fJxMnYBzQ8LUIFgmx$(Dr*@u30c)oXk*8@6Iyxt@?9~B{l4Y$7 zZRQIeQGqka_`I*X#vmtwP3MNW@$H`MeSon#BV?rVZ*cvnO7M z?Vd&w-lSea9mW@e@9sH(GY=i;GE?er8^Ib{%BO~KkkubjjRCB}_o6Y6)P58JcQqk{ zn7>??xLsxY!;OdOGUscuvQg6$#7i2eOU0F#YnjN>?-GnSc|>5d<)xNX8=#r?B_wow zwGwgWiHTJrO5Roc(L}sJ_R}CjOV^nnOWRL}BWq-$%f^hHl`7xQQ7lrepoE<9=X9u| z7k7MbR=5{6RnT^#4C@S9dV8rlp5YEg&&^2IN)8uQXl!m4U+p<>1&q&w^0q2?DhV}Z zh$nl8QJw#gMzV?Shh%lxelrL9UJ&WGF28OnyIYyL9TEmQr%6_O=>%AF*-rBw^Wi7R z^k5A{>LOy&s6$FydQFhfEhwczPM6=6F;FaHj1AAj!XXjgeRYYzlJUEi^JS5YOBD}b zk;VBkC6$5;(Sir6lWnl;b>)vLPaSz?MyVg+VEu)hAxySxE7ED2lfj~(yn5?u8|AZP zS%h3)8IT&WbQ@LMj;+yhg57wTE&+J7eo!&#*G^3kFdTdTQvG3XmNEFt8jh%>xseCyf z6(jQUv7E}x(O}B>+ryglqD$=&-%6I&A_0hz9-6Rqo;rVdQ&%VJZ;OnUq;>N{+K=ce zz#l=u^dPLh852h7ht~vz$Q}%g-bF)j&nHRB{jovd@`3P?6#mqZu=62po>1eI&;+m) z|Jo3mU9E+;&$Qc|LnMiUn?6)UjLGQ{xE?He9V*~T5$sK+k169eySP~Q6+Bs#K=7b{uBWyM^mM3U*DHJh_(0T0jEXISl)MZD1Btv^Y;pRlW%|(kl&lZGANUPEc zLP8x68w_OjdY~$)k}siu9zyBGq-uudCih06nwDLVgTP6emU~eBYBxJz6f=pDFAYc@ z#EVoyPIdfnxKr4?J(RjD!BGCDEQw}l5ka{QQixV&^sJlHPLJqsOpRA zo|b@YoigAmqZi}-c-T{q!4~VmbAx;LQv1HelJRN7^$gU`L~?&r^ATAN++iv9#w-X* zza2>`d77sD~C+6-7kHYv*V$gMV(2gR7~zF5)&dJcCyWBB#Dp{wgfGvt{!qA*{71gM*6#( zG=bgKM$gc1Cb#C62+_)kuNbIQd}}@oF7e zC){>8p#O-rvMpm)y!O6M`reUoLOa}_Z9S~6GV-2fM6@X%8CVNEQ=y?)3BhAIcSSsh zRme!nz3~o#jwaeLb|!+>(wXW)lFdO*FYB^Us7kfJ*0T99_8higmMV~QS*1}UlGQ%~ zi!hBL^woTGY~GbNZxlJI?obXj^xeJiBvAHXQhA|hdQ&Df!c3C7DAZ6IkFO4)RlqMUepouss>)~K?G--Juti;X0<(}s{WbJ+hUjnpRH;ql9?1jxu~%}F@<$g z!HWFELbmq2Ehj=Tsk^<~|ergZbJ}lizWe-tLp)2BF5((F038C0=!ix_k(FqQ2EG_ZK ztM%1Y@p+$^VCA!;n!g%;CR%puV9e7wRyz_X_0x8_mOsV9aH{ByO_(#K(Sd2j1kUw4 zOZ0Gb;i4-FafvQ7+>4AQk#oz6@D=3SCohn{s2LPz|Mda!rqj4{p%YL8eP{$q&U>Ec;hg zpxYTq-Zi4$TK8%Klq_h^O=xfCY#a;XWQmgT6S{>WEUoFDxnre~sw9Zx(&faanvB0} zD#{q@;1M(HZ+B{zD7GL|Q<1*ZO49KyH8Am26;C#N0LBF=*9?hHH7NIqNp@yeiNWlb zJ3wUD~Ar#&(8um3m$#63&{^cp|18!{V==m`kRu`N|z)|7w&sP#655sGCHIY@+O zTe}0`qz6X9SoXx?`hPYO)3GV{&H1DpC^HK`iPy!GOAp1(eUCgyf(P@u#YC zy)R@YF;ZJ|75yNm{m+o1W58#V(Opf)-HKP(nICT5rrwaEd3)PAreb4Vu-5G$6c7-KTd{e~- z0rqgPvz*G9Ajdv@ z8qMaU_-km4e{1I)+JjQ#U8#F*&5&GDAa>F~7RapGm9z_Q>OFEwIhOUdnRpjjX__Mt zo7HBLb3*VE^1HT}k&2wI*gg$4wOGJS70;2e?7K%F`MoB3I1Mg|>GKgZNsCO(%14Zy z#7FEouW(Bcv+xg~bmX)DUt6qTYJdCn_feo1St*k6KR-R{9)1Cv`9uc=ruZ?q-|EM0 zFy9##MIoyXLqPGOWp&U*PgLfo6m`Iw!KzBsx<^#WT>#L%Fl;&BGQw(mnsL%GYZnx8 z_?%On0&GZU6dahiF&utM+KO=2sk62(v!3l*DtmMZg0q=FTdFB?8AE`Az0}E7olRdF zI$uUADd!a)`H=wX9Pyu1MdOzCAZ`nR_M_+v{qe@0k&(jO8vX-;@_tfL|CX_?q zU3uuU&xWdZc-C&P&Bk>SVZul+G+I5hl>bH}g zJ$#s{`7@cl^7Zp1ukoUfTAo&cvQK;gY%-#@>%bVvX|qDkarUZA0&eF?49eC~vvFQM zrv&x%XpZdT=&IxLEZ^zkw&pyE@A$D9J;%4ayfW224KB5OAuWZ~)AJino)wPWO|HUO z@6s+VYzfAM{U6lr%T#kGplk2GiK;#x|E8r4fR0D=8 z3b&TQHe>4YWG~R<;tL<(KR&1>P}j^(t0JWmq+NxWGWUbf|{TKTiU z8sz)MV%Jif`=x^iVEPGg`a4=h;VOdX*J_;=<$(KaRwfyjvbH+)Wog>UmX<*%S&B-E^sciScSE-j`3L$7qYVJ9E{k{dR97&$_V>P?yk} z`*M=$(|LOja41T=gDAY3hA2TDN4#)wLJWnDl=&4Fi2xUmOA76mnV1xXiI54D&uzomdiV4PdQv! zqPiJ#U3B12s8PxIL10hIqNww#@9Ru|e<+ELfm%wj*_Xz#2Ddh+*=b)s{Ev?Y0-KyZ zPhV=WN)zj%tn1a{<1e473tL!|=3grk&mQ<-E<0~08gAyVcp~cTsn&#0wjvr=Cb(n);)y+`HT$!a2<8Q8Z`kbnlY zl;nJF{5jEXVK2I*DkFPWwP%0!{mB(7JcoUMHtM>lV_c`5+Pc{&U3x(ag?og@8-;K2 z5NO>Z3UqhzvCRySc!3K#<#VA~x|!@q)*Ie0i~1B8$Voz_mrk(6Mm{J#LLw^*H&bL{ zYMD?>-C2Jmml7Qv{egOPI4W~(Y(jpFLN*-!xM{IO1$);4V93-3oKyxJ#6!^)B6y*L zRPmqU$KG5f@`uMrk%G~B47$%4deTK>b|3RNoZT3HWj^6ObYW2W#7qR-$P{SaW!9cJ z+O6A1t}L@H$Udi!?CkCm0sG;tRL_#SAf-xtK39Y^e~3_%$U*<9-6)b5CpR(NPheelX(d3Km4eEe>rFDS!xEw5H&{ zc6XY_SBXmOInZK7qR5Ah2hwI!ca|utVLDF&-ug6mB}5)rw`mPBk!qG%p*}C_5ML3I ze6s9!d(10#msN{5FukEsQnM@qr;~Uj{;VzUqKyEyah12_`EVu9p3-2o7*2$6JQrcF zV)>`f;>bTR#v(VeU+3k#67j?rIh&QHi_I25>f);TzJfk9)w^^I@H~dYx#Le{HaD z&W8#FOzUNtKhcscJPky&czZ}sUli*$Z~oW79YuoFmMd~F3SC<<>K_GS}i9x=w@ zm#j1sm8!GF$`wbf+c^WB^f-4q7Cpr{46k=juUHX&h!vRCK#Im;QdMPBpT3eZ1GW5Y zl=n6MeC~aMQsr4%Ew*SnE{bHaoA4g_4Tu{(C0S}X&AbIx>g1GSy{ulH%ybQGS-*^Q zR$S^NT2^Fc?aus~sC?HzKEo9p{hMu1tZ@_Q%y^v6V4J=-K5RZVzN7q&&vSV1b_5tT zNq}&Dp)wei$qr*1kI&ZGZ8NU2K<&RjMis=hjlK1czWysC8mtIH`aHaMB9`|Z2?;ty zmicHt@Rz0aeFs=+tNf&Y=UnsWMG|6@z%Pfdw44Xe>ovwPuCw|k5*FU%%9*Ha zQN{8*HLiSfQSiLwoVyv!ylP37vA^~og(`2|-iy9np_savJR_6&W$;Z325_^&G_CEd zBEM@b7InDsGR|S-=Y2)|49wtMcgCF;D)cIpE9A!i;{cF?y&3V`#PhxD4cYZham=F; zqpbZA=HuLcoc!9&F?7{Q5?e;S>K(f5vz9$b=sLfPSC?P;-tCPm)%9Gan$1bNI|iv}$y+KXbOqh^r^Mrq=op-G!gQZ?{EmhSk;?$R*!@a9C;ruMW7*3%o|wToqvG6h1c!_E+*@rqE-T4+v3nKT?xT&P zg9oP;;jFa;cFUp@dHa9X#y0u0K?3|XFVB!LZuzEzD`DNtvo!H~cxN3+02SonF5tlZ z#u$oTo|huG!oIw9F|H=_cH@S6;QQjgeSfMjYF4H{Eu2E58-tIQj0jF2 z>z(A6s}b<}0BELcLx7aS9=*~|ZufJg@8@cTJ*BTOdtr_4Kc$)-{w#b{XngTq2}aug z_&)lXrH^XDe zL}PeXo7I*ZnKC$Udg9$!=!Zs@-YcH16AuI%riHXT~*ji@kya}=U#o`D5kZMD@ zS~2a>=hNQ9WHSYY^JFg9u0hk~JATRhKB83Orn)?TLMp&KCNnduU|;f~*jBabyHsFk zN3N{>f3Iw)1t|NVIxQ{a1=`d5#JVIbe8fCF3jAI@`PHtKO^?(Fhp3fe{ojC47AzB@l1k~0#VbOi5y`*~ktKs1pP>0`6s?9TI%NU?Spgyeo)p~gg z58457X-$#^_e8|uro%6;i#eq=|6Y3frZmy4#i~)wl8#&*s*62PM4eN4hNQoJD-bRc zIuCfmU2Avw+9&j{N)_LZ+-Vj6SUgR*9wG~@zS#p)E+9TRpRdeUtmhqWL#2dG%MEbZ z^QF(d1^paAhsRoIAGm+`rO|jZ!u>W7T|^DeP`_!DdEC*RUD{BFHCJyuvRAIt*jUS? zR9lpEPb2XBW%)3*v(h$&d%Qwtea&0^8#09k{-VWFi787UXPFL12YlLJP;RfeBhLxA zSU2md-&(B27*y08`rri4jk9b(=F07;jJBZ{gxyP#WP2 zha}C*DlCkgEKzokCyN0Wf6 zcC5}K3S2K>`i_X1`|GJ#X{%`H~A2s;@ez69#b%cEk$X8g)ZCPe0Hk=fEgV=!vwRL|IEtkq3 z&kv~v#IGLU+un)mkJ*R^TJGaT9@nN)HiveY753rtgOYNvEwpo=)YLsY&x8MVb3^R} z-{;l$7BO;ia%loTYRhGL%&hJGN5yY+J~4T{t~F&S)3#F;?bQ`(P{-J-K{ZQH-saFk z3{;?R{W1K_qzV5Yzc%~!g#oa4gO{srlUDUO8iu`cU-bC&-u!O~s2rwQ=M#zRDOkr& zz4EN!aaaeZb_@+-???JI%TCZOVE2Q9tOYT46Cp2bUZBGeZX*uUMw2NzuDsI*_xb$X zu6AR;_jnIs|A!MwCd-z7aLx%X&CMo z8@E&}1+D~4-q(An0k^62-s>_NEy@F%K@d=%5;B%M95)7syv-`~TP7aV-3oMJ0ZJ$B z?Wyw-DfL^WDj~M$FOD9Y7)X)ttE&rQ4ilO)6yo{Vm8+{e4JGlxpRi6le)oY@fx$k@ zi5#fDc8 zpTg){IwIV6`{8J%5I=$_v^2X5h|0iQvb0Y^{Id4t5zv0lD_crjh0>#ixJnSme!5<3 zcoP=;MoSyW)aZ7+gmT_w@XrcdW^O8kg8|Aye$mDJeCu$Pu1+mZ^blBuxiWKkYN-DH z{AM~7o*iU-syE!Ulk5{LEdd=s`;FD?bSUvnDy8fA|oRW z9pgcR>6!QvgU;g11MnzV1Oh$H#`PE-7jN4Ul`U2AzcE#gSDx1XDazceYA>`CYsFvU zs10+E@B0zq=PB?bn1<$kahXjk+AXx24wQv&=sA8|2O^yJT{v}K z-8vYO@ftfp5YzA|_~c-kF$%?;EB`*PGcd8?@cv$KoN<#nzV3;Hf{(f3O|s$A_k0=a zMPFvX+}HA!W}4{q<_fQAVdgUv}bojJJUrE1fwx$@=Z z#iX`Hvj5#jk(qxNYy*NQ?BO!kIt!N>lf8}N@Ytu&QPH0T{QSYZ{^@dNC^mz_)wY^K z&y~*QevzYbiy+~Dn)RQ(509zau6&YreCNv-c5*qKuIydybv+y}Dmx{P10TeOACEar zh0}emI$gQ`}9`AwJE7b3!09OA2z?pW-OLNGgh=3K@vQZtqz;CuR zi!0`>>ar_x3Stj{X5wM1Z-WfM(1~81+9g;Z6&lF-3ql}#u3Ymi?J2GBE_!*lt2ab` zSjZCn#~$zaS&dj{@cwl#Mn>g-m7CcAnuqd!B`brNjmsfI;r;b@#K0M#ACJiUn1F6I z5&xn1_>Ra0rPsJJ+QZG*r=+8M-t)peSY}bd6@%`&XI0}ZjF~Y$kzjdQX6omSLz8LI z&Gk~rE7csH@1R-9qGK@v0~Sza5A+0BnoL3*1qx8d>u(A@Xy?0)PG|b3H&2`IDz7#R zydch=pj_W@j1lB~I!0wqzkj+~ePQcHT$ba#1wVT)VYgwNzmp~%N-D)Ntay!Nxh-Yz z8R|I3j)Rk4LD7)J>{2leO|%1j-CE~i30tt=HaS6TM^E7hz?fXzwSZ_Y8(TC9=Q2m# zm({et6H75eVt#FjC z-cu_iS2=+#ajHQ9uiCH^Y4?8%rh+8>-a^Rps%W;*57sC81#~Ql&5Yce>K=gO`;EtM z#}Gcx$kuk#Vw3&nflz^eA)=PMU({v&Fp;-e9^S8Zi2yVigJQZHiZK_hpWFxnxSWht z*DJU25EAldEKWDm-s6qkET($iDSDmUJJka}Tz%hmsA>mJ|By;>uB~v5>fSb({9GGB zhoAn;doz}@dz;(e;F`qst!EeMLu;T9V1h=!bzm@qJEqeFuzW*cm$7+-HC}-so`KC_ zV>3YX#VlPxeWqNJ9k*rom299n0)>HKiQja5E2Px*&2g1O*+YeDw^%uYglT%zr^)sU zUu;H?Cr41}Z;;qUBD+&bRP02-;kdV$y|h~NHX5=S52?qv@{+%7hUe$NLzAC>ZbW8& zqzPiFtZ+JOPw1e{_bRtq$e~yjmuz{MJ&MxhlX1eEBmAcb={FYPB|`}FN6bQYUi*@q6=G=iVDel{!ErZ=m z@)}T{BdQanTVEqK_Q}Xe#Rn+J(V)@tROao%wk_yfC7u=qUVKh3wl@?R&Y|S@3B*Hs z^wElyQ%I=Dce}fcF?d&R-vA^zE!ppOjv{;w3AsYpSKqh9_?&_UXBnd16IrqRoD&pF z1;5MsBSF%xO`{46B2LF3ODgQ<=f1@oiv4cmnm*O8%Z?-xJ)#1ya%t455%hh?807qE z3@eF$37_tE<@kLsPS5q0K4WcFxV2k+aJ0gJqx&uxNYinRmUeta3Z}E%5Q~FR7W$`; zED_S!Gw4H%L-;&k+951Sr}3q)E6K6#*GmxAKqlWe4ke+YJZiOJN7Y|acl-?whk>^E z#ebdiE|RJF4IR?@RWg*3u~!r!S_v>-cUf=s8~zjY-8mXA65TVrh(o>`9NKPH9_D42 z%Q!)!(nz#(BCLu_T&3ENn!Hxb?B9gSFRI5ksIS!u4i=dk6SmIQ^cihh*GYQpa0v?T zFVgR`_3G$(iT`utBNoE4=aG8dake*0YmyAqc@!uRTD*A9z>s;e-w{JL;(5%7Z)#Jf z!F5z2is^A9US-!w``t?5D?qt9H zrlk=U_J_X?&LQ@jBzLC1MW-|<{S@~_@}(uSR-?{A;T}bLoPIQv#HqO{yZZW22P8rf z0LLayE>PXPtm*)({z+qe;^Yzoi-hnTA5Gvj{;D!^>x%eTB;~m2(}NU0#vDVk(W>uw z%}BF%C!eGJ{8yH#)QyueUG90~u{_K6{x}Ae7R1b!dyhU#O|`6T`^?K-xJ<^$@EO-6 zR>^_o2e0nsWy4QjNFUT~2LA2626`Rkm6YJV+oI>mCz|B4LR3i>bC47Qxit}(Px6o& zGub(F+Ah$SO1ivQG}@ELyrw$X?1pey#54wv*L0!tmr2MpkWap-3#l>&ZV<@j+FM%| z%u?x-f`L@xR8$9SsmIQ}6b||=2TZLdRoUUhH$-DDdOuPAM+o-hGiT2LjcDzaV5whG zQd6R%j8TTii@ogL>}SN`N7;0s>nO@oP3itwekY#<-2Ofq@fQ_fC;;Pa(RhNlRLcOt zDlbc+6uY=2F4ytjes4TH>c3(@E<)ehnRG+1msuM21}EZS>AGG9U@5p68{{11S@)-$ zdNo?q(*gO^(M=PW1p(|`vxIQiNad|S7F5irUMM<% zB_2dX+@3!Wl$pIpLHH*hv>@(IB7p=d)t6U|N2V#qRiC7;hSt4Vim8UaN{h@_70aD} zbQ)Mn;C(!`5yUn#o;|QwHB9YHHYpvLj0^lxEEYDW_lXT7uy0q|Ping9*bl4RD4k)= z_)R-{+MhL7DNIA|XqxqGrN+A>IX~5tQru8kWWK04zTP&oVh@X9JG3fPm1-;+bEMfnGlV^(-~*e1Z0Z=P5%lKVA0s(lgH*j z^9}T_)UTc4`Gnl6Q`F5ee9jZpb2rI=E68Z7m$6UeH=K8}{@3wGn;Yom!EG9pD*S~v zY-28JKTWootToDUmzw27NFd;INO`zs=1(KnBiE&)Y-O>XQ`>f)ux`K2?Rltb>1zv5 z&aUs_{)tWFl&ZhK?7ErCV4<*wFSlanU3Bix{%&i_JExH5LZTzIAd&*7^|H;t(&C#< zG8%lb*1Y%Rn@g52#eTqSH}=ewYonuuec><01%s@BV6*IV6z^6Zqgp%~4PCk2Es&;B zA1cuCZKZ3H+C%JpHn34Ov&1}mQ%l+KNN`rtAv>qG>?)YWp|qrk3O)2y#8tk0N1C&i zgu|u4&69ftd=FKbnotp#QA!b*#(qD!&hI^(!;~ACFm^f2Fd)Bq+j9`&jrIA$1uXQ1 zYn^8(eXh{!6iQfYI#pxJgw*8~94q6Ez9;(J0I%SIq)Z6Zzy?beEw=UA!XV**=%r{N z=`}o~XWRIY*z@qVILHR{C7lBj!-i4Ix0mc6agPybz`xt4nfzo^m|9V4KHJ@naM77R zryWZ;RY8yMm8ocB8@5l=C4Dcl^shn@6WGP(YnuPDLQQ&^oLy^DU{8@{Bz?yBw+Jegd|F+|OaOW$F_M?Q>?Y$w+JbleSx91Q*)|rF8 zfaVS9x*^g+w^YwDSAX;s{_e9X1~YccskD0U>?t12dM|SFQk{K%r9E)-bFM3;g6Vmg zv|NKX#o+I6rxkQz+MR`~#ZXJ{Sp|(=kOL5D?%o4MXgCyQ{8u?8JjdT*S(g|VyuEB7 zvbR2KGENn8{L*SS9Cg+BvfiQvl}Pd#h0tbp(@dETRQ zKtoeSQ3s_s3s4-?RE?;9&}*`V#}40e!W%^o@l?NN=iW3i4oPDIkEGm`!$Y{>=N->_ zFwE^(*dGPYEiWKI7YeW04rRFREeG!m|E`u8{CzLpkxVIB_Y&zY?3x#uZ)mszNc?`uaDp0{gbZcq?l_%S6|MRQUbF24~Uyf@! zo_P39CiyzKb+@6^bE$TqxL_C;!^@+vuKzIla%Vyfifyli$0 z3%^9jN4Ya~Emh&MG+pa=-OJM$U7oSJ!d-yjx;_q?UgVyG2|cxRWJIvzVQp>>PjOhl z*2pA&kE=1^C%MFqbF%c7U)P_!e0PqHbzkg_8}40-=;tNBI4qNUkn;uI*;TyulA0`ybtG!_4&{#|Af(ow z>FkeIjNGLgnDxY0sJ9s80ne9v=I2}_JF2WNpX;s13zsXnoIQ;Zn}2Yo`;>CXNLAZZDfPvW43EAISLHU*s!j?t6A1D_ z(Rt+OwqF0^#>zHD`R7_Q(|ON_jN?*@ZgBh zh}%2P`d2rLpFbd4Lg$s#V;ja8@1Ay#7kyXmGZQoSz3*r~6z>AvC`*St6Bb2Zo6Yuw zIL`l25+wFqHMBYfj%84-r~bFSc~yIGq;ZdnonNk1_E{78og9_l#zDoPgqSP!9(?|v zSpWsnxi4*e#?!9$ohZ4SeEC>XQZ|M)GB)DXewSt35+!R|$)GWg&@QSWg~_31;iBT^ zszm*KH7%-zP6v}5ur(=O{@C|Ggl~5yguDqD0$fb}$cA~a4}~)qyBC0lyF$F?_dRG; zTJ{<!?nm?+5kHJYSq}b9Hxf%v$-Ktc(WLZ5?r=d=U|@s`8emsbGoXQIZW)9$4G72 z?pL0RA$OA=u60?m^jm^R@BJOs=-iaHTI^-w|HSdyN+rg$DJcwMhSl!URZeOBj)YVoNj*8>-SL`sD(pF81ClYu_%}h^GNW#RaDV{#!H+Qk_ zG*Aen!SpLj{;St92DF?R=zFPT+HLq=v&!glYK`bSGRnMvB`FU2WW* z4HMnDK7l>A87*k19v17P^fm53&THjBE2G;4e++};=vP0|Qfb-RseJ!S?veoQuNHyulfzHa z`Btqy&E$KZM86^Ed_F2^;k)|B7-G(jZxK5v>a@Xk&zZxNmZ<@%>MmC*ZEH9wH1L99 zyv|J>f@lQixl$S~1&1IvU6ancuu~3Ek2(J50(R8wSY@=@LSMmP&j5D*7jj+KT`K^kuYu^Su@1x_P(%HKVOLZ zN(FD0+P5`|nrgau)IG^DSD!mu8I~Lf;f#ln#C^-%bPKCFKW14WeS}=|DM6J--4gUQ zEd*vf#!-Eqi)@9^C8g++TiTQxbf1@l1ehmb+Q7&I25Fzu0?@v;V7symKorjyrCZ;G z4Zj&MwBfVr8J^1SBM32j*uTg>?;RkbVXMVbW<8KFrqgI=Z+^8W4Cxo;#KRW?SVqLt zVqG!(ot1p0{>)q|=dOT-=WBX=coOaT%Rp1W#i+BQz2zI$R{^6R?I$~6Ff~(kY9nTF z0L?}_FC4bOff>;Ba!$LN16scLa=O_}Mg0K%cILU8i%w_Rl`n1xO27xQ#Y$sRr`bLk zS!H=Dl2JLi@G(jyPTW#KG%n@ibn6;hw3(8RyP@4}Bt=99w)Y-I<$8Dc#)aWWBpuyi z5$nl7!@0Xw^k3MP^VZKRa^nK>+G3vMV-)raEv7Br>)+_gQaR3NobKmy zb&xNnl(w4c(WOCALP5S8fT*!(^7+)R1WEbco7eG<{gc^pz2d(7zU*b^vAWIWRBH1> zV=D(eU-SL^dag^)GjTp2rfdnYF%0AXu=iHMacoH#ra`t?vY45fnVFd^W@cu|VrFJ$ z28+pJmc?$1nVET8p1CkPzOxve?{Z!GVZdG;Fsgvi=Kfg?uFk{#WviE*zGgl^w zc;pX67MF4C5z=}{jC=$@0>*e;Zj%=P0>+p-5ho_fx_V4;XQx)H2f2q|TDfg!vz988 z&!5)+$u=S4HW`>&CKkEuZCdOX$Q}yc7Nl^;LbdaV68FjY*fpTVpTVn z^?b7$Lv*B-rOBgLC*tO4mJ@nCN`|n1nfB5?%~r&l1ZmYta~$KQdptjoB|coYT>y+2 zvNQQHVT!mW#P1Io`j0Mp5->7ou9CgTTN->r?jf1d?`|%v>5XodJ=BlnBys!pY6qT9 zGL4I1xRGD>8WDjH>aW{>Q+!tm_AtskMXMH0>GY3U9IVZka`dCb!WwasOK(nNA6m7s zaytmr!*9>i#NOXK?|rxK^<6=69CvqFX}m|Vd(E2hS`tuEQ5C@Q(B#WuJdkmCaqT*7 zJ?1gEdtp|tU2jaeCTV%M6cw4Gs(+5sxc8eL+L-rFH9)TR{>dCw{u6!ubKF4b zIuSc4K?3lNH*c;G1@(Vz;K2WFBijq_E7a8*x*Bj7H%ZnJTLM$zUm-dFuB>_V+U*Mb z;yf%c^7wAH>hKv25l#bv!&|HJ(iV)|DRUb zmWE?_@Xx{dW(BMPG!v4TbU9%?@y#eaYh{VR58pC+EXROMS#z0%Yhw60?=E%!<&d3i z;=yyV9=2Q8+tBLo?cV`kEj0svWS?bs-qrX|E35+WEnpjyGdMy0eBHDd^&70SmV-q2 z?X>L^_|1B+`jB##F#0_P=MhVln|k9Yea)yxwyHGOyJCV_htiF=uqa9SvYl-x%V*9q z>7SR2$V6IVSASxiLsOn=%&Yh40nogMK=N{Tg0|5lR?t#lmQOqgh<~uqbn_gATu2Sr zVmaiODUOQCcWD0=asv)s{x1dFOos~k(rb0c$mqLlN9RS(smuq$7VMwx2192f)MR*- znH<7uNhd0%seS($vb+7puL6ZZ0ic;RDBZ{raXu;JyqNI3#y#)%(JpjmlVSdrc5utDykwK`z6I#4s579q36Q*IHL}G$qxuH}1sWGSH(49y*0%%}ibhpAZLf~C zD<6cnLq)Qpr8})*wbkeG?z$_7F6JxQvaDLSzaK?#<-d;_tp6u(3ZKTOT~=F-9kv0# zyA%=AT?hw^bvH|Fdwz6g(H?lz`mzBlmLyD^p7x^$utArf zp5lr|u^W5hFxOn{cWCVawwV^+-2u6LZazgFs&$KAGe53j7zV7GFmuPDiIfgi#3G}8 z997ga=ZC=+2D0ErKeLPtZh;2%8P^6`uyHQPW9Al%)`6KC@hmokWQt9!wWpQwK*Rpd zQ6p+)Uhp6U-2zxZ55!Jk^8WVy4g(8VUc!Rae9>NhouKg3&OatfBaZRm>O>w}+060S zvCg6f{Y3jxl>ML+!Rjo6L#y!QeK=d%&- z;x|=HBY#jyOy%Vw_-eFwgFGf1=j1$(qxi{TU{E-SOPj38G`Z;A9>3 zIQzNau{4e#P*(yyq$L9nt{+B5 zNFJK242I5^*~3N9Fb-y&loUr#T6c<%r+`s3w5+X>TTFLl=l+RGbV8y?ax!YMc*1@n zfrsmbWbyMZ9hajJ(Y*e5lxAnH?qQB2;30ldQ(C~|J<>ZrKaV!u_z0m8VsCc=riq|% z7YSb(lY$+Skx_IU4KKi8(S^VNw)73!f)q~nUW@Tl;l&NMzdz_lmlZG<&1RtGEg5%c z9}#bSe7L}#YfdtC&Rp`2zTn}sB&^D~G;P~C*D6w6|3u67s^Zi0oMx)6lM{8Gp&l^@ zS8ne9Ns_sq6|cdLVzH+fmeQgRI#rM~yYn_3lfk(l!&IC0inQuY6$n2qur4G!@;{7E zWawJGsvX>T292gL$hDHVf4FH$G4JHRkPVLLUQ(iq?tl)#VRg{;U=Jm9-MIz~_RiF! z8wN9YwDB`?z}AxohlaS5H4<)v7kJC7%nZTtA%4ViSoEfA;OETKN|p0lhJ0abb3fp{ zstO#LTaClbU04)T4jo6Uuu{dFe%o{S6#?fyf3N_12L%z2fB=wE3%_5FnZD|qsU zIPD&Vu}pVSStgU>@H+R)E&$aFVZ{I8%FT6{wjEcODY|-DTdffi_~>*(=hd+>Yxz_= z{$figJ_bxH{4Pr5w%Yie;i|;r41^f(P)K8?FR0f{5uTIg9p!uOL5O9!$DF#?w9ZI_4{nkU_IuS`VVw zJ6r5$I^DUEg1ioz{qR)KP1r!Owy&f8@uC)ZtDq6yJuA+ z{ZGh0ZT9=aUYI*mp&cG4BNk+g8(yqdbmyl#PtpK&DVa?u0b3|L-P*YvH7VKZ#gSvvAmGge5{+cC)srBhSFgPh-MqZooNUWJtPTiob%zSo9+ zT63~$Z1%=xTR%Tp)_gieh*||1;wWCGiOU#rNc;MH*$Em&X?k;icn_DxHAOM!wHK#P zA=CR+tL3Jjhr>H{`60}#9+P$ov|AIKmP6Z@)*V2J zUsRt8!DAV6#dvGwquJg341lF>HtG}@`MweAcrb3gj2T@PQYV7lcV9t$bAn+yQ*T)( zOtk>}`DLII&2*q)DNyzm4U+-Heh_>!Z6Don)$#Jr-RhgoVxPb2t(yP^xa_htzBnHZ z@t7YfL`7)3%Gs6Z0>3?b92Z8Uk!yng9%@FLQ=qIrkTYOas>ni2T=a^pWUjVOxq%Z&WxCUS;1w9@YvKKacu zWGx|s-2Ev+&)(mY+`e@pub-5~iMbOpTM^#f!1r)9S`P--#4H?bzr9Bo!+-r=?zaX* zB<_YIwdqYinv&>h&RpL$xskl?*{4A51g?pIv1#hAN;-C$a6o}GB*%G(fU88qBWBx~smv#2V;b)|l#1fnx?x33(j2??nctuS6h!XdVf57>@GNrn%ra;=Xu|xXy7)c-rM&9n|MVs!g1Y}> ze!fK;D+mV$6ZNy3)x)q40m)5Dv)dl`j`~^((spHx(RGhy+HT4v=5lLu>Kei8FUl=- z<(@D9Y5T5|5bJ?Y(_js?sLZe3uykkklN_xuQ(BW{L*GV5S>p4-8R_?zd+>p?g{rO1dY->by#>AhyZJXe!VSDRm)Z;QSm%%hlsxYSl0bQ zh`HgI&bWxbJ!k1{JCQ6lv7BMsb;nUsYen*x<@jqNRiLgP5#j!&-m6M?4M$&hFduQs zwSE~&bBFP6=bjV1Yp&s_H!s0qeQe}ys)ExJpw-3A8Pc*3%kei};|r7UPk~zPaODfu z;@X(!NYc0|S3B_UCId?eSCa_hX`-L1KOmZ5b0JqW9f4 z(pK0x=6d8To|&uvs+w^XTw>v=O7(S*e(2YJY}$!vu?h6O~H(4Y`{2VBi*kr9azUzUhu`7_1d4Wz*wE zsd-4j6p!wj-WW6F4wRKvY<$1z%xtBEU$_c*UvgJKiDFTocI3XWp)o}LD7yD##mcJO zm;$gkgf@|nc!|UVz`l3M);Ys6AF)-B#pa#=-ScJ1g-^?&{xfRn288Y(sUP{`RiW0&hh7kSdq>QXi*ApmfExK_Rh+qh0-F& zwTLhuG#kg)<^3wcym5K^WlZ>dgnKL~j?hFn?qin1TTzu=w{`IVhEMGo%pS{&dy&1g4>ii7m-ZsTRrg|56iSvdy=nYQN@%U!}jV*YIx}q6n5vv}CVuc7Y0*rJ;)bIfYQ-xl9GU?s&7> zPJs6D_(xtcF+S^55Dqk!KX(hGAFQvSf9QfQ@D_E^)_Q)>788T@(BtPc@=VQ@^@9pf!CtMVM-gWO6U z9dP(4=<*1-cEFCS_iuCQ`V<2{2lFN(=7{AAUloG!9A(02Qa4Wq*NI^$QCkb*OT>Q1 zm%GD~IDqfaCS6RSSX3A^0D7sS%9)}+Mr5hDnuBXB<<`#S7n*k60OQ6P@LMNO5mW{g zh+Tybqn=H5a!VWXn;M!^*`Y3RIVlPOmqYy9A?!C_OKbR3MU8_Q16>}7&#u7sM~T*l zZ8|PZsZ6>BD#$?e(}43P%HZLq!JdGu)CYb{%3cqk*HPsYf1aaQ2K`UX&s#^c_8_c+ zUk+?tF11Y02bn><$Z?k?9DpMzyKt2|A=EQx>@GEk0CmzPADJ&7BAJ6oGPxcDDuOvX zP?Q)-*8|w^R<^`lG77jRlRF~w4GRHzd!*)@w*?bU$gjyXl*!p0F34`7II#L1{vJK6 z3k2Pi_o`^mGN4KEzOlHBnkg>dd2@r)mv$1j$Rt}h-lU8^eB(A;9Xv8FfYc&Y#bk9J zik=7@#zz6zI~~?3@m6ukM?jbaV;-0Q5T2V&=cUN2 ztwPX6w-tlHBqso|hv)l^Rkf=LX~V|x6`1nF|LYu{am+0*o_?Ol6$*W8nC;zt1ABTO zx^M!D)Fxq#HM&+ z9LTHqX9}@|Nf_Ce{P(%MjJfQ}L5JgfsUUEg{k^fpC@3+E9jcLYWX5e zg?ru*wjM~6rXrf-7QK%eUDcL_>2HHD3j%(I-eeMXxoO}RMsrg{mkVapm(X!G?1TH; z27X$hFnTm;;0vvvTca#t6h@OH0^bg!q)gCdgQWh0;l#QE9X z){BsNjSi%8nw1laZ*4H1@dZM&X2!1#@aIy&_9eA@%Fb-YQaF$aq&5#>C;I!Bd}LC4 z-*;AHkP4^1ssLTAi-}(fwL+oacFU?JYB0&F`AGZ@;%Ymmi9Q|gS^r(m+nd@XY?3>z*hWr{Mf`{1Psp@<3HTesKgOh73`k;iAhppg@n>Yx7~yGO5N=3HB$2|PEAGv*d&R%5d=YWt zyXDS`?qvhRQdO*TNwl_+h+91|+R=h-M+D64y2) zo_sSHH{xG50$6<~9+PA`34xXdYoiODkDwQTPUD-fjL;N#2*>Em%b>&h!G6XI89W5a zuBw0^1<_uigFbB#3_ju}lRpX3>n3$eqX%VOs#U-?M7a?NdSeVnQ}8uJV>M@gzOv2U zhw-r+Xn|kkhoXi>3Hg*aQQNrMWTW@zyet34r#(nNk!TMZtD}twY78u?WpITW|3tsW zh?j4R8PN_X4#OW6w60Lb+B!vJ;fA3`xZ)wp9};2)G0G#l`&lF?NF(a1@@I`8mha0@w+*%+;m}mXr8Z#xoKG~SRsZRnVd~d!&5LC%qK|oLRFa@S z0jfg5*8SPRg<%UffrXlvur?=H#gG*kjei5S7sxUh6w1XGz2@yBq93*q?bEHYtB=-I z`MQHQ#N;~mqXIRTQ`sG|=TpZ!i*X@{s$M*xssv(&TdB(&YB9h^Bawm#phMNimltK+ z{Dcm4SVChMetVu3a zoc-9F=m&y4pmykOHV49hz};LAj1!w*c8{6&3+q|ULa%1 zu>Ppm3n&djCn(RmrumxsdTV`AT2n`m+Y}cVuM*BRjN%5!-k*z{&T7bsT$4z z%?E(02!eNQ{c|rkGAVZIb~ZS*A8AZy8osJZ$U<*q7z22c|&)Y)yrs9 zyg*TN?1`jxOtI+Vz+dOXo6FA_h}K{7<(W&n9+T7{Um=Ox=qu3CdJWb?nk;hVMDvC? z6f9r+%q2gJ_M2#-W1gPmZd`6hbg4lC{ThgA5#IikNzb>5;rMj&;7if#3;-8-@3B%M z4CT*d|k~?X1pNKs{KA? zI*8M#HVlV>dbJL>=L;c%ejTjRjlD^ZolWaUV454ypGGGom}|uuPfjSfAqbp8dyUWy z28M%d(ZbLC=yMZ@0jWXdsQ67lSQ9b^t;1TjB%hL>vUPRPlMOn{4m?r#u9~VHWaa&l zxzDewrY4Frn&-ST?Op)6K}}eDH(GVanp-NJxj(qWpbN4;BG8bU|79Y6!dOMlkKSTV z9Goz8l44kop&u_z5$-lVjJm)&cs$orV2qs~40^I)+Z6Bp9wbuzHoR!?mQ2234HY@R zX#Hx;I=~b{RI9RSQe76VUyblv0=K6?#H)l*EbA!y=2Pt&z66X}9-n84NQ1%Y*C~h$ zv_oAExI8PhVgyjti$N_+G1GMtBGx1U>PaHNy!zSTo|}PsV6!UuQKgGkxBzWxg^biB z;ex%aJvHEZtU|tCIJxQaI#LJl4tcPf8yK7C9yRdnaQEJAQe>>~-&We>po+mmlg+5c9n!Eb!n?lP=7&?b^L-b>SUZIa zY8IQp2Ew=T$(AHA`dd!Di5bH~3l;3yhvX&ZQV;d;tTS8g5H<5`ZuDI0MrBMv2LD4n zBm6^Mo-{#ER)1sL0Q(if`RYM_0~x8>qL26iy<52~8SJ@V39rfHpo{UYlc`#EdlXbl zGaU7)IT3B+CUAff<)jRNsm-!pUkn zbuiK}==sfV<4^&ZZFm_8+ZJ@kUU;3E^dLr5k4C6YCJOB!5$PG+W0bXF6o*1I%x)A- zYQf8KbORA;^1?F(+tSZOj9x;~mWUfQ{ca_g-GEDP@$g!i#{Ci5RgdN|vDR*eyFVLI0OZ`(opjqxU z=H%`V9m`TS;!Gvajvf+Nyjq4Rmp)_itk>*mcBWrPjhjE=P{2n6bACqceJ!{ng}rNf z9AHz%rndt*p<%8@@l)=h2iKf$h+Hu3T9^U8-MJ$y-*3I>E<~MD7TwaeTk?wdp0Xoo zcIe+i^xFc@2zW^M{XqH>`L3+LG!m%GM}(BC^B*sCug;6EB4}aqZ>8)!FnU)qQP&c?hf4l^=)p=&+j>! zLq3)K1Vd7KpBPGH_DT!GV{^CA!RBB|?`ohct_^=4pr#qM#%@KN8UFyrjkoHD5?<9t zic4y>$g=momI9$K*yL)@ht!M}>%u}f8UfcDAx=HD+7G9et7Smh&kWk5U=CBrnSn@e zszd|uXyadfzEK_sGo2hH1)bbzWq0>hsZH#fiY%Gtz%#p-Ae0_=yu5ZdX``82x64{fF6MUyv z1u2q_lsv+X$a(s7VzKp?7nMnVZ@(&-L}OM3b-QBk?Es0R%`VMD;$FuTdo;JsB*q3kJ!gPBQQ+_=k@xW(Iufux0WSF>$vq3mgRT$vDq!j?aN!O4X{I_} zXlSW}?J=TTBTo?x*j&BhKeVz;v&C>z2dQ!^xwp8s!j@g_Vb_4ARRdE78=@L(u^sP@ zNXK}7)Z-NfMd(z6>lgaCg2ZS`eju^4>MVpHI-!)dw+ zPzCG%455CYONg5{-ISy)M^+2@lYn}(QH4U5d6h~(E6))fKs7C_ zlzPg=-rmQgdUqr?5aksXETqMGbFByH^LM`Wj$yJa5&B-RD@I>nO?;Rwk)MAqEi7wV zYp1NNtQSEwqFk>-zrhI89~;_JF?^H~U~^#PD;GiJPLd~X>#liz62v+5v=0}Rxh(Wu z2;)HZGcKBN6)I=#`W2qh6z$Mb;w6x4)X%}E1G}XOuW%gXGZJ7pvTi4o_pEdFT%u@*J}d zUBBN(U>>^_xD@5Fjr^RSXd~^8USwo=^Lwwbu_&7d{w^$U>MW1zW8S2cF z5(=lcK;y3oHq0TC@ft)cQykPz20z?Llm_d$snR!-ErN-Ks-pJg+hUX09TVAMBX4vN z_fE4)*Lqke2H>YwTZ)@++xr=^_~%3UE2OUNOt#TZ!lKTW=%J;8xtlAOdiryyPok@0 zcD^&^tT4o_XW@SaS0wg<9`oOTDrWFOzquXlRd$ejcOuAn*N5VJoV*b?fSeS{4$s$A z#MGGvqdO?XHx%FPo=t8t0b*sTaP7$ONFM1-lo(1%Oc|amj5)=VDV~IgA`qV_-w}ct z1tKkrU8{FfCgf%)eldbvt3qt1>qF4Z7}Wuvz}(t<4p@QH6L0+R=8KHP-&csDh7qgG z+x+A~7v=Ii0^;;H;_r5ZV6G@bZd6!<^zrKFQL1!;58>(ClSdPmiBE|dEOYI`p zVlXn(>D5d8=rO*FH&^`J6*5YsZ!gyQdHESkzLU&5TFaGO)(VCMH!ggf$ZwsAy6{ut zc72MAf_z%$6lPJs33f=17E&;~W~7h}DFa_sC<~7G;A-0-kwU1DLf-nhT*#$if?$bT zqEP>){BsRw(R{I-KuZbwgOZ%Gh3Ot-A+um30UH`ptSSsrFomxs{q1aWpU_TR4pEci z`<6${Q6nS%IC*kXmCMhDrDpFKNGrhliWJ14h6jsc?O45<1qC!G0j*}UaKc`68l6zX zRH<>ftZWcJ86L(rQdg5`n52oS*>Zhjn~XOoge8(a62$tEqD}h@EI#h=W0n|;tBYe` zky8>)OGJOc4IRlZ7~`g*SZV!*H@`S55zz;O!-TgNg8Wu;WbN8(*pdoAxu@81`JoSj zVMsK!hE7lMSbILXhER0nlEqK3*;J9Wr=AWjBY%i4d*N)5Lya+YPe5W0{ZRuHYgi z!_kGdAeD~$6}mG&I8gfQ7AG0Bq-=yMN|&=@k;^MlRNrRZ z!aeW|4ON@X$$2r~tbB?%Koea42|Q~FN;h-2iBuY?Z*))laYtv* zu9~M4E5y;|D~j$Qm>|LDSVFQ_nD9CpM9_YWGyH+UC#B zx-8HZI^rx_3O>zBIALP^+VSLlhWO5$!a^3qAM)d}wj)Wb6LH$>pC#~={BxLcJvzyU zOH-P^`%6shsXq?jPS$q9uB3Jgv>=_B%gjGggGLfpLQpt)GZhz0Aw2 zXoDnq9boHNTBogXmzhNnvB56}ZQdRm3Q2rCMuIsQb&Rkd%xgxxL7TQfK*gKv@bqic}qabo)Q zXMxX*kXj~^H_UJ_CcGfTw!=Z!@kQdoY7gvFMO%aQ@QZ_A=Hj_4e537PckVk=U`TU~ zu-XOOsYlm(5$ZJwgiYf~(HSZr3gzhfKem-V3j!K|iAmSuk+rxe>~5}(PnV1c?DdGu zr4F}KMtNwl5T$y_@*+`I`h%a*rktqm%+=^z#WW@$MA+gJWRT6kMO1;P*F9<}6AarZ z6ouaARMDS5;;E~1)iLNbsqQG$83M!>9|G2wAcrtwF#Fpq1XP~C2i5~A%$EGl*7z1w z-ZD6;=iwsIly`YhLtha0E6xgtrEcSZ?J3Zw4>_t#2oMWxPRO#(iTe@lD~WPpj>MBx zAzM?vQ$e9&DClY{2s<_KY64fiK=pM8_zmf{fKl7G$Wnw8q;XN9%bKk zjMc8--rtu_ah6};2pCrGrtYu*O1Ct5Dn%RgK~WZF@*474mZ2~NW?DANv_ze31|hZz z0`7suZ!9@c*kPxi-`v(*#r$IfPz2|kpJzU|Wc~=aEais#*DCr% z@c#iS`M!Vo!|_sq0eW7|UCFv_4QzLlEuep{KJZgtp?yXkE4Z~3+QTPL{rE~9eVGpm z@q~*{Un>WrTH3Y8(h{Vsx*2D>I6o2@*iehu>Gu*TXH9Du@9VpN1Wt&Nu^n{5{k%(f zH6_HAdbK?NCphw(a7ABOU$`YAv14Dza|usqbMAgd;Oh0Z>EGRsPVxSG!*h8u`EN+5 zJ~oHfRrecMZLrU8-l&m?3GyjA9@a(nM_YwC9Yr`+uzybTB;We-2j*CFdn_J z;NRH%4fv$il;F_*p+!CGt!+zsAq(Jv4)&d@+ zsAo7kcr}-FGIoP;q*R^__o<<7{@La_e0n-4vt;5uB!Neq=G@he*gSl^SXQ&TRclKT zmpkTx+vbGp(&)&*$Ap6aK_hm&v~wocoQj?;DPj63#5x>ad17tdg>p)Z>+Z?mL>l`tkOB`O1X|idvcTDe3e?d@4QCqzRP;=gncWHh(Ibbx+4m% z9o@{|-E5Pm9F;&Yl&U8*P;T#`B>k~z+Q2n zGtkrHGCe$PZN)t;s?-{|T4VL+g-2W=5@9AK#(yFtf|T~pQLzR&xK5i=N%G8{wx0os zLm|l^Fh>s$Q3wDM3O9?MFX|L7z!CHXnB)rtp)Y{36>x0IwF3vRlQMP2L5|s)_JEha`Ib#*qj2+R+iMA9!rJG~H_YA}9ZRuVP1Q zsJTI*h=K7=NgO%22Durx$hrjTj;*pE|Z{N>l<4*9}V;jGLo|#&NUDsdE-H7PBXgEJceNNA*nW+BY?rguv z2bz9mpyHLP%{=hIl`T9|=)Kh5MPts#c9ds(mm6hf-h_@RJjN$$pYIS!Ir}P1Z z>)8>|w8D=ez2tJ%xpFgMg6Lt>7o5R;o)qgM!ZbmHJ)LsYx#0Zc>hk2l=-Q%? zq>=8w%{Ij-znJNDvD~j059qaD{aaczpaAi!P*58YQODJteQo>ZR=1%b`NSs6*kY*re;q%`Pn!&gx_p z7Wp_9bG`S+2w0!6G}oPP*2J{E-=jHwzMhWBCeZ@qz-leCxtfLvKq?_Al-*TGIszqW zoC+Bh^bIGi3r2iekD!dq%MaJzxeg_ZM>;ZNAE0sq86pkBI$2gI;gT8~;ygF(MnS0^ z9BdtBpgl1UoE``DI3xms-Wo7EEF_c%mo0D%dn(0kOUOJ7b=qIo)Civ-Qsc(Pmf^?d zgYBY6`~6uTrMBkD66169Q&S!JYo+#@)NBd=?#2Trxp`c7k}+{)^7lU7;l;2jbGP~G zMjl8e{}1nSWJz0aK0NSrWKVhOh=nzGVlJAh*jx|H3KY_0y<7lV*HT2Y zPpbxaS_lMb(zj+IjuY23O-SPt|fltXUr2A|UkcYHduosJYz_XRPEMF?}R3Bqi!@wN{Ana~IXn?QV5RCb$+aJeGjv^QP-6v|Mhva>!>WYSWi;gLyH;3aJD zCPy&S_BeZedAFR73;?sYAL#1uiNS z7*}x{WjQeh+E-$AB%5{a9>C0|>hU$8TUf{K+^sB80-Wi_&pA)xP3W9lTF=+SnUNRH zri1f6SDtpY%QUs)0bN2oEz4Ju-fL-_cPlYs%1G|lqG5dIR!e81-fKzsyNk_C@6#mg z1OErxIMMO9*n^tXt13P9-=o6lrmDvVD;^?UmK-H?U%LL?>cRHQ=z%j~*Ui3xfNH%Y zbBaCXi2DVuDjC7=11OXo(LPM9$|by&u6GlT?M#%38D~i_Xul{9^%T;rRquOnGO$Z1 z?$qI)){Ol;t;dS#t&)NyK~J1J;1CYeP}Z`pd+!Q2nqb&#kK%VkO-p-84@z2}+Ods; z9tt@*cj{ZLE2Q8RyOCmuzH8f)RpU$;h23ELi^<1+GW6wP34DWzFsiaEzTu0>2 zRCR0@CO8n$Hji7{{2DHinCPmqSaEK|^}&e8ZidfDN~~Lyi5xF=1bCpQX=KEAFgBYj zj;R+KOQ&QDjk5Aer=i~5?t1>5MD_UqhvId`sMX{kTEHhvNa<^|w}Nac#<`9db8&7H z23CfFGHV!Uqf822`$Opk)`MIU8Rn4u#UUywK{pRIEzT!JhELXp*J~ z#Y+z3EP0BZzi{c$Jw+&8qs3ycn(d&&as05wW980}d5ecrajUVExdiBxD|w`>KI-`! ziLJ_r?uV`Vl5$VP@c z2p@%o*Wss4c&sOqFP9dodS~`e6o$=!%ZllsR%LI;^W{9CpF znOHa;M`Ly`%x@I`$C|+sZ7Wuu-kvcoQhZKoHfnBmT1Gr=d78&I!81~O`ELu;*S*8^ zadEkE7veRvG!-6%>~*qsy9gak`uCDHLg&4KhFiQ8D~)tD|#BxH+L?7lX7`D83ShPB&9$@+VvMhHo(jP zm049Z-Xl;KEEdt&U%Jhejn{s-lEWQE=EO>_J&c)b0XYS5bs&6;ZR^J-uum zdWy=<{I#mf%!JL4WrfCEAY>>F(5JB^jY715Ke_yCok4J*cRBV)@nB5}{=WfrZfjfa zgnt$Z0#GyRcjWoGK>83__QZso4ieS_5hLgBTT z@I%EV0Vg&Lmg3wD-Cq?DGrRZuugyrvm)`=HJfHFQusk3$9F9lz%?39^jPhMOJ2GmI zwZRoBPz8R=ZSUMmmLm}nmsf%_dYR=>C)m5BCtszwHDL8bV@IuuUTr?K((6%e_bZfF1^IvK|O5nyK< zh6%H|BtJxLolI%B6yEy1#qBX9w=(E|(e@OCs8ar2dPzD;IPSpX%-uLpyVpJdeUj`t zKP$3SDSh@WPB*GCv^a*KprjO%d|wo);LbCxn>pkHGBi47GL1n*2q>tJO}zW7Gt23I zrz2m+lx*?}MCrq?VMH2BI7TY4S0@8*IB7lvLQsX^oEZ{TO9bwkSXZ=gfb>Db-VPzd zKj@M@{JDkZ+6j{8I|D6qJmvj8kQN6XQJ1F|E@Gj^Jcv(26-H~pFL(M+BaZg}EMcm8s-HASv z*ZO*!N=%!Vxr#J~P8Ur+69(g5cf-r7+??w8z)8EF_m?>6pmD6}6s~1sogU$eKuPVJ z`F(6x6igK@DN4hQzGH+AiwuYRbnX4L_aBOm2JZ+0jvr3?r}OVNPdZX&;tgmEa?F3s z6yEqY>sv}-KRGeuN^R*X?=`T}u&X)$*tRAH?9(w8=<1kF<~kLu1c!Uafn> z5`7~yU3B~wu3R&Ya-x(Xu8}|K_MEQEe0eb6#FymNfV@YuF;WFjw8?_aYRQ)sD75!M zV}n@p-ho-lGvTwBCB3d1;*#gn)R0qR%8nQJX63exnQ4bpBe+CR!)lQs3V{?s9WmBD zRK`@v>b;!vq@bM=8+-}5Qtmz0(k7rlfo}>y)TJV@0?XH0bh-JX;!F%MV>wY(%d856 zV&0(2YHV{6o6jhnSLvjQZqO!9+CQvNuwIAD$E?+KGym07{i>e2&6bWwr&G>{+*#c=;LO|Ts%lz{7CW5#R{|c-%Icu?%IbUVi!_ZIo`0T9Y72A=#oXw+Y z<=>J-GtZ^$4F7~Y@ZrXpI>TjGDJ@{(#rgRpPrD)f-ngQN_(svO10`i%t0SO6+p5*} zsyolyJJ}q*#U9YIfaiZ?XvUAdsj<}3||J))?2&`p_McGO9{7g!c513E4p;n<&d`;Uqk7Q7oz zst@*7ZpID)k}@5gz9IJ9ZtN=BH+@&rG&9FOI(lxd|={&%HOi6@X;d#@U;^S7o8(iMps`s8NXe_pGfe@Yjt z7rC>p^9kBiFRAPgMoveL<*%|ug6GYI(;h)edsu@wwg)$`9m8O>u+##x`AqH8mn-kX z)EFm=1xv8LSA~Q3JIgh;ts0H{VOvv0_uZjnw@-=!bCAauwAL#ICC3m8_Nzt_^&-#M;(Qj!whx+AtJSUY@3WA+)}pDug0tc)yYApYhzUKNyhtu?ZvTv4)>C(1*;fx^ch!V+b4L>huq0&G| zV`*9L7&4Gi+wG^!b4FcM1e05l_C#?0W@#`X*_r1#cYSDyJg}ii<WqbMzJuWBBMer<8zxzGN2r4Bk%vcm57FHI%u%`Z*mtKxDA z*Su|{VgcG0*wyKX{@%etgbp=5%`4sPF8jXV8myqfL|qD)4#bs05HzSIyBSy4uu}x} zfzd}ZK!`~i(Zk6j8=1(1tXR^c_i!2C+)*Pk*>TAYcwsL=Texyy$ zL!YX{nwIFfn84~>0ta(DTYQLFm>ls*VY1*gWV5ZYrP0^hxByXVS6G^boAJs}$n!dY zq9!M&Ca2czg@u3^If0|Niactzvd_mKd*cBHlq!h9>|rh1^!lPdDq(>oug?Ivd@g|4 z=v0DF?V~j*9s0G)N0#QDY$r!J*Q2wh^Z7W7F8cH3N8~F75tr^2oXy>lK@{ zANIs*8>Pgl+)g@GzKKBY?e6Aw&zIQvzrp#Co{^CelQAO9tO{U5Q?+(>pB=d_|KkY$ zLo7k%{hL_A0`~u!SkiJ;#i%ssaO$;#LHDi074F$oCf%An@*tZa%)8ks$m2aE=ls=N z^=GGkZFYx;*WQ(TIHU{8`K7?7ax2P0UNO=OlV#&{AK1w}?uK_;R~+!G?vAxNhim|Y@fymLF~6CViTu*Y<&0tH z!vF4espTl*^z|QdSv1z1!{*wqX^Lmy6>o_O_Tm^nKCY| z+U3O2nNNiT;}mKG82~!dZC$qplu}%awzyN=p}4y{6qi6LZlOXc?!m2i z@ZcIsad)@k?oJ@wu-1Ck-uIln&)q-HkNa~bGnsRaF~=wG_`di3qE%BOt96a9)=+YC z`|kjj8Nn$dJ%)v{oMJ0-wBObyx61n3MjQ7Ca_(YPE$u^jEwX08^}{gN8$X|`*#?Xr zLU*O~7WaW`*E#O*j!t`OOcKfej=6r@TFYyniN$&%W7s3Ni7U#M7iMgQO_#uGAmA|A z;FQMM$hzbKObQoht$BMAZ69OR0ypYyWBwb5xu3P@>-)b@65thfDPfz`66jBq1j@Br zE4ZAyD%(8381im1qLeB^@*!s#?0h=UoycFG+{BZrYmviS4LYCV&&I zPlCj9t|D$-XQoE}RN>!~>G#wdxM^!MUNEr~rKX|4&p<*dysZm&wiXzC ztP5w_0hKJ|hlbT>CXq6q;ZrJn5lirPht3@u7Q1Z&)Xndnb@eDx0bMj*9Wp3^v}>WF zBZYQidi+JlsD3hbamfFQbQC`SgAvul&`pJBZ>}XFZ;k(NBBM3N#DCT}E2uuK60jfQ zzIJ`8s^W*duYm=0zBdm=I`w9{n$SA?J@?R5AI;2}pAix-*qFCtvh@#2&XNUkM}$16 zj0|P_47XDA>gz%8EqG>??R`2rlO|PLd5?J38s|%is2o13|C@XubjOffE?m?0U$P?U z4&-Tt1DMuzdTM%4Li_h_+^Bpb`I=+MWSmQfVjnpG=9Gof)pRU#?OGToa#DB6YKpx* zIv;Ny=JfW4{LR0lXS5;rz?hm^1Vhy_aZ~vEr>2ihj<#t0zeH5NGU8;xr)chuJkLDSJdPL?k*Pwhc>v zVYAqA|8lqIL$$X;;p11Yh%;CE&nT;9g0A?tuLBU8yu=gT|BC8!XJAAP#5nqX!--CL zh|9;@d#Jx2O`3HMdMU=pf`P16bWn40tpzEGxuqNtw0R(1l9^=LN%@;~A;E$S1nRwG z)QbIB8Y!9k`M)T|839?qg-Dj`hIc9j4TT28e~QCZ>(h`#G&gzCYWklgrth(-k7jjc zvVA=C)=UgKemq|A=Rn+@d2tQJWTJH$yX*5o>be>EuiT!ZgZ<7@Uk!D{S! ziDLt1rkvT2{TD9fG0&|M#v7N;CaMhGF4R`ozH;UGvqX-LY%EuBKzG;rYuz$1z9+I zoLuTN=_KHPC?@M^`sp(K)0ESFla)=Nu&b>1_F6$TB9^!meZssc2r2enP)h*8Jf&l4&*~#*_+`*Rf(_`MgSvUUZ7@oBIt%Wrjy6|Spt824g{ z*LRDD`bq zUfW29TdPB`(sCVF+&yK(^bHJ0{BMQ7bLV$njP_!3{5qGog;0G4bei)}&V`}0p?!#h z_n~u}pw*(=xfcxfoO`SJD5I^h7NdB~?7i2HFA!9%8=UOh@VG$bUqUG@9`ZOR%+@Nk zQ%o=FHrC?%fh}*EF|u0@LYo(Up`E=9L#GLaifF~_h_CJy5UpaT#G_YqEA&ymoWnG} z+T0kK_3&U7#McT!HIoxlHU?hD^i?Ga5Op1?ubj5t5sy< ztLbvJqBmnxchwCti%4A{9bAPOPY5i4&44aVWHaGrV>f)veeE_{{PNCY)ppeP#A8X( zPM#xibeP-0Zp^239#TUS2^1uW%41ALu*;76?mObfV*pxJ`dFotrLB|%&Rz-RYP6nb zA2{VbMY|41Q8pOPH&gR|JXI%`Ad;q}VL}sMFsrQx)N(9hZuy^}82Q4=3U!DHdyUax z`WVgW#*APvK1tZg?aD9B!m$-L8Mo{TP9%M+@RqGfr=x-mFyXxqJz@Onzv3KOpZZ)_ z7-3f$;$hYIZz)SwZc1MLLmr|?)0)vv%$C3Cih2A~$S9T{fi$m|`?hA(*&3yBk(vGX z-y|m)9Qfxc1X3O*Ev^-5mK*gMnDs3a9?Jg}QPC3ASrV+V1~Y!tj8)-%M4|pqtp>0E zr1J1Oky~~*#{E!uy$G})ly89+L=>fw`{iB^HL)*URfxu@w!QKfU0TdunWl{Wcu-Um z0n920u^aY3&>_jcJe-v+qUK&XSoilASjI0a@W|lG@ZLQL`!o|<8yM0eRmI%JYwf5xOFhZyNs%=c?tnwO!%$$uKwcn2q zI3>WD7_DBF5M;YM8VEr&aLpa{>;k^8CIdECq_(wdN*-ja=d>+>a$g-|6MRM676)ey zBhg#OaK4nnc{V>~Y*jTjFf&=gK*dg6Z5;r!_L%6R<|U|mNXSRp@EhiYXx*I#Y?^%8w1#dg#v~3j7v!zH7V!k z8#7NEc}JO*fpF3M>^T*boF2L>BQ+MN?+3rCO~sk~6Bc=UF)4ngvZZ8Ib>dW3pZWU( zFZZ3_=EpIFuG06(<)QG3xj_4q5_Q`<9Q_4gz1Ldb-cw<#)IvPL69LxSHZQHBt5y3h zvX?9|P+hdeW?=>Tel;bL1w>`Z(p{y|jjYvSR!Iy>h9eh(^5r-BKl7HoVSfBuLKP?6 zkM22N zEhrO_}180B>Gel}D)YF&x#f`=q7{W2Dmy)lD5Zlb2Wq^)A+`ji72x96lvU{cbh|QE}Fc(6v4jnqgZ!z zop?Qk(x^inS`&zcS-U$h?PgKT{9zmSV5nC0x+6XNutE0UlzzLTm0AqRO_Qov9$9g3LJ`enp$-eb>4EnN-mWa zMWt-$$Le=d5&F1c?3!zg_ZyCz$n(v@6sHj6S*$$TPZ`YP2MNTqzW3T$q}qW~?JVNP zY2VTgYOFk+G+kf-Zu^T;-tNq#!1+JSAUNe8QLxcmg5yFvlhN@99hB2VWWDIJ=1K8z zBf@Tmjo7!zs9u=Fm6f38boIlNYk*33z{FKtrM%6|lk&jV$3OKHVR$>2rxxlw@)49S zBpg(N*l$E~dKHK$HM}ROQ(eD#h!El9WfxO(#CL`5DoA?8&TvDojmdKL0@}$?IOeTW zVP&dn5E}+oEhap3zXIZ7gSs_0S64&UfcJ=-6S0%ef}D7nljd3TrsBT~#FI67eYMu- z`Rf2w!DQS7-Rd*Xp|G+}DN6bSh=>dhDg75GYA{_rAXq!Np|%5*lRAcBIPa~><2 z{kZN{#iT_N=|+*M(ypD{VZ7Qd(ljdi46JCBt0%623yPPe(2+o>RsFAP%jK|LOZ=k> z_dgYv+x@DU&bZExvs{zmLC?{>;O2z_*k(cu$~&VdGXLr6jz7iaNYJ_do48!~hjIX2 zDw*Vil3bJw_s@;zxp}yW-{)M-l5KFmxW>u-?%Ws^Reh3x)$z)VkqwX?Y~0-TxRBC z(7o9VxMbOm#(C}I=OT&c7R@%M(Gw(|?GfK}2$y;8lT-QZ$iibf08{>TUV%l{e2vCL zUUu{42#`=Q(M?284YBX?VJjY%K)T5z-{flpi{lTaD_y+nb6e^*lp8PlLv>F&c?Po< zkYzpU;(567!pY{L_-;Jn#HJrF1xr#I!{_DucxJ*HCfcFf0XGafY8f8HQv1Ty8SnjU zEJ_cK?mskiYeI&!Yc*POmg}Twhn@V4k(rhlBeNx)>eib&FC-WtBsM9{DDhk%_{AWl zH+nwcB|EIkVR~c_&5$XL)Gfh^04zhKD!C+eo0js-p78nist)2&ZpLvlboD$yF*;|4 z;q??J7c(s@YW-onh?zPl8is?pTPO<}C6!}mAjBYV{JmXsA4!6}a`{IcW#C>=&lu(O(!FJF z0hnb$U6x-^Lk&#dC`l}e&`!gU#35zf2qE}F<&h}e5I|1(f^#H$H}%f{1Ez6KMar-V z+xukbb~qMU&}poi6+?7XKq338!Y9YOF0VqdvS~)4@&td=d{d|}kEG;dl2;RoWO+&9 zk1GnO8u@+T8>uc-xX*=l6k4Y)5}Ay^ie!_o|0mhInM9Vq^*F-Ow56_AVidkWn%f@9 z@pbO<+15$*m(0OeOcnW!yWnkMt3%|CDFv@J)j^Dw{ES^WJ`@IZu5CP#n$I7Y0LE$b zOat0E>*f9j*}HN>q0UmtvfJ+8Iu`N*A((VShIuC>?9Iu+lW%Dx8N{~iaHZG^04bi| z{hk*qZDAGET@5(ArMY5Q+g|coa@cU3>$r2II?UuHiOkGV+}5W#^L}wZO~+TIa9MRjrF+q0c;(*>Z$%}#}it9L}Q>B<OAc`>kr*)% z@k&^Z>o-VguO>qeHexJ}(t9uxEv00G%0H8QY|d^KkB^u|(Npv3CuwOq5STn&J4W=_*KSczgqTbZ?_k5uf(TwX=GroAv=*eY!M%Op(*yjzxJlmTAtYvf0o~o@dZ9wnnTd)qajc%gNodhS%KWSUQn%&YzpC(XuMJ3+k#T$>OQK zmnj9EQnsqw_gJJzL&NahNGv=$UlpE&1W3+g4AS7tK$xn43I~VNUqbR&zL5?nw>OX* z48eq*u5bMmhMJ^%HPl)%&Rbs-+|VgFXMYRHAKjhW<~}cWQmxbvA*mVK!81QxXU^l8 z^Fl%u6^~Jxbr1<@KqljGlrA=U3)spx1Cj4c4HU3qvHN&@du4D@kVNWr@at9n_Qx!r zeW%-vWRM_-K%{SR-_KxS&PnDucPeY7;2cR@7DBwWQWKZ`W}s6zHGW{cW2Dak@Pz00q({V zZ#H$xX7hl8yxR#`Pf>(Ue;sL0urjBdZ9`LPb0ByUZFCg7WAEzSmExQxxa&s4ISDn8 z*iA4(OZgpp1M=r|qMmVHA!`@uvDLZkhOk?+<^(;F2OYk$)txx5+-#c91;V`Z+=?(d z<|kW75D{+biPvJ{SW5JhFC}9#p<{h+XqY&yL1ksCPDcz$ciz`!%}jBcw%IRtdv-PP zxIpP>=A!opC!}SW8@)l$CNU(l;9Qvax?3&OQWmF`s(5uacvaynw5{SK-iCLPqm(tg zMQkYDs?itMKx zjwW|^A%^euH!x<6gC_smpYKLjN&^qk?%p4)EU{TS_CJ{w;y5m07Z#i-+M=_hmNpS+ z+NkW>*!Q^opk8=-7Ez7qLs6rYJ&`DL;5HyPjDJqnehgG%S4n5?%AG!-XaYi39qrVSF@6tNMSkh-IF3ZX>y`O<1=*$sc|7_lbDw~hj zD#zwo`q}doc?>lLMqbnj5ym{^9FBhuz#glm++GAAb<$=W6BH$H86?GFeSaPD@sTbe*Ga~-p{57sO_ zT^*ZrnkDsf*t}L+0-j5zgy{Kwy#|G7zx1*+--_SD^3?39 zP`xQAWOBYIFtFr7@3qTBh7O`-5&q3r9fy0GLBBh%oM(U2emnM^*C~0l-@xFZEhb%S zbSx2azIJV3bw1&Ae;bV*i2q#)tcc!|^z204N z%y+}w&|xH2EpsaePL2Pd`p#S(=4Gk*JJ91sq>`)jvZ{=t#4*yv!xtK$i!ngNQ@3s& z8ky+C>hGp|y0|lgZnx;vx$`Wa?x6C8FvSbt&oV>UcY(=Y!yJey$N6EA&ko)|loxUH z-AyQ%x4c{+!>;#en^NhYXTJ1ub#OO`4-&4oUOk|KVeH>+r+Anck}Y|vE^S<-n(;%= zBbh{mCG;&j+3Vew(kHTON}VMcT~^i=5{8VMd}(HqH({S8)u-c!2fnLF8P<6(ugpj+ zC&cWTfb3rS9FE8fiux|k9M;_WZT*}*w0@aXpZ_b7kZzKpPP4|%mX~tKSfI&v$~p9U z9&&W_v`B~SM>z3#+~I*QYEPZldGAb7@b<4{B7h+Goa=U855L37E>nwP-ADVaO_O3l zx3ZTH?Q8Vw@~*_$_yTSKi3`8RTZ+mWN$R}?7u9hz$CwG9&3@m#D}G~$I=+kmB>mR5 zEw@4#=I+tX?svM3sU>g;yLlRMQ6ebQSA96GPHG5YXXM;G+D!p2C9BoyZwCPH@o5zVB6kRkSt zgY-oiHW15hf>T<6}l6q0(&gcmv(D*zTJp!exa_W;ShE@ z?C)ZziNl~%6GoET+hvr__OP<0X#~Q9>!zR4nDr^N$+!_Ea);Z%hP$mN7yI4HbufB6 z&J`|tFwytbK3`vwk*`$xoQEjz*WwytbvkZx1YHG4t{AX(*VoGv>b6F7kPdv5ZXaiQZ&Qbxvlb)2}XDi(E3S z{3s*686D~NiVtGlnQS@dxJF7v8-t@%WvDs~Fhs#_baEoH=PY!}?GLx2VnH(avT1tUz(&b!7YJ{7V&n8YE*nM;fH z6}B<|uw7C6XH+QY|fEx1s@QAG04;11zAMi0U*YQ0DtN{Wb zh70G{I58i6FB!m>YrGjgZ|gMX+`me{+}gVhK-0DyM~m$|JAm~vNf7_|ii<#oBc&TC zzCp~!HVTf?HYEuCVT$=X0swR~eCYu_7kD?co%6d={)N#3#P_`FN6FKQ1C*+hM5k5C z$Q(YEd|>)w`voJVQC~ttx&YpBnKCfqurSOoKG5l^s@Vl=7^ww9%YHI^t+(J;O@mQ& z+kIW?v)HnITs&pjKou#Bz-2vvhJI5{mM}`R zzABlCnl~)zR|j_Ar=Y$~JjQ28k8)p)>XzF4{5nQZoUTr{0^5GtrJR0tH-n5Tx^yKb zi?qL(S*F_@LgVV)h=NkPb-5LUDWTB_g#cS|l~SF+Jq8(vyair|{otWflk^^MeC#3~ z*OPW{uO*SNlFkb@|Fd@i9%XR93a1c8Y*<%VO*2Zhuhoq0DX3!z9kA##t$~n>S=~?c zI^e(OY}j43iebFG`?#oqUkiuLtP`@#RtS}X&c|c4x|$m>$yd%cREdYz!H>nTi?r`R zc`QAVP`efe3J1gM_a0@P_m`)6M<(~DBVYL!#Th5SCb5CvSkWUxl;oA=dxq_vSDU=B z%gE19#EHczOTSvp{~CXTZnr~b^5hXcD5~=#6)(|Unau5E%jHQClRE_;&|&N(GOz`= zkm78#ucY#R!vH6H$f(Kp!guXJX-V{M_QZamQ`uqDRpvKXErB&dtL1kht5k>efZKTsUS3Fyxl_U2s1__F>#bg= z3CAP)fg@gK!eU@qIyz1*{Bmfz|MFAlbO}?uNh#OX4_ZAk?ZN)&e5$xlcA(~yy0!+K z;}&2uW8r4NW-|XmOXc+$@$>-fXMFgk2fQJ{{cwr9yCkh)mFL3O$9fIJuOwd-w)X8) zNo=}7xoAhpWl?B5Sq7X)&;IPHb$u`Q2qXQ*BDR}?@Ge=4<$9R=)oAU?%z8!>tPfsZ zNl2wav2+3pnZULJ0D!8n+?I>SkK|wFKn%A?#>-d-B}qM?9tQXPp1%z1fn;4JZ&1MU z6Fbb?@|uM{yf4i7t3M7-R;*_1r_Efix6^r=(k+w@FF=HBcjG0f>tqi1)ObBM-7kDo ztTnNWs-0anhV1a*y#biOaQBu-g<##A3`^UEMPNfxba_K|I++CA^YFW@4<{}md})%w9wzqk(4EvNi?fG=tCw$XzKQBUTnXa3SO- z4m~QaJwP(SCz_jwHTc;x=lBmhy%~b$0f7=(8#`Naq2so5V84DYB8PQz4|7j5T?W2Ud$Bs|dTxO4=qMq)8oRs3# zZGIWt8a(c66!%yxKAP^gjhyT)@nLPT?xG)P&f%A%H$NpJkH z5x=dTMJ1uD%$kJoZTv;J$xuER3|BDT@7^KbP7fvju{m@W=m(?A?r-V8-IjM8;4Zks zF@h;yO-!6_bhzGG^(`e3Vw8QkZ+iAgeVhD#wZl%dn(yWcsykO@-?i3o?QUR+!{8jO z4OVA(m!{MX zzqzB>_Uj5O*m5N@8iN|$svyJ+ke&enbERk^WCAt3)7FR5tv;+G{OXASbHcP`VD@&7FI4ETb7(T7{E`rL0g{zD+TQvAF+gkQizEEcJH@cNKbsf zR4v2)QSUcv{V)n`rXqW3$6>GzjZr9}PP+{muMa#~T}P+p?yHiKcf-LaK_4iLv-dkr zCG5Vl<;2Z*lMR0Q-Xo!l39lcAFd;LilSW`E-^uTJytzQR%SV z+JdRNk!rI0mHO?CiB*G^q{@jaQ`rc}b-`VX32bmJzPUkLplRi+DCJ;B4xVna@BW#uW?dI^`M4vmW=EeKbq~x@KJgYgH=WD`=(Ad!ZP|^q0ECR`C2YBR*Y8;t zH2k`MPU@4IRttI*c-cF${@j=Ek9Y)R9@F&1E$?Qm@*fo3QK}(|$HK0! zuVe6H!AG3bkKRG*r^cq!)F^eDDk*;)`nZUaO@INhR({eg)i+Ci#s0qRmmiGpKLgP= zjKJR20^AjOD0Xqp)opU^j&R%R0?i5MIcu>6!3m}5T464Z#?_7fr2XBC+{yj%!I6$m z-!FDk1=@`tKYi}CWSns~=oktYOd;_ZTp}aCB$!mNr)z=9=uZ)DMieCb>DHENDa)^% zYgohilUxLRSQm|DZU{82mHjqawFm5kRV%$qcot*^lV-n3IozJR4i-ooRVKcu&X7PY z_Oq@-2QdGX?0E{%3gO8_pxbgv zWnQ&`u|sqp(Z-p?y-_y0K^_p`Q(b;A<1=54#O612kUc3))&SBvIy2hT#n*!NMxPYHnWn_S}Q_uC5d{?F0o zqC#%=D0%bn0TW=+wbFjiuF@&mj1NZc!i#Dmp=Fu7R*8y7s5z|Ouc#ci`Zko zcYt!I<9OV;^_3mPqfESae+AKDBoDzf{g0@JB=C_Cs_jDu!_V0NuMfdQqeOmu@8C_v zelOx06lT>QZe0~$f*5yBX%Z8+xKdF_`480OQS!TGf*sGkL(f=Ft7y}V^Rba1&=VV{$*Jxg1xn>N$G@PI zxRzC+pN$8x2#peWFQS*YLX525Lxu|1y-HsefrD`8YkEvgw$&)WErdmFviwgqM89u= zdnijS58CNRfFh$r6tgK*r}6K8re1P2DGb!BdGP-@qNzNccv{& zz{s1TbWEWdURlgaC$T$fFy6x#B~-CNc$V%QwZyuFjPbM#b4ahY`+Dbeb}es;TgF2| z+-TP;Ey$I(Y(ys+PgBDLY_l+{Esl`nCL?3xzR^Ove#KUSk{^*3^#x`06K8?25O*Zh z+WeAIvQCP~LSK;6R1OEw8PqT=f*0m~_WrYWX=hrtHn#0XU+lH5G|DTRH*4(TIQ2o0 zljq-b@twu68#$kWWRd1dZRyywwU$E_Z-b-^D?`v}*Xb>V&t{$PXjZ6#Ztl=t)c*(y z)rRm^BC#qoC4Eosh<*uO0?%MROyKmIqB+MvdTQmkWo6KhDp2vj-PqHJ{P z6P3WA+A?+L!OIjmOEQ*BlrtXH=$U)^Jw1gx3d@{e#i5+jUA>}b`~Vt|<@@rXPTecf zIFW;{n=RYS(;mKM!+_*C3iV2~hfArZ8jccyrpGx>Qs2#S^<`*H63o$SLrmT%k*0y- zY9`RQGi<4<=#Sq}GBB~uB#rauv9ig>dE<_@%fQ=>O<~mGquA2m1ixn0_AE)7ae0Gl z*|A>P*d|+ms|+HeeTTY=qw;LCFBViUS7VzV++`C=*8byV>sj$Dszrg>)LHLG^)-Px zSUZQaEZYi5%al?neeU+8>f`&tlgS`nYyh@QagvNHR?QuSl9m;ner28>>f{UqrTvFQ zP-u$=NDsAl9?xu4PUBV=?HK||dqgj1SQ-3UO?&Q&aV}?#^gYO8qYHIEE5B9Riv83) zsYmvMv;G^mmt3j_rn`*}+4*YPD_8ZoUz2l2QO}!myWVQQk+i~G8;MO^cW9^>bii~> z8Yh#c&x()8ah^NvPo<4^d6|fnFyO1lAzDVDn9t&p8Fz63NR$#h~9iE4Z9lE;nCJ1xS3oyU}NC2h$npkbgqs{sY zU)^}fn@F!bJ(=ab<%>wySF%YbELl9C*?chT`P-{^I}RGLKezNxDrJ$&!j?H zc#W_J&nTn#p2DiXez1#2zSOY3x83iRp_luuwur%c^o=!RGh9tCK4r&V!0O?HO!_8> zP2L5=*dFQ_8O7T?GQ?;9p`ivRjwVLO^b2R zz)=zSiOl0-Td_kKMjpGQrORx~>U!AoTvwY%HB&z2uupH^HjsP05ey?NMK z0P~INe#Q>P(Kn)$mM)4*j2OegMGFlmi)bdJzt5<>_{eA-H?kAv$*vFP+Yxu*)e}`L zALKaZ1E4}gBg{2(FQu?XelIoQ!j?a7o(pofc{jY??I0{AI$WyeOkT5w& z^OkTj?$p$G#9K5kBQI~RS)oM=d9mqXBCeJhC$iV)%Mmv)X<$s1%&#U=9?RT~e@P#7=vi zz}%b1#%BZ7d z5tg3BEK`emPWzR(;oH+;F6TF#Sp}BB#n+|I#O*DkSgdm&FaMkA^j|mk*rL z>a^`ziEqlC75h1lk%8*GO!s_R79~!5RHEkH2U)_76|5hr$T;P^7cwOCkM5HzSB=P= zyecC6LG5Hym6__;w3W5DTcrkeCM=_#dHu2k3>SKx({Ycy+j5F4roA;$uFGpUxN$!6 ze9f?~`WnF@b!(-LVRayMZ=V}OBhac+SV$kLxbi-I8xJwMSe|fUP@H;CRxvw+NlM&l znD9Cs_f!OP4UK`QtfmOpv2NEB9ci+ZJ*J7@x0@E0&WtK?xpF}D=Kk)?#dH~DS%j&k zl_=(7FiDD=uw4nul4b|-*3iKWFbXx9t9qS51*xAD*B2@v`g zn-WsjBj@P+?GFbE9d3`*m&!?EQ`yLWMP`v1(dZ??Mxc0AL2aoepi?=86w2qgLC4|Y zI-~d=6%ccs_(Cqr4a{fmX2C7^1`a`ZP3PYJ`;?qiGlz1uxk~vD&h5oO6X8Fj}$f}B&Z_B@TuxS03Tpuvv|c7 z*(8}#F|68sw+_jWiJSV{Re3uXlrGZHhCq^~u$fgdu%;hfJis78EKd)t(>yppq((TK z@&t`>VnJ?=va^>8@4Z$#lGNTHmL?^>L!*09#L9rsICF%>(cOWiCBhD8MRA7raQQIC z!PZLxu*?W>sK?#`#M0^i^5s(m)B5i({_y45gQ}B~*7o>lF8dd~S-SNNh2Zp^{Yw1t z626{ZJN^&K7kZLXWCQ1Nqy*n2vGo^$)#G?Gl6lsn*XRA8X#Vo}!vuK5+!m6!>Yd@M z1RqMCqmEay29))6A0#s~Ck#*qj%p`?YxB~PJ_3iMJ6&R2(0`S z9fTqPYt`HT790>l@y^M6f+Bemcng6t)Rqel`-(GjFDT@3>NN~>l;5}LdG6Z!!4&eSZk=d_9~1(EE30zT{6`u`XT@+2%sJ$WuV_ZZaOZe;;0*N`c(AWYukXU zM%t&X9k$=b*)1+@)urdQY~w)G1)N_pszP2M$6tT_Wcd7zyG7KE^rWha{l|~ghs$Di zrZzNVDe+$fOUCDb0hD&zvc$E*OntUEUWZVuHUIhBGSGW1sG_EbvbvQ$?vewIvy}*) zTqM{5Q5tF7l=ggl6t&vYRR^*Y+_U%j%gM@&t7Y20PSwnO zF_pZnlgTzJ8*wHJ;#rP9HGNfF&Z_zxp`Bn$_4TZZqNuN71Ff8?-)h z2@5~XLM7P$jHX8&jB#lNaI5;9F1*sEj|FWlG1ID1PjVgAG|AhD6yPXf8RJ3L7c($$ z{d1zC_`06o_4imbuGL_EI|<|EK8J(ekRQFjqlO3y??zJ=B4$VIkFaYWG_5)`+cV21 zw9-!*GyDTu93C;L$~%Q^0{h5YrzK;FzV}8LU}-^iq)v-?R?=X0Z863s?1_4_FwJ-y z1*%=E#)TM3G?S!XLk-AO6PDj5xys3a*m)K? zeX1+*o`kKMMQWxh3_QPwHYEVhp!LB%}1U2V?2IIP_9I$3MUA zf!jNiM|BaQ=_mDP|9hwbgEeui?S*7D!ZjeqPV>Ln*ax)Yotm?p`Ipo6p5A%tIj*60 z^Qw-&&h}wM3a$tVjgWgo0Qf^n77ssc1u+T#!EWKhKm5mAi~sq_IjOdac{8{Z@ee!0 zf84m{dyT$smnVQRW`AuxgFgr(q&jHAQ3n&~m|S8V#)NPqM+p9U%zZE(buS~U0PQ#3 rs@#W*s%pLsc~IH?4+H=2QTHgN#0)*LnW8ZdKbMnImMj%F{qlbRfh~?c literal 0 HcmV?d00001 From 63310a53c3995b3d3e858e5c289518363468d332 Mon Sep 17 00:00:00 2001 From: fengsh Date: Tue, 27 Feb 2024 21:04:08 -0500 Subject: [PATCH 307/343] update build-pole-standalone-image.md --- docs/build-pole-standalone-image.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/build-pole-standalone-image.md b/docs/build-pole-standalone-image.md index dbf2a37c..435d7280 100644 --- a/docs/build-pole-standalone-image.md +++ b/docs/build-pole-standalone-image.md @@ -1,17 +1,18 @@ # How to build standalone pole image -1. Clone pole repository +To build a standalone Docker image for [pole](https://github.com/biocypher/pole), please follow these steps: +1. Clone the Pole repository ``` git clone https://github.com/biocypher/pole.git cd pole ``` 2. Attach volumes to container by modifying docker-compose.yml -![docker-compose.yml changes](pole-docker-compose-changes.png) -3. Run stage deploy of docker-compose.yml +![Changes in docker-compose.yml](pole-docker-compose-changes.png) +3. Run the deploy stage of docker-compose.yml ``` docker compose up deploy ``` -4. Create pole standalone docker file pole-standalone.Dockerfile +4. Create pole standalone Docker file `pole-standalone.Dockerfile`: ``` # pole-standalone.Dockerfile @@ -24,7 +25,7 @@ RUN chown -R 7474:7474 /data EXPOSE 7474 EXPOSE 7687 ``` -5. Build pole standalone image +5. Build the Pole standalone image ``` docker build -t pole-standalone:latest -f pole-standalone.Dockerfile . ``` From 00c3afe341286820c2baf2134d5b911772fc9144 Mon Sep 17 00:00:00 2001 From: fengsh27 <123769183+fengsh27@users.noreply.github.com> Date: Tue, 27 Feb 2024 21:05:19 -0500 Subject: [PATCH 308/343] Update wording in build-pole-standalone-image.md --- docs/build-pole-standalone-image.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/build-pole-standalone-image.md b/docs/build-pole-standalone-image.md index 435d7280..3f3e97c6 100644 --- a/docs/build-pole-standalone-image.md +++ b/docs/build-pole-standalone-image.md @@ -1,6 +1,6 @@ -# How to build standalone pole image +# How to build standalone Docker image for Pole -To build a standalone Docker image for [pole](https://github.com/biocypher/pole), please follow these steps: +To build a standalone Docker image for [Pole](https://github.com/biocypher/pole), please follow these steps: 1. Clone the Pole repository ``` git clone https://github.com/biocypher/pole.git From 5da2db148d2bbcbef7284015c0c9379078ef230f Mon Sep 17 00:00:00 2001 From: fengsh Date: Tue, 27 Feb 2024 21:14:55 -0500 Subject: [PATCH 309/343] remove whitespace at the end of line --- docs/build-pole-standalone-image.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/build-pole-standalone-image.md b/docs/build-pole-standalone-image.md index 435d7280..46002ea2 100644 --- a/docs/build-pole-standalone-image.md +++ b/docs/build-pole-standalone-image.md @@ -6,7 +6,7 @@ To build a standalone Docker image for [pole](https://github.com/biocypher/pole) git clone https://github.com/biocypher/pole.git cd pole ``` -2. Attach volumes to container by modifying docker-compose.yml +2. Attach volumes to container by modifying docker-compose.yml ![Changes in docker-compose.yml](pole-docker-compose-changes.png) 3. Run the deploy stage of docker-compose.yml ``` From 4ba4b7277e77b8fb4535aacbc71c13791efd4508 Mon Sep 17 00:00:00 2001 From: slobentanzer Date: Fri, 1 Mar 2024 12:03:29 +0100 Subject: [PATCH 310/343] genericise example --- docs/build-pole-standalone-image.md | 58 ++++++++++++++++++++--------- 1 file changed, 41 insertions(+), 17 deletions(-) diff --git a/docs/build-pole-standalone-image.md b/docs/build-pole-standalone-image.md index 2bf0735f..576d46af 100644 --- a/docs/build-pole-standalone-image.md +++ b/docs/build-pole-standalone-image.md @@ -1,32 +1,56 @@ -# How to build standalone Docker image for Pole +# Standalone Docker Image + +In order to build a standalone Docker image for a BioCypher KG, you only need +small modifications to the Docker image of the template. We will render the data +that ususally is stored in the `biocypher_neo4j_volume` to our local disk by +exchanging `biocypher_neo4j_volume` with a local directory, +`./biocypher_neo4j_volume`. Then, we use a Dockerfile to build an image that +contains the final database. This image can be used to deploy the database +anywhere, without the need to run the BioCypher code. This process is +demonstrated in the +[drug-interactions](https://github.com/biocypher/drug-interactions) example +repository. + +1. Clone the example repository -To build a standalone Docker image for [Pole](https://github.com/biocypher/pole), please follow these steps: -1. Clone the Pole repository -``` -git clone https://github.com/biocypher/pole.git -cd pole ``` -2. Attach volumes to container by modifying docker-compose.yml -![Changes in docker-compose.yml](pole-docker-compose-changes.png) -3. Run the deploy stage of docker-compose.yml +git clone https://github.com/biocypher/drug-interactions.git +cd drug-interactions ``` -docker compose up deploy + +2. Attach volumes to disk by modifying the docker-compose.yml. In the example +repository, we have created a dedicated compose file for the standalone image. +You can see the differences between the standard and standalone compose files +[here](https://github.com/biocypher/drug-interactions/commit/f03360c526d2ef042d2a6a4a5e2beb27608d1d76). +IMPORTANT: only run the standalone compose file once, as the data in the +`./biocypher_neo4j_volume` directory is persistent and interferes with +subsequent runs. If you want to run it again, you need to delete the +`./biocypher_neo4j_volume` directory. + +3. Run the standalone compose file. This will create the +`./biocypher_neo4j_volume` directory and store the data in it. You can stop +the container after the database has been created. + ``` -4. Create pole standalone Docker file `pole-standalone.Dockerfile`: +docker compose -f docker-compose-local-disk.yml up -d +docker compose -f docker-compose-local-disk.yml down ``` -# pole-standalone.Dockerfile -FROM neo4j:4.4-enterprise +4. Create standalone `Dockerfile` (example +[here](https://github.com/biocypher/drug-interactions/blob/main/Dockerfile)): +``` +# Dockerfile +FROM neo4j:4.4-enterprise COPY ./biocypher_neo4j_volume /data - RUN chown -R 7474:7474 /data - EXPOSE 7474 EXPOSE 7687 ``` -5. Build the Pole standalone image + +5. Build the standalone image. + ``` -docker build -t pole-standalone:latest -f pole-standalone.Dockerfile . +docker build -t drug-interactions:latest . ``` From 5a0706fb3b531f5f2b28be8466b8f85dcbf6201d Mon Sep 17 00:00:00 2001 From: slobentanzer Date: Fri, 1 Mar 2024 12:04:55 +0100 Subject: [PATCH 311/343] rename file and add to contents --- docs/contents.rst | 1 + ...build-pole-standalone-image.md => standalone-docker-image.md} | 0 2 files changed, 1 insertion(+) rename docs/{build-pole-standalone-image.md => standalone-docker-image.md} (100%) diff --git a/docs/contents.rst b/docs/contents.rst index de9a4b46..e6a0583d 100644 --- a/docs/contents.rst +++ b/docs/contents.rst @@ -12,6 +12,7 @@ tutorial tutorial-ontology tutorial-adapter + standalone-docker-image neo4j r-bioc api diff --git a/docs/build-pole-standalone-image.md b/docs/standalone-docker-image.md similarity index 100% rename from docs/build-pole-standalone-image.md rename to docs/standalone-docker-image.md From 6ab3760e21643e0ae0f55756aed8a49a860a9f22 Mon Sep 17 00:00:00 2001 From: slobentanzer Date: Fri, 1 Mar 2024 12:22:02 +0100 Subject: [PATCH 312/343] newline check? --- docs/standalone-docker-image.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/standalone-docker-image.md b/docs/standalone-docker-image.md index 576d46af..c6bf9ca5 100644 --- a/docs/standalone-docker-image.md +++ b/docs/standalone-docker-image.md @@ -54,3 +54,4 @@ EXPOSE 7687 docker build -t drug-interactions:latest . ``` +This image can be deployed anywhere, without the need to run the BioCypher code. From d4e4e34d65af7e25009f527bd837157a88af20e7 Mon Sep 17 00:00:00 2001 From: slobentanzer Date: Fri, 1 Mar 2024 14:17:09 +0100 Subject: [PATCH 313/343] add usage description --- docs/standalone-docker-image.md | 77 +++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 docs/standalone-docker-image.md diff --git a/docs/standalone-docker-image.md b/docs/standalone-docker-image.md new file mode 100644 index 00000000..52584dcf --- /dev/null +++ b/docs/standalone-docker-image.md @@ -0,0 +1,77 @@ +# Standalone Docker Image + +In order to build a standalone Docker image for a BioCypher KG, you only need +small modifications to the Docker image of the template. We will render the data +that ususally is stored in the `biocypher_neo4j_volume` to our local disk by +exchanging `biocypher_neo4j_volume` with a local directory, +`./biocypher_neo4j_volume`. Then, we use a Dockerfile to build an image that +contains the final database. This image can be used to deploy the database +anywhere, without the need to run the BioCypher code. This process is +demonstrated in the +[drug-interactions](https://github.com/biocypher/drug-interactions) example +repository. + +1. Clone the example repository + +``` +git clone https://github.com/biocypher/drug-interactions.git +cd drug-interactions +``` + +2. Attach volumes to disk by modifying the docker-compose.yml. In the example +repository, we have created a dedicated compose file for the standalone image. +You can see the differences between the standard and standalone compose files +[here](https://github.com/biocypher/drug-interactions/commit/f03360c526d2ef042d2a6a4a5e2beb27608d1d76). +IMPORTANT: only run the standalone compose file once, as the data in the +`./biocypher_neo4j_volume` directory is persistent and interferes with +subsequent runs. If you want to run it again, you need to delete the +`./biocypher_neo4j_volume` directory. + +3. Run the standalone compose file. This will create the +`./biocypher_neo4j_volume` directory and store the data in it. You can stop +the container after the database has been created. + +``` +docker compose -f docker-compose-local-disk.yml up -d +docker compose -f docker-compose-local-disk.yml down +``` + +4. Create standalone `Dockerfile` (example +[here](https://github.com/biocypher/drug-interactions/blob/main/Dockerfile)): + +``` +# Dockerfile +FROM neo4j:4.4-enterprise +COPY ./biocypher_neo4j_volume /data +RUN chown -R 7474:7474 /data +EXPOSE 7474 +EXPOSE 7687 +``` + +5. Build the standalone image. + +``` +docker build -t drug-interactions:latest . +``` + +This image can be deployed anywhere, without the need to run the BioCypher code. +For example, you can add it to a Docker Compose file (example +[here](https://github.com/biocypher/biochatter-next/blob/main/biochatter-next/docker-compose.yml)): + +``` +# docker-compose.yml +version: '3.9' +services: + [other services ...] + + biocypher: + container_name: biocypher + image: biocypher/drug-interactions:latest + environment: + NEO4J_dbms_security_auth__enabled: "false" + NEO4J_dbms_databases_default__to__read__only: "false" + NEO4J_ACCEPT_LICENSE_AGREEMENT: "yes" + ports: + - "0.0.0.0:7474:7474" + - "0.0.0.0:7687:7687" +``` \ No newline at end of file From cf94cae355382d593e3f369183af9c10c416dcaa Mon Sep 17 00:00:00 2001 From: slobentanzer Date: Fri, 1 Mar 2024 14:17:59 +0100 Subject: [PATCH 314/343] remove unused file --- docs/pole-docker-compose-changes.png | Bin 88643 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 docs/pole-docker-compose-changes.png diff --git a/docs/pole-docker-compose-changes.png b/docs/pole-docker-compose-changes.png deleted file mode 100644 index 49a3d381990c159ab4793b6dda6726d653133fab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 88643 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 z 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
      w;bA=!&-f!nK^7Ih5oI^jaKjAar%o-a}B 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%0AXu=iHMacoH#ra`t?vY45fnVFd^W@cu|VrFJ$ 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 From b506ed9a02f28d94bf186e8d5792812780f11f14 Mon Sep 17 00:00:00 2001 From: slobentanzer Date: Fri, 1 Mar 2024 14:58:35 +0100 Subject: [PATCH 315/343] remove `none` type nodes in nx graph not sure this is the correct place to do it, but was simplest --- biocypher/_ontology.py | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/biocypher/_ontology.py b/biocypher/_ontology.py index 2a9188cb..bc34d599 100644 --- a/biocypher/_ontology.py +++ b/biocypher/_ontology.py @@ -250,8 +250,13 @@ def _add_labels_to_nodes( Returns: nx.DiGraph: The networkx graph with labels """ - for node in nx_graph.nodes: + for node in list(nx_graph.nodes): nx_id, nx_label = self._get_nx_id_and_label(node, reverse_labels) + if nx_id == "none": + # remove node if it has no id + nx_graph.remove_node(node) + continue + nx_graph.nodes[node]["label"] = nx_label return nx_graph @@ -595,9 +600,9 @@ def _extend_ontology(self) -> None: if parent not in self._nx_graph.nodes: self._nx_graph.add_node(parent) - self._nx_graph.nodes[parent][ - "label" - ] = sentencecase_to_pascalcase(parent) + self._nx_graph.nodes[parent]["label"] = ( + sentencecase_to_pascalcase(parent) + ) # mark parent as user extension self._nx_graph.nodes[parent]["user_extension"] = True @@ -605,9 +610,9 @@ def _extend_ontology(self) -> None: if child not in self._nx_graph.nodes: self._nx_graph.add_node(child) - self._nx_graph.nodes[child][ - "label" - ] = sentencecase_to_pascalcase(child) + self._nx_graph.nodes[child]["label"] = ( + sentencecase_to_pascalcase(child) + ) # mark child as user extension self._nx_graph.nodes[child]["user_extension"] = True @@ -642,9 +647,9 @@ def _connect_biolink_classes(self) -> None: for node in disjoint_classes: if not self._nx_graph.nodes.get(node): self._nx_graph.add_node(node) - self._nx_graph.nodes[node][ - "label" - ] = sentencecase_to_pascalcase(node) + self._nx_graph.nodes[node]["label"] = ( + sentencecase_to_pascalcase(node) + ) self._nx_graph.add_edge(node, "entity") From 5892b91ff355351baa564189d92705083b784771 Mon Sep 17 00:00:00 2001 From: slobentanzer Date: Fri, 1 Mar 2024 15:03:39 +0100 Subject: [PATCH 316/343] black format --- biocypher/_ontology.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/biocypher/_ontology.py b/biocypher/_ontology.py index bc34d599..08235595 100644 --- a/biocypher/_ontology.py +++ b/biocypher/_ontology.py @@ -600,9 +600,9 @@ def _extend_ontology(self) -> None: if parent not in self._nx_graph.nodes: self._nx_graph.add_node(parent) - self._nx_graph.nodes[parent]["label"] = ( - sentencecase_to_pascalcase(parent) - ) + self._nx_graph.nodes[parent][ + "label" + ] = sentencecase_to_pascalcase(parent) # mark parent as user extension self._nx_graph.nodes[parent]["user_extension"] = True @@ -610,9 +610,9 @@ def _extend_ontology(self) -> None: if child not in self._nx_graph.nodes: self._nx_graph.add_node(child) - self._nx_graph.nodes[child]["label"] = ( - sentencecase_to_pascalcase(child) - ) + self._nx_graph.nodes[child][ + "label" + ] = sentencecase_to_pascalcase(child) # mark child as user extension self._nx_graph.nodes[child]["user_extension"] = True @@ -647,9 +647,9 @@ def _connect_biolink_classes(self) -> None: for node in disjoint_classes: if not self._nx_graph.nodes.get(node): self._nx_graph.add_node(node) - self._nx_graph.nodes[node]["label"] = ( - sentencecase_to_pascalcase(node) - ) + self._nx_graph.nodes[node][ + "label" + ] = sentencecase_to_pascalcase(node) self._nx_graph.add_edge(node, "entity") From 06389f5c96675cb19700f4abb9aee5af8e18ca52 Mon Sep 17 00:00:00 2001 From: slobentanzer Date: Fri, 1 Mar 2024 16:00:51 +0100 Subject: [PATCH 317/343] =?UTF-8?q?Bump=20version:=200.5.37=20=E2=86=92=20?= =?UTF-8?q?0.5.38?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- biocypher/_metadata.py | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index d047e4af..a46857f9 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.5.37 +current_version = 0.5.38 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+) diff --git a/biocypher/_metadata.py b/biocypher/_metadata.py index 3a54163f..83cd94b7 100644 --- a/biocypher/_metadata.py +++ b/biocypher/_metadata.py @@ -19,7 +19,7 @@ import toml -_VERSION = "0.5.37" +_VERSION = "0.5.38" def get_metadata(): diff --git a/pyproject.toml b/pyproject.toml index 3d70cb82..cd453147 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "biocypher" -version = "0.5.37" +version = "0.5.38" description = "A unifying framework for biomedical research knowledge graphs" authors = [ "Sebastian Lobentanzer ", From 9839abb34cd2b52362d5375a3ac06d5797ffae9e Mon Sep 17 00:00:00 2001 From: slobentanzer Date: Mon, 4 Mar 2024 20:11:32 +0100 Subject: [PATCH 318/343] add online version of paper --- README.md | 5 +++-- docs/index.rst | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 8f3a81a4..fd0278dd 100644 --- a/README.md +++ b/README.md @@ -68,8 +68,9 @@ please join our community at https://biocypher.zulipchat.com! The BioCypher paper has been peer-reviewed in [Nature Biotechnology](https://www.nature.com/articles/s41587-023-01848-y). It is available as a self-archived version on -[Zenodo](https://zenodo.org/records/10320714). Before, it was available as a -preprint at https://arxiv.org/abs/2212.13543. +[Zenodo](https://zenodo.org/records/10320714), online version +[here](https://biocypher.github.io/biocypher-paper/). Before, it was available +as a preprint at https://arxiv.org/abs/2212.13543. ## Acknowledgements diff --git a/docs/index.rst b/docs/index.rst index b28f5d71..effad65f 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -26,7 +26,8 @@ biomedical community. If you're new to knowledge graphs and want to familiarise with the concepts that drive BioCypher, we recommend to check out the graphical abstract below and read `our paper `_ (self-archived -version `here `_)! +version `here `_, online version `here +`_)! .. grid:: 2 :gutter: 2 From 76941d37af73c274dd534eca17f218b1a7eac17d Mon Sep 17 00:00:00 2001 From: slobentanzer Date: Tue, 5 Mar 2024 00:17:10 +0100 Subject: [PATCH 319/343] add simple (minimal) ontology test --- test/conftest.py | 27 +++++++++++++++++++++++++++ test/ontology1.ttl | 41 +++++++++++++++++++++++++++++++++++++++++ test/ontology2.ttl | 33 +++++++++++++++++++++++++++++++++ test/test_ontology.py | 4 ++++ 4 files changed, 105 insertions(+) create mode 100644 test/ontology1.ttl create mode 100644 test/ontology2.ttl diff --git a/test/conftest.py b/test/conftest.py index 2ffce0ae..3cd678ba 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -234,6 +234,15 @@ def ontology_mapping(): ) +@pytest.fixture(scope="module") +def simple_ontology_mapping(): + m = OntologyMapping() + m.schema = { + "EvaluationCriterion": {}, + } + return m + + @pytest.fixture(scope="module") def extended_ontology_mapping(): return OntologyMapping( @@ -272,6 +281,24 @@ def hybrid_ontology(extended_ontology_mapping): ) +@pytest.fixture(scope="module") +def simple_ontology(simple_ontology_mapping): + return Ontology( + head_ontology={ + "url": "test/ontology1.ttl", + "root_node": "Thing", + }, + ontology_mapping=simple_ontology_mapping, + tail_ontologies={ + "test": { + "url": "test/ontology2.ttl", + "head_join_node": "entity", + "tail_join_node": "EvaluationCriterion", + }, + }, + ) + + @pytest.fixture(scope="module") def translator(hybrid_ontology): return Translator(hybrid_ontology) diff --git a/test/ontology1.ttl b/test/ontology1.ttl new file mode 100644 index 00000000..7c3f0b34 --- /dev/null +++ b/test/ontology1.ttl @@ -0,0 +1,41 @@ +@prefix : . +@prefix owl: . +@prefix rdf: . +@prefix xml: . +@prefix xsd: . +@prefix rdfs: . +@base . + + rdf:type owl:Ontology . + +################################################################# +# Annotation properties +################################################################# + +### http://www.semanticweb.org/u1044/ontologies/2024/2/untitled-ontology-123#name +:name rdf:type owl:AnnotationProperty . + + +################################################################# +# Classes +################################################################# + +### http://www.semanticweb.org/u1044/ontologies/2024/2/untitled-ontology-123/association +:association rdf:type owl:Class ; + rdfs:label "association" . + + +### http://www.semanticweb.org/u1044/ontologies/2024/2/untitled-ontology-123/entity +:entity rdf:type owl:Class ; + rdfs:subClassOf owl:Thing ; + rdfs:label "entity" . + + +################################################################# +# Annotations +################################################################# + +owl:Thing rdfs:label "Thing" . + + +### Generated by the OWL API (version 4.5.26.2023-07-17T20:34:13Z) https://github.com/owlcs/owlapi diff --git a/test/ontology2.ttl b/test/ontology2.ttl new file mode 100644 index 00000000..c4cbc14a --- /dev/null +++ b/test/ontology2.ttl @@ -0,0 +1,33 @@ +@prefix : . +@prefix owl: . +@prefix rdf: . +@prefix xml: . +@prefix xsd: . +@prefix rdfs: . +@base . + + rdf:type owl:Ontology . + +################################################################# +# Classes +################################################################# + +### http://www.semanticweb.org/u1044/ontologies/2024/2/untitled-ontology-124#Accuracy +:Accuracy rdf:type owl:Class ; + rdfs:subClassOf :EvaluationCriterion ; + rdfs:label "Accuracy" . + + +### http://www.semanticweb.org/u1044/ontologies/2024/2/untitled-ontology-124#EvaluationCriterion +:EvaluationCriterion rdf:type owl:Class ; + rdfs:label "EvaluationCriterion" . + + +################################################################# +# Annotations +################################################################# + +owl:Thing rdfs:label "Thing" . + + +### Generated by the OWL API (version 4.5.25.2023-02-15T19:15:49Z) https://github.com/owlcs/owlapi diff --git a/test/test_ontology.py b/test/test_ontology.py index 89ded35f..f239b9ee 100644 --- a/test/test_ontology.py +++ b/test/test_ontology.py @@ -209,3 +209,7 @@ def test_reverse_labels(): expected_not_switched = ["Root", "1", "2"] for node in ontology_adapter.get_nx_graph().nodes: assert node in expected_not_switched + + +def test_simple_ontology(simple_ontology): + assert simple_ontology From 586cd183e51b78c978e58bbeb277e0d8be61b3ac Mon Sep 17 00:00:00 2001 From: slobentanzer Date: Tue, 5 Mar 2024 00:30:11 +0100 Subject: [PATCH 320/343] extend test assert --- test/test_ontology.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/test_ontology.py b/test/test_ontology.py index f239b9ee..5ef17444 100644 --- a/test/test_ontology.py +++ b/test/test_ontology.py @@ -212,4 +212,8 @@ def test_reverse_labels(): def test_simple_ontology(simple_ontology): - assert simple_ontology + list(simple_ontology.get_ancestors("accuracy")) == [ + "accuracy", + "entity", + "Thing", + ] From faf5a7807fe79a4dff879e3d8246be01c7f937cd Mon Sep 17 00:00:00 2001 From: slobentanzer Date: Tue, 5 Mar 2024 00:32:24 +0100 Subject: [PATCH 321/343] more sensible schema label --- test/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/conftest.py b/test/conftest.py index 3cd678ba..adfcd385 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -238,7 +238,7 @@ def ontology_mapping(): def simple_ontology_mapping(): m = OntologyMapping() m.schema = { - "EvaluationCriterion": {}, + "accuracy": {}, } return m From 74e4c441697332cef6e5383066b092ec4b980478 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Fri, 8 Mar 2024 16:15:08 +0100 Subject: [PATCH 322/343] #322: refactoring to split up write.py into individual files --- biocypher/_core.py | 4 +- biocypher/write/__init__.py | 0 .../{_write.py => write/_batch_writer.py} | 951 +----------------- biocypher/write/graph/__init__.py | 0 biocypher/write/graph/_arangodb.py | 241 +++++ biocypher/write/graph/_neo4j.py | 293 ++++++ biocypher/write/relational/__init__.py | 0 biocypher/write/relational/_postgresql.py | 320 ++++++ biocypher/write/write.py | 105 ++ test/__init__.py | 0 test/conftest.py | 601 +---------- test/fixtures/__init__.py | 0 test/fixtures/arangodb.py | 21 + test/fixtures/core.py | 55 + test/fixtures/data_generator.py | 142 +++ test/fixtures/neo4j.py | 150 +++ test/fixtures/ontology.py | 99 ++ test/fixtures/postgres.py | 131 +++ test/test_write_neo4j.py | 3 +- 19 files changed, 1576 insertions(+), 1540 deletions(-) create mode 100644 biocypher/write/__init__.py rename biocypher/{_write.py => write/_batch_writer.py} (52%) create mode 100644 biocypher/write/graph/__init__.py create mode 100644 biocypher/write/graph/_arangodb.py create mode 100644 biocypher/write/graph/_neo4j.py create mode 100644 biocypher/write/relational/__init__.py create mode 100644 biocypher/write/relational/_postgresql.py create mode 100644 biocypher/write/write.py create mode 100644 test/__init__.py create mode 100644 test/fixtures/__init__.py create mode 100644 test/fixtures/arangodb.py create mode 100644 test/fixtures/core.py create mode 100644 test/fixtures/data_generator.py create mode 100644 test/fixtures/neo4j.py create mode 100644 test/fixtures/ontology.py create mode 100644 test/fixtures/postgres.py diff --git a/biocypher/_core.py b/biocypher/_core.py index c1b8a15d..a04ce98c 100644 --- a/biocypher/_core.py +++ b/biocypher/_core.py @@ -26,8 +26,8 @@ logger.debug(f"Loading module {__name__}.") +from biocypher.write.write import DBMS_TO_CLASS, get_writer from ._get import Downloader -from ._write import get_writer from ._config import config as _config from ._config import update_from_file as _file_update from ._create import BioCypherEdge, BioCypherNode, BioCypherRelAsNode @@ -40,7 +40,7 @@ __all__ = ["BioCypher"] -SUPPORTED_DBMS = ["neo4j", "postgresql"] +SUPPORTED_DBMS = DBMS_TO_CLASS.keys() REQUIRED_CONFIG = [ "dbms", diff --git a/biocypher/write/__init__.py b/biocypher/write/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/biocypher/_write.py b/biocypher/write/_batch_writer.py similarity index 52% rename from biocypher/_write.py rename to biocypher/write/_batch_writer.py index 21958e38..60f92111 100644 --- a/biocypher/_write.py +++ b/biocypher/write/_batch_writer.py @@ -1,41 +1,17 @@ -#!/usr/bin/env python - -# -# Copyright 2021, Heidelberg University Clinic -# -# File author(s): Sebastian Lobentanzer -# Michael Hartung -# -# Distributed under MIT licence, see the file `LICENSE`. -# -""" -BioCypher 'offline' module. Handles the writing of node and edge representations -suitable for import into a DBMS. -""" - -import re -import glob - -from ._logger import logger - -logger.debug(f"Loading module {__name__}.") - from abc import ABC, abstractmethod from types import GeneratorType -from typing import TYPE_CHECKING, Union, Optional +from typing import Union, Optional from collections import OrderedDict, defaultdict import os +import re +import glob from more_itertools import peekable -from ._config import config as _config -from ._create import BioCypherEdge, BioCypherNode, BioCypherRelAsNode - -__all__ = ["get_writer"] - -if TYPE_CHECKING: - from ._translate import Translator - from ._deduplicate import Deduplicator +from biocypher._create import BioCypherEdge, BioCypherNode, BioCypherRelAsNode +from biocypher._logger import logger +from biocypher._translate import Translator +from biocypher._deduplicate import Deduplicator class _BatchWriter(ABC): @@ -1026,295 +1002,6 @@ def write_import_call(self) -> bool: return True -class _Neo4jBatchWriter(_BatchWriter): - """ - Class for writing node and edge representations to disk using the - format specified by Neo4j for the use of admin import. Each batch - writer instance has a fixed representation that needs to be passed - at instantiation via the :py:attr:`schema` argument. The instance - also expects an ontology adapter via :py:attr:`ontology_adapter` to be able - to convert and extend the hierarchy. - - This class inherits from the abstract class "_BatchWriter" and implements the - Neo4j-specific methods: - - - _write_node_headers - - _write_edge_headers - - _construct_import_call - - _write_array_string - """ - - def _get_default_import_call_bin_prefix(self): - """ - Method to provide the default string for the import call bin prefix. - - Returns: - str: The default location for the neo4j admin import location - """ - return "bin/" - - def _write_array_string(self, string_list): - """ - Abstract method to write the string representation of an array into a .csv file - as required by the neo4j admin-import. - - Args: - string_list (list): list of ontology strings - - Returns: - str: The string representation of an array for the neo4j admin import - """ - string = self.adelim.join(string_list) - return f"{self.quote}{string}{self.quote}" - - def _write_node_headers(self): - """ - Writes single CSV file for a graph entity that is represented - as a node as per the definition in the `schema_config.yaml`, - containing only the header for this type of node. - - Returns: - bool: The return value. True for success, False otherwise. - """ - # load headers from data parse - if not self.node_property_dict: - logger.error( - "Header information not found. Was the data parsed first?", - ) - return False - - for label, props in self.node_property_dict.items(): - _id = ":ID" - - # translate label to PascalCase - pascal_label = self.translator.name_sentence_to_pascal( - parse_label(label) - ) - - header = f"{pascal_label}-header.csv" - header_path = os.path.join( - self.outdir, - header, - ) - parts = f"{pascal_label}-part.*" - - # check if file already exists - if os.path.exists(header_path): - logger.warning( - f"Header file `{header_path}` already exists. Overwriting.", - ) - - # concatenate key:value in props - props_list = [] - for k, v in props.items(): - if v in ["int", "long", "integer"]: - props_list.append(f"{k}:long") - elif v in ["int[]", "long[]", "integer[]"]: - props_list.append(f"{k}:long[]") - elif v in ["float", "double", "dbl"]: - props_list.append(f"{k}:double") - elif v in ["float[]", "double[]"]: - props_list.append(f"{k}:double[]") - elif v in ["bool", "boolean"]: - # TODO Neo4j boolean support / spelling? - props_list.append(f"{k}:boolean") - elif v in ["bool[]", "boolean[]"]: - props_list.append(f"{k}:boolean[]") - elif v in ["str[]", "string[]"]: - props_list.append(f"{k}:string[]") - else: - props_list.append(f"{k}") - - # create list of lists and flatten - out_list = [[_id], props_list, [":LABEL"]] - out_list = [val for sublist in out_list for val in sublist] - - with open(header_path, "w", encoding="utf-8") as f: - # concatenate with delimiter - row = self.delim.join(out_list) - f.write(row) - - # add file path to neo4 admin import statement (import call file - # path may be different from actual file path) - import_call_header_path = os.path.join( - self.import_call_file_prefix, - header, - ) - import_call_parts_path = os.path.join( - self.import_call_file_prefix, - parts, - ) - self.import_call_nodes.add( - (import_call_header_path, import_call_parts_path) - ) - - return True - - def _write_edge_headers(self): - """ - Writes single CSV file for a graph entity that is represented - as an edge as per the definition in the `schema_config.yaml`, - containing only the header for this type of edge. - - Returns: - bool: The return value. True for success, False otherwise. - """ - # load headers from data parse - if not self.edge_property_dict: - logger.error( - "Header information not found. Was the data parsed first?", - ) - return False - - for label, props in self.edge_property_dict.items(): - # translate label to PascalCase - pascal_label = self.translator.name_sentence_to_pascal( - parse_label(label) - ) - - # paths - header = f"{pascal_label}-header.csv" - header_path = os.path.join( - self.outdir, - header, - ) - parts = f"{pascal_label}-part.*" - - # check for file exists - if os.path.exists(header_path): - logger.warning( - f"File {header_path} already exists. Overwriting." - ) - - # concatenate key:value in props - props_list = [] - for k, v in props.items(): - if v in ["int", "long", "integer"]: - props_list.append(f"{k}:long") - elif v in ["int[]", "long[]", "integer[]"]: - props_list.append(f"{k}:long[]") - elif v in ["float", "double"]: - props_list.append(f"{k}:double") - elif v in ["float[]", "double[]"]: - props_list.append(f"{k}:double[]") - elif v in [ - "bool", - "boolean", - ]: # TODO does Neo4j support bool? - props_list.append(f"{k}:boolean") - elif v in ["bool[]", "boolean[]"]: - props_list.append(f"{k}:boolean[]") - elif v in ["str[]", "string[]"]: - props_list.append(f"{k}:string[]") - else: - props_list.append(f"{k}") - - skip_id = False - schema_label = None - - if label in ["IS_SOURCE_OF", "IS_TARGET_OF", "IS_PART_OF"]: - skip_id = True - elif not self.translator.ontology.mapping.extended_schema.get( - label - ): - # find label in schema by label_as_edge - for ( - k, - v, - ) in self.translator.ontology.mapping.extended_schema.items(): - if v.get("label_as_edge") == label: - schema_label = k - break - else: - schema_label = label - - out_list = [":START_ID"] - - if schema_label: - if ( - self.translator.ontology.mapping.extended_schema.get( - schema_label - ).get("use_id") - == False - ): - skip_id = True - - if not skip_id: - out_list.append("id") - - out_list.extend(props_list) - out_list.extend([":END_ID", ":TYPE"]) - - with open(header_path, "w", encoding="utf-8") as f: - # concatenate with delimiter - row = self.delim.join(out_list) - f.write(row) - - # add file path to neo4 admin import statement (import call file - # path may be different from actual file path) - import_call_header_path = os.path.join( - self.import_call_file_prefix, - header, - ) - import_call_parts_path = os.path.join( - self.import_call_file_prefix, - parts, - ) - self.import_call_edges.add( - (import_call_header_path, import_call_parts_path) - ) - - return True - - def _get_import_script_name(self) -> str: - """ - Returns the name of the neo4j admin import script - - Returns: - str: The name of the import script (ending in .sh) - """ - return "neo4j-admin-import-call.sh" - - def _construct_import_call(self) -> str: - """ - Function to construct the import call detailing folder and - individual node and edge headers and data files, as well as - delimiters and database name. Built after all data has been - processed to ensure that nodes are called before any edges. - - Returns: - str: a bash command for neo4j-admin import - """ - import_call = ( - f"{self.import_call_bin_prefix}neo4j-admin import " - f"--database={self.db_name} " - f'--delimiter="{self.escaped_delim}" ' - f'--array-delimiter="{self.escaped_adelim}" ' - ) - - if self.quote == "'": - import_call += f'--quote="{self.quote}" ' - else: - import_call += f"--quote='{self.quote}' " - - if self.wipe: - import_call += f"--force=true " - if self.skip_bad_relationships: - import_call += "--skip-bad-relationships=true " - if self.skip_duplicate_nodes: - import_call += "--skip-duplicate-nodes=true " - - # append node import calls - for header_path, parts_path in self.import_call_nodes: - import_call += f'--nodes="{header_path},{parts_path}" ' - - # append edge import calls - for header_path, parts_path in self.import_call_edges: - import_call += f'--relationships="{header_path},{parts_path}" ' - - return import_call - - def parse_label(label: str) -> str: """ @@ -1350,627 +1037,3 @@ def first_character_compliant(character: str) -> bool: "Label does not start with an alphabetic character or with $. Removed non compliant characters." ) return "".join(matches).strip() - - -class _ArangoDBBatchWriter(_Neo4jBatchWriter): - """ - Class for writing node and edge representations to disk using the format - specified by ArangoDB for the use of "arangoimport". Output files are - similar to Neo4j, but with a different header format. - """ - - def _get_default_import_call_bin_prefix(self): - """ - Method to provide the default string for the import call bin prefix. - - Returns: - str: The default location for the neo4j admin import location - """ - return "" - - def _get_import_script_name(self) -> str: - """ - Returns the name of the neo4j admin import script - - Returns: - str: The name of the import script (ending in .sh) - """ - return "arangodb-import-call.sh" - - def _write_node_headers(self): - """ - Writes single CSV file for a graph entity that is represented - as a node as per the definition in the `schema_config.yaml`, - containing only the header for this type of node. - - Returns: - bool: The return value. True for success, False otherwise. - """ - # load headers from data parse - if not self.node_property_dict: - logger.error( - "Header information not found. Was the data parsed first?", - ) - return False - - for label, props in self.node_property_dict.items(): - # create header CSV with ID, properties, labels - - _id = "_key" - - # translate label to PascalCase - pascal_label = self.translator.name_sentence_to_pascal(label) - - header = f"{pascal_label}-header.csv" - header_path = os.path.join( - self.outdir, - header, - ) - - # check if file already exists - if os.path.exists(header_path): - logger.warning( - f"File {header_path} already exists. Overwriting." - ) - - # concatenate key:value in props - props_list = [] - for k in props.keys(): - props_list.append(f"{k}") - - # create list of lists and flatten - # removes need for empty check of property list - out_list = [[_id], props_list] - out_list = [val for sublist in out_list for val in sublist] - - with open(header_path, "w", encoding="utf-8") as f: - # concatenate with delimiter - row = self.delim.join(out_list) - f.write(row) - - # add collection from schema config - collection = self.translator.ontology.mapping.extended_schema[ - label - ].get("db_collection_name", None) - - # add file path to neo4 admin import statement - # do once for each part file - parts = self.parts.get(label, []) - - if not parts: - raise ValueError( - f"No parts found for node label {label}. " - f"Check that the data was parsed first.", - ) - - for part in parts: - import_call_header_path = os.path.join( - self.import_call_file_prefix, - header, - ) - import_call_parts_path = os.path.join( - self.import_call_file_prefix, - part, - ) - - self.import_call_nodes.add( - ( - import_call_header_path, - import_call_parts_path, - collection, - ) - ) - - return True - - def _write_edge_headers(self): - """ - Writes single CSV file for a graph entity that is represented - as an edge as per the definition in the `schema_config.yaml`, - containing only the header for this type of edge. - - Returns: - bool: The return value. True for success, False otherwise. - """ - # load headers from data parse - if not self.edge_property_dict: - logger.error( - "Header information not found. Was the data parsed first?", - ) - return False - - for label, props in self.edge_property_dict.items(): - # translate label to PascalCase - pascal_label = self.translator.name_sentence_to_pascal(label) - - # paths - header = f"{pascal_label}-header.csv" - header_path = os.path.join( - self.outdir, - header, - ) - parts = f"{pascal_label}-part.*" - - # check for file exists - if os.path.exists(header_path): - logger.warning( - f"Header file {header_path} already exists. Overwriting." - ) - - # concatenate key:value in props - props_list = [] - for k in props.keys(): - props_list.append(f"{k}") - - out_list = ["_from", "_key", *props_list, "_to"] - - with open(header_path, "w", encoding="utf-8") as f: - # concatenate with delimiter - row = self.delim.join(out_list) - f.write(row) - - # add collection from schema config - if not self.translator.ontology.mapping.extended_schema.get(label): - for ( - _, - v, - ) in self.translator.ontology.mapping.extended_schema.items(): - if v.get("label_as_edge") == label: - collection = v.get("db_collection_name", None) - break - - else: - collection = self.translator.ontology.mapping.extended_schema[ - label - ].get("db_collection_name", None) - - # add file path to neo4 admin import statement (import call path - # may be different from actual output path) - header_import_call_path = os.path.join( - self.import_call_file_prefix, - header, - ) - parts_import_call_path = os.path.join( - self.import_call_file_prefix, - parts, - ) - self.import_call_edges.add( - ( - header_import_call_path, - parts_import_call_path, - collection, - ) - ) - - return True - - def _construct_import_call(self) -> str: - """ - Function to construct the import call detailing folder and - individual node and edge headers and data files, as well as - delimiters and database name. Built after all data has been - processed to ensure that nodes are called before any edges. - - Returns: - str: a bash command for neo4j-admin import - """ - import_call = ( - f"{self.import_call_bin_prefix}arangoimp " - f"--type csv " - f'--separator="{self.escaped_delim}" ' - ) - - if self.quote == "'": - import_call += f'--quote="{self.quote}" ' - else: - import_call += f"--quote='{self.quote}' " - - node_lines = "" - - # node import calls: one line per node type - for header_path, parts_path, collection in self.import_call_nodes: - line = ( - f"{import_call} " - f"--headers-file {header_path} " - f"--file= {parts_path} " - ) - - if collection: - line += f"--create-collection --collection {collection} " - - node_lines += f"{line}\n" - - edge_lines = "" - - # edge import calls: one line per edge type - for header_path, parts_path, collection in self.import_call_edges: - import_call += f'--relationships="{header_path},{parts_path}" ' - - return node_lines + edge_lines - - -class _PostgreSQLBatchWriter(_BatchWriter): - """ - Class for writing node and edge representations to disk using the - format specified by PostgreSQL for the use of "COPY FROM...". Each batch - writer instance has a fixed representation that needs to be passed - at instantiation via the :py:attr:`schema` argument. The instance - also expects an ontology adapter via :py:attr:`ontology_adapter` to be able - to convert and extend the hierarchy. - - This class inherits from the abstract class "_BatchWriter" and implements the - PostgreSQL-specific methods: - - - _write_node_headers - - _write_edge_headers - - _construct_import_call - - _write_array_string - """ - - DATA_TYPE_LOOKUP = { - "str": "VARCHAR", # VARCHAR needs limit - "int": "INTEGER", - "long": "BIGINT", - "float": "NUMERIC", - "double": "NUMERIC", - "dbl": "NUMERIC", - "boolean": "BOOLEAN", - "str[]": "VARCHAR[]", - "string[]": "VARCHAR[]", - } - - def __init__(self, *args, **kwargs): - self._copy_from_csv_commands = set() - super().__init__(*args, **kwargs) - - def _get_default_import_call_bin_prefix(self): - """ - Method to provide the default string for the import call bin prefix. - - Returns: - str: The default location for the psql command - """ - return "" - - def _get_data_type(self, string) -> str: - try: - return self.DATA_TYPE_LOOKUP[string] - except KeyError: - logger.info( - 'Could not determine data type {string}. Using default "VARCHAR"' - ) - return "VARCHAR" - - def _write_array_string(self, string_list) -> str: - """ - Abstract method to write the string representation of an array into a .csv file - as required by the postgresql COPY command, with '{','}' brackets and ',' separation. - - Args: - string_list (list): list of ontology strings - - Returns: - str: The string representation of an array for postgres COPY - """ - string = ",".join(string_list) - string = f'"{{{string}}}"' - return string - - def _get_import_script_name(self) -> str: - """ - Returns the name of the psql import script - - Returns: - str: The name of the import script (ending in .sh) - """ - return f"{self.db_name}-import-call.sh" - - def _adjust_pascal_to_psql(self, string): - string = string.replace(".", "_") - string = string.lower() - return string - - def _write_node_headers(self): - """ - Writes single CSV file for a graph entity that is represented - as a node as per the definition in the `schema_config.yaml`, - containing only the header for this type of node. - - Returns: - bool: The return value. True for success, False otherwise. - """ - # load headers from data parse - if not self.node_property_dict: - logger.error( - "Header information not found. Was the data parsed first?", - ) - return False - - for label, props in self.node_property_dict.items(): - # create header CSV with ID, properties, labels - - # translate label to PascalCase - pascal_label = self.translator.name_sentence_to_pascal(label) - - parts = f"{pascal_label}-part*.csv" - parts_paths = os.path.join(self.outdir, parts) - parts_paths = glob.glob(parts_paths) - parts_paths.sort() - - # adjust label for import to psql - pascal_label = self._adjust_pascal_to_psql(pascal_label) - table_create_command_path = os.path.join( - self.outdir, - f"{pascal_label}-create_table.sql", - ) - - # check if file already exists - if os.path.exists(table_create_command_path): - logger.warning( - f"File {table_create_command_path} already exists. Overwriting.", - ) - - # concatenate key:value in props - columns = ["_ID VARCHAR"] - for col_name, col_type in props.items(): - col_type = self._get_data_type(col_type) - col_name = self._adjust_pascal_to_psql(col_name) - columns.append(f"{col_name} {col_type}") - columns.append("_LABEL VARCHAR[]") - - with open(table_create_command_path, "w", encoding="utf-8") as f: - command = "" - if self.wipe: - command += f"DROP TABLE IF EXISTS {pascal_label};\n" - - # table creation requires comma separation - command += ( - f'CREATE TABLE {pascal_label}({",".join(columns)});\n' - ) - f.write(command) - - for parts_path in parts_paths: - # if import_call_file_prefix is set, replace actual path - # with prefix - if self.import_call_file_prefix != self.outdir: - parts_path = parts_path.replace( - self.outdir, - self.import_call_file_prefix, - ) - - self._copy_from_csv_commands.add( - f"\\copy {pascal_label} FROM '{parts_path}' DELIMITER E'{self.delim}' CSV;" - ) - - # add file path to import statement - # if import_call_file_prefix is set, replace actual path - # with prefix - if self.import_call_file_prefix != self.outdir: - table_create_command_path = table_create_command_path.replace( - self.outdir, - self.import_call_file_prefix, - ) - - self.import_call_nodes.add(table_create_command_path) - - return True - - def _write_edge_headers(self): - """ - Writes single CSV file for a graph entity that is represented - as an edge as per the definition in the `schema_config.yaml`, - containing only the header for this type of edge. - - Returns: - bool: The return value. True for success, False otherwise. - """ - # load headers from data parse - if not self.edge_property_dict: - logger.error( - "Header information not found. Was the data parsed first?", - ) - return False - - for label, props in self.edge_property_dict.items(): - # translate label to PascalCase - pascal_label = self.translator.name_sentence_to_pascal(label) - - parts_paths = os.path.join(self.outdir, f"{pascal_label}-part*.csv") - parts_paths = glob.glob(parts_paths) - parts_paths.sort() - - # adjust label for import to psql - pascal_label = self._adjust_pascal_to_psql(pascal_label) - table_create_command_path = os.path.join( - self.outdir, - f"{pascal_label}-create_table.sql", - ) - - # check for file exists - if os.path.exists(table_create_command_path): - logger.warning( - f"File {table_create_command_path} already exists. Overwriting.", - ) - - # concatenate key:value in props - columns = [] - for col_name, col_type in props.items(): - col_type = self._get_data_type(col_type) - col_name = self._adjust_pascal_to_psql(col_name) - if col_name == "_ID": - # should ideally never happen - raise ValueError( - "Column name '_ID' is reserved for internal use, " - "denoting the relationship ID. Please choose a " - "different name for your column." - ) - - columns.append(f"{col_name} {col_type}") - - # create list of lists and flatten - # removes need for empty check of property list - out_list = [ - "_START_ID VARCHAR", - "_ID VARCHAR", - *columns, - "_END_ID VARCHAR", - "_TYPE VARCHAR", - ] - - with open(table_create_command_path, "w", encoding="utf-8") as f: - command = "" - if self.wipe: - command += f"DROP TABLE IF EXISTS {pascal_label};\n" - - # table creation requires comma separation - command += ( - f'CREATE TABLE {pascal_label}({",".join(out_list)});\n' - ) - f.write(command) - - for parts_path in parts_paths: - # if import_call_file_prefix is set, replace actual path - # with prefix - if self.import_call_file_prefix != self.outdir: - parts_path = parts_path.replace( - self.outdir, - self.import_call_file_prefix, - ) - - self._copy_from_csv_commands.add( - f"\\copy {pascal_label} FROM '{parts_path}' DELIMITER E'{self.delim}' CSV;" - ) - - # add file path to import statement - # if import_call_file_prefix is set, replace actual path - # with prefix - if self.import_call_file_prefix != self.outdir: - table_create_command_path = table_create_command_path.replace( - self.outdir, - self.import_call_file_prefix, - ) - - self.import_call_edges.add(table_create_command_path) - - return True - - def _construct_import_call(self) -> str: - """ - Function to construct the import call detailing folder and - individual node and edge headers and data files, as well as - delimiters and database name. Built after all data has been - processed to ensure that nodes are called before any edges. - - Returns: - str: a bash command for postgresql import - """ - import_call = "" - - # create tables - # At this point, csv files of nodes and edges do not require differentiation - for import_file_path in [ - *self.import_call_nodes, - *self.import_call_edges, - ]: - import_call += f'echo "Setup {import_file_path}..."\n' - if {self.db_password}: - # set password variable inline - import_call += f"PGPASSWORD={self.db_password} " - import_call += ( - f"{self.import_call_bin_prefix}psql -f {import_file_path}" - ) - import_call += f" --dbname {self.db_name}" - import_call += f" --host {self.db_host}" - import_call += f" --port {self.db_port}" - import_call += f" --user {self.db_user}" - import_call += '\necho "Done!"\n' - import_call += "\n" - - # copy data to tables - for command in self._copy_from_csv_commands: - table_part = command.split(" ")[3] - import_call += f'echo "Importing {table_part}..."\n' - if {self.db_password}: - # set password variable inline - import_call += f"PGPASSWORD={self.db_password} " - import_call += f'{self.import_call_bin_prefix}psql -c "{command}"' - import_call += f" --dbname {self.db_name}" - import_call += f" --host {self.db_host}" - import_call += f" --port {self.db_port}" - import_call += f" --user {self.db_user}" - import_call += '\necho "Done!"\n' - import_call += "\n" - - return import_call - - -DBMS_TO_CLASS = { - "neo": _Neo4jBatchWriter, - "neo4j": _Neo4jBatchWriter, - "Neo4j": _Neo4jBatchWriter, - "postgres": _PostgreSQLBatchWriter, - "postgresql": _PostgreSQLBatchWriter, - "PostgreSQL": _PostgreSQLBatchWriter, - "arango": _ArangoDBBatchWriter, - "arangodb": _ArangoDBBatchWriter, - "ArangoDB": _ArangoDBBatchWriter, -} - - -def get_writer( - dbms: str, - translator: "Translator", - deduplicator: "Deduplicator", - output_directory: str, - strict_mode: bool, -): - """ - Function to return the writer class based on the selection in the config - file. - - Args: - - dbms: the database management system; for options, see DBMS_TO_CLASS. - - translator: the Translator object. - - output_directory: the directory to write the output files to. - - strict_mode: whether to use strict mode. - - Returns: - - instance: an instance of the selected writer class. - - """ - - dbms_config = _config(dbms) - - writer = DBMS_TO_CLASS[dbms] - - if not writer: - raise ValueError(f"Unknown dbms: {dbms}") - - if writer is not None: - return writer( - translator=translator, - deduplicator=deduplicator, - delimiter=dbms_config.get("delimiter"), - array_delimiter=dbms_config.get("array_delimiter"), - quote=dbms_config.get("quote_character"), - output_directory=output_directory, - db_name=dbms_config.get("database_name"), - import_call_bin_prefix=dbms_config.get("import_call_bin_prefix"), - import_call_file_prefix=dbms_config.get("import_call_file_prefix"), - wipe=dbms_config.get("wipe"), - strict_mode=strict_mode, - skip_bad_relationships=dbms_config.get( - "skip_bad_relationships" - ), # neo4j - skip_duplicate_nodes=dbms_config.get( - "skip_duplicate_nodes" - ), # neo4j - db_user=dbms_config.get("user"), # psql - db_password=dbms_config.get("password"), # psql - db_port=dbms_config.get("port"), # psql - ) diff --git a/biocypher/write/graph/__init__.py b/biocypher/write/graph/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/biocypher/write/graph/_arangodb.py b/biocypher/write/graph/_arangodb.py new file mode 100644 index 00000000..294e01b1 --- /dev/null +++ b/biocypher/write/graph/_arangodb.py @@ -0,0 +1,241 @@ +import os + +from biocypher._logger import logger +from biocypher.write.graph._neo4j import _Neo4jBatchWriter + + +class _ArangoDBBatchWriter(_Neo4jBatchWriter): + """ + Class for writing node and edge representations to disk using the format + specified by ArangoDB for the use of "arangoimport". Output files are + similar to Neo4j, but with a different header format. + """ + + def _get_default_import_call_bin_prefix(self): + """ + Method to provide the default string for the import call bin prefix. + + Returns: + str: The default location for the neo4j admin import location + """ + return "" + + def _get_import_script_name(self) -> str: + """ + Returns the name of the neo4j admin import script + + Returns: + str: The name of the import script (ending in .sh) + """ + return "arangodb-import-call.sh" + + def _write_node_headers(self): + """ + Writes single CSV file for a graph entity that is represented + as a node as per the definition in the `schema_config.yaml`, + containing only the header for this type of node. + + Returns: + bool: The return value. True for success, False otherwise. + """ + # load headers from data parse + if not self.node_property_dict: + logger.error( + "Header information not found. Was the data parsed first?", + ) + return False + + for label, props in self.node_property_dict.items(): + # create header CSV with ID, properties, labels + + _id = "_key" + + # translate label to PascalCase + pascal_label = self.translator.name_sentence_to_pascal(label) + + header = f"{pascal_label}-header.csv" + header_path = os.path.join( + self.outdir, + header, + ) + + # check if file already exists + if os.path.exists(header_path): + logger.warning( + f"File {header_path} already exists. Overwriting." + ) + + # concatenate key:value in props + props_list = [] + for k in props.keys(): + props_list.append(f"{k}") + + # create list of lists and flatten + # removes need for empty check of property list + out_list = [[_id], props_list] + out_list = [val for sublist in out_list for val in sublist] + + with open(header_path, "w", encoding="utf-8") as f: + # concatenate with delimiter + row = self.delim.join(out_list) + f.write(row) + + # add collection from schema config + collection = self.translator.ontology.mapping.extended_schema[ + label + ].get("db_collection_name", None) + + # add file path to neo4 admin import statement + # do once for each part file + parts = self.parts.get(label, []) + + if not parts: + raise ValueError( + f"No parts found for node label {label}. " + f"Check that the data was parsed first.", + ) + + for part in parts: + import_call_header_path = os.path.join( + self.import_call_file_prefix, + header, + ) + import_call_parts_path = os.path.join( + self.import_call_file_prefix, + part, + ) + + self.import_call_nodes.add( + ( + import_call_header_path, + import_call_parts_path, + collection, + ) + ) + + return True + + def _write_edge_headers(self): + """ + Writes single CSV file for a graph entity that is represented + as an edge as per the definition in the `schema_config.yaml`, + containing only the header for this type of edge. + + Returns: + bool: The return value. True for success, False otherwise. + """ + # load headers from data parse + if not self.edge_property_dict: + logger.error( + "Header information not found. Was the data parsed first?", + ) + return False + + for label, props in self.edge_property_dict.items(): + # translate label to PascalCase + pascal_label = self.translator.name_sentence_to_pascal(label) + + # paths + header = f"{pascal_label}-header.csv" + header_path = os.path.join( + self.outdir, + header, + ) + parts = f"{pascal_label}-part.*" + + # check for file exists + if os.path.exists(header_path): + logger.warning( + f"Header file {header_path} already exists. Overwriting." + ) + + # concatenate key:value in props + props_list = [] + for k in props.keys(): + props_list.append(f"{k}") + + out_list = ["_from", "_key", *props_list, "_to"] + + with open(header_path, "w", encoding="utf-8") as f: + # concatenate with delimiter + row = self.delim.join(out_list) + f.write(row) + + # add collection from schema config + if not self.translator.ontology.mapping.extended_schema.get(label): + for ( + _, + v, + ) in self.translator.ontology.mapping.extended_schema.items(): + if v.get("label_as_edge") == label: + collection = v.get("db_collection_name", None) + break + + else: + collection = self.translator.ontology.mapping.extended_schema[ + label + ].get("db_collection_name", None) + + # add file path to neo4 admin import statement (import call path + # may be different from actual output path) + header_import_call_path = os.path.join( + self.import_call_file_prefix, + header, + ) + parts_import_call_path = os.path.join( + self.import_call_file_prefix, + parts, + ) + self.import_call_edges.add( + ( + header_import_call_path, + parts_import_call_path, + collection, + ) + ) + + return True + + def _construct_import_call(self) -> str: + """ + Function to construct the import call detailing folder and + individual node and edge headers and data files, as well as + delimiters and database name. Built after all data has been + processed to ensure that nodes are called before any edges. + + Returns: + str: a bash command for neo4j-admin import + """ + import_call = ( + f"{self.import_call_bin_prefix}arangoimp " + f"--type csv " + f'--separator="{self.escaped_delim}" ' + ) + + if self.quote == "'": + import_call += f'--quote="{self.quote}" ' + else: + import_call += f"--quote='{self.quote}' " + + node_lines = "" + + # node import calls: one line per node type + for header_path, parts_path, collection in self.import_call_nodes: + line = ( + f"{import_call} " + f"--headers-file {header_path} " + f"--file= {parts_path} " + ) + + if collection: + line += f"--create-collection --collection {collection} " + + node_lines += f"{line}\n" + + edge_lines = "" + + # edge import calls: one line per edge type + for header_path, parts_path, collection in self.import_call_edges: + import_call += f'--relationships="{header_path},{parts_path}" ' + + return node_lines + edge_lines diff --git a/biocypher/write/graph/_neo4j.py b/biocypher/write/graph/_neo4j.py new file mode 100644 index 00000000..c5a62ac8 --- /dev/null +++ b/biocypher/write/graph/_neo4j.py @@ -0,0 +1,293 @@ +import os + +from biocypher._logger import logger +from biocypher.write._batch_writer import parse_label, _BatchWriter + + +class _Neo4jBatchWriter(_BatchWriter): + """ + Class for writing node and edge representations to disk using the + format specified by Neo4j for the use of admin import. Each batch + writer instance has a fixed representation that needs to be passed + at instantiation via the :py:attr:`schema` argument. The instance + also expects an ontology adapter via :py:attr:`ontology_adapter` to be able + to convert and extend the hierarchy. + + This class inherits from the abstract class "_BatchWriter" and implements the + Neo4j-specific methods: + + - _write_node_headers + - _write_edge_headers + - _construct_import_call + - _write_array_string + """ + + def _get_default_import_call_bin_prefix(self): + """ + Method to provide the default string for the import call bin prefix. + + Returns: + str: The default location for the neo4j admin import location + """ + return "bin/" + + def _write_array_string(self, string_list): + """ + Abstract method to write the string representation of an array into a .csv file + as required by the neo4j admin-import. + + Args: + string_list (list): list of ontology strings + + Returns: + str: The string representation of an array for the neo4j admin import + """ + string = self.adelim.join(string_list) + return f"{self.quote}{string}{self.quote}" + + def _write_node_headers(self): + """ + Writes single CSV file for a graph entity that is represented + as a node as per the definition in the `schema_config.yaml`, + containing only the header for this type of node. + + Returns: + bool: The return value. True for success, False otherwise. + """ + # load headers from data parse + if not self.node_property_dict: + logger.error( + "Header information not found. Was the data parsed first?", + ) + return False + + for label, props in self.node_property_dict.items(): + _id = ":ID" + + # translate label to PascalCase + pascal_label = self.translator.name_sentence_to_pascal( + parse_label(label) + ) + + header = f"{pascal_label}-header.csv" + header_path = os.path.join( + self.outdir, + header, + ) + parts = f"{pascal_label}-part.*" + + # check if file already exists + if os.path.exists(header_path): + logger.warning( + f"Header file `{header_path}` already exists. Overwriting.", + ) + + # concatenate key:value in props + props_list = [] + for k, v in props.items(): + if v in ["int", "long", "integer"]: + props_list.append(f"{k}:long") + elif v in ["int[]", "long[]", "integer[]"]: + props_list.append(f"{k}:long[]") + elif v in ["float", "double", "dbl"]: + props_list.append(f"{k}:double") + elif v in ["float[]", "double[]"]: + props_list.append(f"{k}:double[]") + elif v in ["bool", "boolean"]: + # TODO Neo4j boolean support / spelling? + props_list.append(f"{k}:boolean") + elif v in ["bool[]", "boolean[]"]: + props_list.append(f"{k}:boolean[]") + elif v in ["str[]", "string[]"]: + props_list.append(f"{k}:string[]") + else: + props_list.append(f"{k}") + + # create list of lists and flatten + out_list = [[_id], props_list, [":LABEL"]] + out_list = [val for sublist in out_list for val in sublist] + + with open(header_path, "w", encoding="utf-8") as f: + # concatenate with delimiter + row = self.delim.join(out_list) + f.write(row) + + # add file path to neo4 admin import statement (import call file + # path may be different from actual file path) + import_call_header_path = os.path.join( + self.import_call_file_prefix, + header, + ) + import_call_parts_path = os.path.join( + self.import_call_file_prefix, + parts, + ) + self.import_call_nodes.add( + (import_call_header_path, import_call_parts_path) + ) + + return True + + def _write_edge_headers(self): + """ + Writes single CSV file for a graph entity that is represented + as an edge as per the definition in the `schema_config.yaml`, + containing only the header for this type of edge. + + Returns: + bool: The return value. True for success, False otherwise. + """ + # load headers from data parse + if not self.edge_property_dict: + logger.error( + "Header information not found. Was the data parsed first?", + ) + return False + + for label, props in self.edge_property_dict.items(): + # translate label to PascalCase + pascal_label = self.translator.name_sentence_to_pascal( + parse_label(label) + ) + + # paths + header = f"{pascal_label}-header.csv" + header_path = os.path.join( + self.outdir, + header, + ) + parts = f"{pascal_label}-part.*" + + # check for file exists + if os.path.exists(header_path): + logger.warning( + f"File {header_path} already exists. Overwriting." + ) + + # concatenate key:value in props + props_list = [] + for k, v in props.items(): + if v in ["int", "long", "integer"]: + props_list.append(f"{k}:long") + elif v in ["int[]", "long[]", "integer[]"]: + props_list.append(f"{k}:long[]") + elif v in ["float", "double"]: + props_list.append(f"{k}:double") + elif v in ["float[]", "double[]"]: + props_list.append(f"{k}:double[]") + elif v in [ + "bool", + "boolean", + ]: # TODO does Neo4j support bool? + props_list.append(f"{k}:boolean") + elif v in ["bool[]", "boolean[]"]: + props_list.append(f"{k}:boolean[]") + elif v in ["str[]", "string[]"]: + props_list.append(f"{k}:string[]") + else: + props_list.append(f"{k}") + + skip_id = False + schema_label = None + + if label in ["IS_SOURCE_OF", "IS_TARGET_OF", "IS_PART_OF"]: + skip_id = True + elif not self.translator.ontology.mapping.extended_schema.get( + label + ): + # find label in schema by label_as_edge + for ( + k, + v, + ) in self.translator.ontology.mapping.extended_schema.items(): + if v.get("label_as_edge") == label: + schema_label = k + break + else: + schema_label = label + + out_list = [":START_ID"] + + if schema_label: + if ( + self.translator.ontology.mapping.extended_schema.get( + schema_label + ).get("use_id") + == False + ): + skip_id = True + + if not skip_id: + out_list.append("id") + + out_list.extend(props_list) + out_list.extend([":END_ID", ":TYPE"]) + + with open(header_path, "w", encoding="utf-8") as f: + # concatenate with delimiter + row = self.delim.join(out_list) + f.write(row) + + # add file path to neo4 admin import statement (import call file + # path may be different from actual file path) + import_call_header_path = os.path.join( + self.import_call_file_prefix, + header, + ) + import_call_parts_path = os.path.join( + self.import_call_file_prefix, + parts, + ) + self.import_call_edges.add( + (import_call_header_path, import_call_parts_path) + ) + + return True + + def _get_import_script_name(self) -> str: + """ + Returns the name of the neo4j admin import script + + Returns: + str: The name of the import script (ending in .sh) + """ + return "neo4j-admin-import-call.sh" + + def _construct_import_call(self) -> str: + """ + Function to construct the import call detailing folder and + individual node and edge headers and data files, as well as + delimiters and database name. Built after all data has been + processed to ensure that nodes are called before any edges. + + Returns: + str: a bash command for neo4j-admin import + """ + import_call = ( + f"{self.import_call_bin_prefix}neo4j-admin import " + f"--database={self.db_name} " + f'--delimiter="{self.escaped_delim}" ' + f'--array-delimiter="{self.escaped_adelim}" ' + ) + + if self.quote == "'": + import_call += f'--quote="{self.quote}" ' + else: + import_call += f"--quote='{self.quote}' " + + if self.wipe: + import_call += f"--force=true " + if self.skip_bad_relationships: + import_call += "--skip-bad-relationships=true " + if self.skip_duplicate_nodes: + import_call += "--skip-duplicate-nodes=true " + + # append node import calls + for header_path, parts_path in self.import_call_nodes: + import_call += f'--nodes="{header_path},{parts_path}" ' + + # append edge import calls + for header_path, parts_path in self.import_call_edges: + import_call += f'--relationships="{header_path},{parts_path}" ' + + return import_call diff --git a/biocypher/write/relational/__init__.py b/biocypher/write/relational/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/biocypher/write/relational/_postgresql.py b/biocypher/write/relational/_postgresql.py new file mode 100644 index 00000000..d839a0bc --- /dev/null +++ b/biocypher/write/relational/_postgresql.py @@ -0,0 +1,320 @@ +import os +import glob + +from biocypher._logger import logger +from biocypher.write._batch_writer import _BatchWriter + + +class _PostgreSQLBatchWriter(_BatchWriter): + """ + Class for writing node and edge representations to disk using the + format specified by PostgreSQL for the use of "COPY FROM...". Each batch + writer instance has a fixed representation that needs to be passed + at instantiation via the :py:attr:`schema` argument. The instance + also expects an ontology adapter via :py:attr:`ontology_adapter` to be able + to convert and extend the hierarchy. + + This class inherits from the abstract class "_BatchWriter" and implements the + PostgreSQL-specific methods: + + - _write_node_headers + - _write_edge_headers + - _construct_import_call + - _write_array_string + """ + + DATA_TYPE_LOOKUP = { + "str": "VARCHAR", # VARCHAR needs limit + "int": "INTEGER", + "long": "BIGINT", + "float": "NUMERIC", + "double": "NUMERIC", + "dbl": "NUMERIC", + "boolean": "BOOLEAN", + "str[]": "VARCHAR[]", + "string[]": "VARCHAR[]", + } + + def __init__(self, *args, **kwargs): + self._copy_from_csv_commands = set() + super().__init__(*args, **kwargs) + + def _get_default_import_call_bin_prefix(self): + """ + Method to provide the default string for the import call bin prefix. + + Returns: + str: The default location for the psql command + """ + return "" + + def _get_data_type(self, string) -> str: + try: + return self.DATA_TYPE_LOOKUP[string] + except KeyError: + logger.info( + 'Could not determine data type {string}. Using default "VARCHAR"' + ) + return "VARCHAR" + + def _write_array_string(self, string_list) -> str: + """ + Abstract method to write the string representation of an array into a .csv file + as required by the postgresql COPY command, with '{','}' brackets and ',' separation. + + Args: + string_list (list): list of ontology strings + + Returns: + str: The string representation of an array for postgres COPY + """ + string = ",".join(string_list) + string = f'"{{{string}}}"' + return string + + def _get_import_script_name(self) -> str: + """ + Returns the name of the psql import script + + Returns: + str: The name of the import script (ending in .sh) + """ + return f"{self.db_name}-import-call.sh" + + def _adjust_pascal_to_psql(self, string): + string = string.replace(".", "_") + string = string.lower() + return string + + def _write_node_headers(self): + """ + Writes single CSV file for a graph entity that is represented + as a node as per the definition in the `schema_config.yaml`, + containing only the header for this type of node. + + Returns: + bool: The return value. True for success, False otherwise. + """ + # load headers from data parse + if not self.node_property_dict: + logger.error( + "Header information not found. Was the data parsed first?", + ) + return False + + for label, props in self.node_property_dict.items(): + # create header CSV with ID, properties, labels + + # translate label to PascalCase + pascal_label = self.translator.name_sentence_to_pascal(label) + + parts = f"{pascal_label}-part*.csv" + parts_paths = os.path.join(self.outdir, parts) + parts_paths = glob.glob(parts_paths) + parts_paths.sort() + + # adjust label for import to psql + pascal_label = self._adjust_pascal_to_psql(pascal_label) + table_create_command_path = os.path.join( + self.outdir, + f"{pascal_label}-create_table.sql", + ) + + # check if file already exists + if os.path.exists(table_create_command_path): + logger.warning( + f"File {table_create_command_path} already exists. Overwriting.", + ) + + # concatenate key:value in props + columns = ["_ID VARCHAR"] + for col_name, col_type in props.items(): + col_type = self._get_data_type(col_type) + col_name = self._adjust_pascal_to_psql(col_name) + columns.append(f"{col_name} {col_type}") + columns.append("_LABEL VARCHAR[]") + + with open(table_create_command_path, "w", encoding="utf-8") as f: + command = "" + if self.wipe: + command += f"DROP TABLE IF EXISTS {pascal_label};\n" + + # table creation requires comma separation + command += ( + f'CREATE TABLE {pascal_label}({",".join(columns)});\n' + ) + f.write(command) + + for parts_path in parts_paths: + # if import_call_file_prefix is set, replace actual path + # with prefix + if self.import_call_file_prefix != self.outdir: + parts_path = parts_path.replace( + self.outdir, + self.import_call_file_prefix, + ) + + self._copy_from_csv_commands.add( + f"\\copy {pascal_label} FROM '{parts_path}' DELIMITER E'{self.delim}' CSV;" + ) + + # add file path to import statement + # if import_call_file_prefix is set, replace actual path + # with prefix + if self.import_call_file_prefix != self.outdir: + table_create_command_path = table_create_command_path.replace( + self.outdir, + self.import_call_file_prefix, + ) + + self.import_call_nodes.add(table_create_command_path) + + return True + + def _write_edge_headers(self): + """ + Writes single CSV file for a graph entity that is represented + as an edge as per the definition in the `schema_config.yaml`, + containing only the header for this type of edge. + + Returns: + bool: The return value. True for success, False otherwise. + """ + # load headers from data parse + if not self.edge_property_dict: + logger.error( + "Header information not found. Was the data parsed first?", + ) + return False + + for label, props in self.edge_property_dict.items(): + # translate label to PascalCase + pascal_label = self.translator.name_sentence_to_pascal(label) + + parts_paths = os.path.join(self.outdir, f"{pascal_label}-part*.csv") + parts_paths = glob.glob(parts_paths) + parts_paths.sort() + + # adjust label for import to psql + pascal_label = self._adjust_pascal_to_psql(pascal_label) + table_create_command_path = os.path.join( + self.outdir, + f"{pascal_label}-create_table.sql", + ) + + # check for file exists + if os.path.exists(table_create_command_path): + logger.warning( + f"File {table_create_command_path} already exists. Overwriting.", + ) + + # concatenate key:value in props + columns = [] + for col_name, col_type in props.items(): + col_type = self._get_data_type(col_type) + col_name = self._adjust_pascal_to_psql(col_name) + if col_name == "_ID": + # should ideally never happen + raise ValueError( + "Column name '_ID' is reserved for internal use, " + "denoting the relationship ID. Please choose a " + "different name for your column." + ) + + columns.append(f"{col_name} {col_type}") + + # create list of lists and flatten + # removes need for empty check of property list + out_list = [ + "_START_ID VARCHAR", + "_ID VARCHAR", + *columns, + "_END_ID VARCHAR", + "_TYPE VARCHAR", + ] + + with open(table_create_command_path, "w", encoding="utf-8") as f: + command = "" + if self.wipe: + command += f"DROP TABLE IF EXISTS {pascal_label};\n" + + # table creation requires comma separation + command += ( + f'CREATE TABLE {pascal_label}({",".join(out_list)});\n' + ) + f.write(command) + + for parts_path in parts_paths: + # if import_call_file_prefix is set, replace actual path + # with prefix + if self.import_call_file_prefix != self.outdir: + parts_path = parts_path.replace( + self.outdir, + self.import_call_file_prefix, + ) + + self._copy_from_csv_commands.add( + f"\\copy {pascal_label} FROM '{parts_path}' DELIMITER E'{self.delim}' CSV;" + ) + + # add file path to import statement + # if import_call_file_prefix is set, replace actual path + # with prefix + if self.import_call_file_prefix != self.outdir: + table_create_command_path = table_create_command_path.replace( + self.outdir, + self.import_call_file_prefix, + ) + + self.import_call_edges.add(table_create_command_path) + + return True + + def _construct_import_call(self) -> str: + """ + Function to construct the import call detailing folder and + individual node and edge headers and data files, as well as + delimiters and database name. Built after all data has been + processed to ensure that nodes are called before any edges. + + Returns: + str: a bash command for postgresql import + """ + import_call = "" + + # create tables + # At this point, csv files of nodes and edges do not require differentiation + for import_file_path in [ + *self.import_call_nodes, + *self.import_call_edges, + ]: + import_call += f'echo "Setup {import_file_path}..."\n' + if {self.db_password}: + # set password variable inline + import_call += f"PGPASSWORD={self.db_password} " + import_call += ( + f"{self.import_call_bin_prefix}psql -f {import_file_path}" + ) + import_call += f" --dbname {self.db_name}" + import_call += f" --host {self.db_host}" + import_call += f" --port {self.db_port}" + import_call += f" --user {self.db_user}" + import_call += '\necho "Done!"\n' + import_call += "\n" + + # copy data to tables + for command in self._copy_from_csv_commands: + table_part = command.split(" ")[3] + import_call += f'echo "Importing {table_part}..."\n' + if {self.db_password}: + # set password variable inline + import_call += f"PGPASSWORD={self.db_password} " + import_call += f'{self.import_call_bin_prefix}psql -c "{command}"' + import_call += f" --dbname {self.db_name}" + import_call += f" --host {self.db_host}" + import_call += f" --port {self.db_port}" + import_call += f" --user {self.db_user}" + import_call += '\necho "Done!"\n' + import_call += "\n" + + return import_call diff --git a/biocypher/write/write.py b/biocypher/write/write.py new file mode 100644 index 00000000..76f8fec9 --- /dev/null +++ b/biocypher/write/write.py @@ -0,0 +1,105 @@ +#!/usr/bin/env python + +# +# Copyright 2021, Heidelberg University Clinic +# +# File author(s): Sebastian Lobentanzer +# Michael Hartung +# +# Distributed under MIT licence, see the file `LICENSE`. +# +""" +BioCypher 'offline' module. Handles the writing of node and edge representations +suitable for import into a DBMS. +""" + +from biocypher._logger import logger +from biocypher.write.graph._neo4j import _Neo4jBatchWriter +from biocypher.write.graph._arangodb import _ArangoDBBatchWriter +from biocypher.write.relational._sqlite import _SQLiteBatchWriter +from biocypher.write.relational._postgresql import _PostgreSQLBatchWriter + +logger.debug(f"Loading module {__name__}.") + +from typing import TYPE_CHECKING + +from biocypher._config import config as _config + +__all__ = ["get_writer"] + +if TYPE_CHECKING: + from biocypher._translate import Translator + from biocypher._deduplicate import Deduplicator + +DBMS_TO_CLASS = { + "neo": _Neo4jBatchWriter, + "neo4j": _Neo4jBatchWriter, + "Neo4j": _Neo4jBatchWriter, + "postgres": _PostgreSQLBatchWriter, + "postgresql": _PostgreSQLBatchWriter, + "PostgreSQL": _PostgreSQLBatchWriter, + "arango": _ArangoDBBatchWriter, + "arangodb": _ArangoDBBatchWriter, + "ArangoDB": _ArangoDBBatchWriter, + "sqlite": _SQLiteBatchWriter, + "sqlite3": _SQLiteBatchWriter, +} + + +def get_writer( + dbms: str, + translator: "Translator", + deduplicator: "Deduplicator", + output_directory: str, + strict_mode: bool, +): + """ + Function to return the writer class based on the selection in the config + file. + + Args: + + dbms: the database management system; for options, see DBMS_TO_CLASS. + + translator: the Translator object. + + output_directory: the directory to write the output files to. + + strict_mode: whether to use strict mode. + + Returns: + + instance: an instance of the selected writer class. + + """ + + dbms_config = _config(dbms) + + writer = DBMS_TO_CLASS[dbms] + + if not writer: + raise ValueError(f"Unknown dbms: {dbms}") + + if writer is not None: + return writer( + translator=translator, + deduplicator=deduplicator, + delimiter=dbms_config.get("delimiter"), + array_delimiter=dbms_config.get("array_delimiter"), + quote=dbms_config.get("quote_character"), + output_directory=output_directory, + db_name=dbms_config.get("database_name"), + import_call_bin_prefix=dbms_config.get("import_call_bin_prefix"), + import_call_file_prefix=dbms_config.get("import_call_file_prefix"), + wipe=dbms_config.get("wipe"), + strict_mode=strict_mode, + skip_bad_relationships=dbms_config.get( + "skip_bad_relationships" + ), # neo4j + skip_duplicate_nodes=dbms_config.get( + "skip_duplicate_nodes" + ), # neo4j + db_user=dbms_config.get("user"), # psql + db_password=dbms_config.get("password"), # psql + db_port=dbms_config.get("port"), # psql + ) diff --git a/test/__init__.py b/test/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/test/conftest.py b/test/conftest.py index adfcd385..ea4dea32 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -1,25 +1,19 @@ -import os +from glob import glob import shutil -import subprocess -from neo4j.exceptions import ServiceUnavailable +from fixtures.ontology import hybrid_ontology import pytest -from biocypher import config as bcy_config -from biocypher._core import BioCypher -from biocypher._write import ( - _Neo4jBatchWriter, - _ArangoDBBatchWriter, - _PostgreSQLBatchWriter, -) -from biocypher._create import BioCypherEdge, BioCypherNode, BioCypherRelAsNode from biocypher._pandas import Pandas -from biocypher._connect import _Neo4jDriver -from biocypher._mapping import OntologyMapping -from biocypher._ontology import Ontology, OntologyAdapter from biocypher._translate import Translator from biocypher._deduplicate import Deduplicator +# load all fixtures from the fixtures directory +pytest_plugins = [ + fixture_file.replace("/", ".").replace(".py", "") + for fixture_file in glob("test/fixtures/[!__]*.py", recursive=True) +] + # CLI option parser def pytest_addoption(parser): @@ -80,598 +74,19 @@ def remove_tmp_dir(): request.addfinalizer(remove_tmp_dir) -# biocypher node generator -@pytest.fixture(scope="function") -def _get_nodes(length: int) -> list: - nodes = [] - for i in range(length): - bnp = BioCypherNode( - node_id=f"p{i+1}", - node_label="protein", - preferred_id="uniprot", - properties={ - "score": 4 / (i + 1), - "name": "StringProperty1", - "taxon": 9606, - "genes": ["gene1", "gene2"], - }, - ) - nodes.append(bnp) - bnm = BioCypherNode( - node_id=f"m{i+1}", - node_label="microRNA", - preferred_id="mirbase", - properties={ - "name": "StringProperty1", - "taxon": 9606, - }, - ) - nodes.append(bnm) - - return nodes - - -@pytest.fixture(scope="function") -def _get_nodes_non_compliant_names(length: int) -> list: - nodes = [] - for i in range(length): - bnp = BioCypherNode( - node_id=f"p{i+1}", - node_label="Patient (person)", - preferred_id="snomedct", - properties={}, - ) - nodes.append(bnp) - bnm = BioCypherNode( - node_id=f"m{i+1}", - node_label="1$He524ll list: + nodes = [] + for i in range(length): + bnp = BioCypherNode( + node_id=f"p{i+1}", + node_label="protein", + preferred_id="uniprot", + properties={ + "score": 4 / (i + 1), + "name": "StringProperty1", + "taxon": 9606, + "genes": ["gene1", "gene2"], + }, + ) + nodes.append(bnp) + bnm = BioCypherNode( + node_id=f"m{i+1}", + node_label="microRNA", + preferred_id="mirbase", + properties={ + "name": "StringProperty1", + "taxon": 9606, + }, + ) + nodes.append(bnm) + + return nodes + + +@pytest.fixture(scope="function") +def _get_nodes_non_compliant_names(length: int) -> list: + nodes = [] + for i in range(length): + bnp = BioCypherNode( + node_id=f"p{i+1}", + node_label="Patient (person)", + preferred_id="snomedct", + properties={}, + ) + nodes.append(bnp) + bnm = BioCypherNode( + node_id=f"m{i+1}", + node_label="1$He524ll Date: Fri, 8 Mar 2024 16:16:21 +0100 Subject: [PATCH 323/343] #314: add sqlite output adapter --- biocypher/_config/biocypher_config.yaml | 12 ++++++ biocypher/write/relational/_sqlite.py | 52 +++++++++++++++++++++++++ test/fixtures/sqlite.py | 22 +++++++++++ test/write/__init__.py | 0 test/write/relational/__init__.py | 0 test/write/relational/test__sqlite.py | 44 +++++++++++++++++++++ 6 files changed, 130 insertions(+) create mode 100644 biocypher/write/relational/_sqlite.py create mode 100644 test/fixtures/sqlite.py create mode 100644 test/write/__init__.py create mode 100644 test/write/relational/__init__.py create mode 100644 test/write/relational/test__sqlite.py diff --git a/biocypher/_config/biocypher_config.yaml b/biocypher/_config/biocypher_config.yaml index 89b94bce..42f05649 100644 --- a/biocypher/_config/biocypher_config.yaml +++ b/biocypher/_config/biocypher_config.yaml @@ -114,3 +114,15 @@ postgresql: delimiter: '\t' # import_call_bin_prefix: '' # path to "psql" # import_call_file_prefix: '/path/to/files' + +sqlite: + ### SQLite configuration ### + + # SQLite connection credentials + database_name: sqlite.db # DB name + + # SQLite import batch writer settings + quote_character: '"' + delimiter: '\t' + # import_call_bin_prefix: '' # path to "sqlite3" + # import_call_file_prefix: '/path/to/files' diff --git a/biocypher/write/relational/_sqlite.py b/biocypher/write/relational/_sqlite.py new file mode 100644 index 00000000..c69f9ba9 --- /dev/null +++ b/biocypher/write/relational/_sqlite.py @@ -0,0 +1,52 @@ +from biocypher.write.relational._postgresql import _PostgreSQLBatchWriter + + +class _SQLiteBatchWriter(_PostgreSQLBatchWriter): + """ + Class for writing node and edge representations to a SQLite database. + It uses the _PostgreSQLBatchWriter class under the hood, which already + implements the logic to write the nodes/edges to a relational DBMS. + Only the import bash script differs between PostgreSQL and SQLite + and is therefore implemented in this class. + + - _construct_import_call + """ + + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + def _construct_import_call(self) -> str: + """ + Function to construct the import call detailing folder and + individual node and edge headers and data files, as well as + delimiters and database name. Built after all data has been + processed to ensure that nodes are called before any edges. + + Returns: + str: a bash command for sqlite import + """ + import_call = "" + + # create tables + # At this point, csv files of nodes and edges do not require differentiation + for import_file_path in [ + *self.import_call_nodes, + *self.import_call_edges, + ]: + import_call += f'echo "Setup {import_file_path}..."\n' + import_call += f"{self.import_call_bin_prefix}sqlite3 {self.db_name} < {import_file_path}" + import_call += '\necho "Done!"\n' + import_call += "\n" + + for command in self._copy_from_csv_commands: + table_name = command.split(" ")[1] + table_part = command.split(" ")[3].replace("'", "") + import_call += f'echo "Importing {table_part}..."\n' + # TODO: separator = self.delimiter + separator = r"\t" + import_part = f".import {table_part} {table_name}" + import_call += f"{self.import_call_bin_prefix}sqlite3 -separator $'{separator}' {self.db_name} \"{import_part}\"" + import_call += '\necho "Done!"\n' + import_call += "\n" + + return import_call diff --git a/test/fixtures/sqlite.py b/test/fixtures/sqlite.py new file mode 100644 index 00000000..01a9b7cc --- /dev/null +++ b/test/fixtures/sqlite.py @@ -0,0 +1,22 @@ +import os + +import pytest + +from biocypher.write.relational._sqlite import _SQLiteBatchWriter + + +@pytest.fixture(scope="function") +def bw_tab_sqlite(translator, deduplicator, tmp_path_session): + bw_tab = _SQLiteBatchWriter( + db_name="test_sqlite.db", + translator=translator, + deduplicator=deduplicator, + output_directory=tmp_path_session, + delimiter="\\t", + ) + + yield bw_tab + + # teardown + for f in os.listdir(tmp_path_session): + os.remove(os.path.join(tmp_path_session, f)) diff --git a/test/write/__init__.py b/test/write/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/test/write/relational/__init__.py b/test/write/relational/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/test/write/relational/test__sqlite.py b/test/write/relational/test__sqlite.py new file mode 100644 index 00000000..66df7492 --- /dev/null +++ b/test/write/relational/test__sqlite.py @@ -0,0 +1,44 @@ +import os +import subprocess + +import pytest + + +@pytest.mark.parametrize("length", [4], scope="module") +def test__construct_import_call(bw_tab_sqlite, _get_nodes): + nodes = _get_nodes + + def node_gen(nodes): + yield from nodes + + passed = bw_tab_sqlite.write_nodes(node_gen(nodes), batch_size=1e6) + + tmp_path = bw_tab_sqlite.outdir + + protein_csv = os.path.join(tmp_path, "Protein-part000.csv") + micro_rna_csv = os.path.join(tmp_path, "MicroRNA-part000.csv") + + with open(protein_csv) as f: + protein = f.read() + + with open(micro_rna_csv) as f: + micro_rna = f.read() + + assert passed + assert 'p1\t"StringProperty1"\t4.0\t9606\t' in protein + assert '\t"uniprot"\t' in protein + assert "BiologicalEntity" in protein + assert "Polypeptide" in protein + assert "Protein" in protein + assert 'm1\t"StringProperty1"\t9606\t"m1"\t"mirbase"' in micro_rna + assert "ChemicalEntity" in micro_rna + + import_call = bw_tab_sqlite._construct_import_call() + assert "sqlite3 test_sqlite.db <" in import_call + assert "protein-create_table.sql" in import_call + assert "microrna-create_table.sql" in import_call + assert "sqlite3 -separator $'\\t' test_sqlite.db \".import" in import_call + assert "Protein-part000.csv protein" in import_call + assert "MicroRNA-part000.csv microrna" in import_call + + subprocess.check_output(import_call, shell=True) From 068b663e0c92b3e4f2e58467af01a54b6874e5da Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Fri, 8 Mar 2024 16:24:53 +0100 Subject: [PATCH 324/343] #322: fix import --- test/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/conftest.py b/test/conftest.py index ea4dea32..d6cb3d07 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -1,7 +1,7 @@ from glob import glob +from test.fixtures.ontology import hybrid_ontology import shutil -from fixtures.ontology import hybrid_ontology import pytest from biocypher._pandas import Pandas From 14adafeacac03cc59efbfdc4c0adf5f17fe3457a Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Fri, 8 Mar 2024 17:29:03 +0100 Subject: [PATCH 325/343] 314: improve sqlite test case to also test db content --- biocypher/write/relational/_sqlite.py | 3 +-- test/fixtures/sqlite.py | 2 ++ test/write/relational/test__sqlite.py | 31 +++++++++++++++++++++++++-- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/biocypher/write/relational/_sqlite.py b/biocypher/write/relational/_sqlite.py index c69f9ba9..4133a3f0 100644 --- a/biocypher/write/relational/_sqlite.py +++ b/biocypher/write/relational/_sqlite.py @@ -42,8 +42,7 @@ def _construct_import_call(self) -> str: table_name = command.split(" ")[1] table_part = command.split(" ")[3].replace("'", "") import_call += f'echo "Importing {table_part}..."\n' - # TODO: separator = self.delimiter - separator = r"\t" + separator = self.delim import_part = f".import {table_part} {table_name}" import_call += f"{self.import_call_bin_prefix}sqlite3 -separator $'{separator}' {self.db_name} \"{import_part}\"" import_call += '\necho "Done!"\n' diff --git a/test/fixtures/sqlite.py b/test/fixtures/sqlite.py index 01a9b7cc..8d951fed 100644 --- a/test/fixtures/sqlite.py +++ b/test/fixtures/sqlite.py @@ -20,3 +20,5 @@ def bw_tab_sqlite(translator, deduplicator, tmp_path_session): # teardown for f in os.listdir(tmp_path_session): os.remove(os.path.join(tmp_path_session, f)) + + os.remove("test_sqlite.db") diff --git a/test/write/relational/test__sqlite.py b/test/write/relational/test__sqlite.py index 66df7492..4d52ff97 100644 --- a/test/write/relational/test__sqlite.py +++ b/test/write/relational/test__sqlite.py @@ -1,4 +1,5 @@ import os +import sqlite3 import subprocess import pytest @@ -37,8 +38,34 @@ def node_gen(nodes): assert "sqlite3 test_sqlite.db <" in import_call assert "protein-create_table.sql" in import_call assert "microrna-create_table.sql" in import_call - assert "sqlite3 -separator $'\\t' test_sqlite.db \".import" in import_call + assert "sqlite3 -separator $'\t' test_sqlite.db \".import" in import_call assert "Protein-part000.csv protein" in import_call assert "MicroRNA-part000.csv microrna" in import_call - subprocess.check_output(import_call, shell=True) + write_result = bw_tab_sqlite.write_import_call() + assert write_result + + import_script_path = os.path.join( + bw_tab_sqlite.outdir, bw_tab_sqlite._get_import_script_name() + ) + output = subprocess.run(["bash", import_script_path]) + + conn = sqlite3.connect("test_sqlite.db") + cursor = conn.cursor() + + cursor.execute("SELECT name FROM sqlite_master WHERE type='table';") + tables = cursor.fetchall() + table_names = [row[0] for row in tables] + assert "protein" in table_names + assert "microrna" in table_names + + cursor.execute("SELECT * FROM protein") + proteins = cursor.fetchall() + assert len(proteins) == 4 + + cursor.execute("SELECT * FROM microrna") + microrna = cursor.fetchall() + assert len(microrna) == 4 + + cursor.close() + conn.close() From 0681194d4c26b60e3985f77da2bd191620ca5f1c Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Sat, 9 Mar 2024 12:27:53 +0100 Subject: [PATCH 326/343] #322: adapt API docs to handle nested structure --- biocypher/_core.py | 2 +- biocypher/write/{write.py => _write.py} | 0 docs/api.rst | 16 +++++++++------- docs/conf.py | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) rename biocypher/write/{write.py => _write.py} (100%) diff --git a/biocypher/_core.py b/biocypher/_core.py index a04ce98c..c9972d62 100644 --- a/biocypher/_core.py +++ b/biocypher/_core.py @@ -26,7 +26,7 @@ logger.debug(f"Loading module {__name__}.") -from biocypher.write.write import DBMS_TO_CLASS, get_writer +from biocypher.write._write import DBMS_TO_CLASS, get_writer from ._get import Downloader from ._config import config as _config from ._config import update_from_file as _file_update diff --git a/biocypher/write/write.py b/biocypher/write/_write.py similarity index 100% rename from biocypher/write/write.py rename to biocypher/write/_write.py diff --git a/docs/api.rst b/docs/api.rst index d0dffaa1..7defb36b 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -75,18 +75,20 @@ methods, which accept collections of nodes and edges either as :ref:`tuples :meth:`BioCypher.summary`. See the :class:`BioCypher` :ref:`class ` for more information. -Details about the :mod:`biocypher._write` module responsible for these methods +Details about the :mod:`biocypher.write` module responsible for these methods can be found below. -.. module:: biocypher._write +.. module:: biocypher.write + .. autosummary:: :toctree: modules - get_writer - _BatchWriter - _Neo4jBatchWriter - _PostgreSQLBatchWriter - _ArangoDBBatchWriter + _write.get_writer + _batch_writer._BatchWriter + graph._neo4j._Neo4jBatchWriter + graph._arangodb._ArangoDBBatchWriter + relational._postgresql._PostgreSQLBatchWriter + relational._sqlite._SQLiteBatchWriter .. api_pandas: diff --git a/docs/conf.py b/docs/conf.py index baa039e8..15eb25c3 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -3,7 +3,6 @@ # This file only contains a selection of the most common options. For a full # list see the documentation: # https://www.sphinx-doc.org/en/master/usage/configuration.html - # -- Path setup -------------------------------------------------------------- from datetime import datetime @@ -56,6 +55,7 @@ "nbsphinx", ] myst_enable_extensions = ["colon_fence"] +autosummary_generate = True # Add any paths that contain templates here, relative to this directory. templates_path = ["_templates"] From 37696d66e7f62a0e8f7bba4a35f130f1f256b309 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Sat, 9 Mar 2024 18:11:05 +0100 Subject: [PATCH 327/343] #314: improve output format docs and add descriptions for postgresql and sqlite --- docs/contents.rst | 2 +- docs/installation.md | 56 --------------- docs/{ => output}/DBMS-Terminal.png | Bin docs/{ => output}/DBMS.png | Bin docs/output/arangodb.md | 3 + docs/output/index.rst | 33 +++++++++ docs/{ => output}/neo4j.md | 108 ++++++++++++++++++---------- docs/output/postgres.md | 76 ++++++++++++++++++++ docs/output/sqlite.md | 62 ++++++++++++++++ 9 files changed, 246 insertions(+), 94 deletions(-) rename docs/{ => output}/DBMS-Terminal.png (100%) rename docs/{ => output}/DBMS.png (100%) create mode 100644 docs/output/arangodb.md create mode 100644 docs/output/index.rst rename docs/{ => output}/neo4j.md (86%) create mode 100644 docs/output/postgres.md create mode 100644 docs/output/sqlite.md diff --git a/docs/contents.rst b/docs/contents.rst index e6a0583d..9679271a 100644 --- a/docs/contents.rst +++ b/docs/contents.rst @@ -13,6 +13,6 @@ tutorial-ontology tutorial-adapter standalone-docker-image - neo4j + output/index r-bioc api diff --git a/docs/installation.md b/docs/installation.md index 2daf286a..b22537e1 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -160,59 +160,3 @@ biocypher: ### BioCypher module configuration ### tail_join_node: disease ``` - -## Neo4j settings -```{code-block} yaml -:caption: biocypher_config.yaml - -neo4j: ### Neo4j configuration ### - - # Database name - database_name: neo4j - - # Wipe DB before import (offline mode: --force) - wipe: true - - # Neo4j authentication - uri: neo4j://localhost:7687 - user: neo4j - password: neo4j - - # Neo4j admin import batch writer settings - delimiter: ';' - array_delimiter: '|' - quote_character: "'" - - # MultiDB functionality - # Set to false for using community edition or older versions of Neo4j - multi_db: true - - # Import options - skip_duplicate_nodes: false - skip_bad_relationships: false - - # Import call prefixes to adjust the autogenerated shell script - import_call_bin_prefix: bin/ # path to "neo4j-admin" - import_call_file_prefix: path/to/files/ - -``` - -## PostgreSQL settings -```{code-block} yaml -:caption: biocypher_config.yaml - -postgresql: ### PostgreSQL configuration ### - - # PostgreSQL connection credentials - database_name: postgres - user: postgres - password: postgres - port: 5432 - - # PostgreSQL import batch writer settings - quote_character: '"' - delimiter: '\t' - - # Import call prefixes to adjust the autogenerated shell script - import_call_bin_prefix: '' # path to "psql" - import_call_file_prefix: /path/to/files/ diff --git a/docs/DBMS-Terminal.png b/docs/output/DBMS-Terminal.png similarity index 100% rename from docs/DBMS-Terminal.png rename to docs/output/DBMS-Terminal.png diff --git a/docs/DBMS.png b/docs/output/DBMS.png similarity index 100% rename from docs/DBMS.png rename to docs/output/DBMS.png diff --git a/docs/output/arangodb.md b/docs/output/arangodb.md new file mode 100644 index 00000000..95ec675c --- /dev/null +++ b/docs/output/arangodb.md @@ -0,0 +1,3 @@ +# ArangoDB + +Coming soon diff --git a/docs/output/index.rst b/docs/output/index.rst new file mode 100644 index 00000000..bc3ae7b7 --- /dev/null +++ b/docs/output/index.rst @@ -0,0 +1,33 @@ +###### +Output +###### + +BioCypher development was initially centred around a Neo4j graph database output +due to the migration of OmniPath to a Neo4j backend. Importantly, we understand +BioCypher as an abstraction of the build process of a biomedical knowledge graph, +and thus are open towards any output format for the knowledge representation. We +are currently working on other output formats, such as RDF, SQL, and ArangoDB, +and will update the documentation accordingly. + +The used output format is specified via the ``dbms`` parameter in the ``biocypher_config.yaml`` (see the :ref:`config` for an example). +Currently supported are ``neo4j``, ``arangodb``, ``postgres``, and ``sqlite``. + +Furthermore you can specify whether to use the ``offline`` or ``online`` mode. + +- For the online mode set ``offline: false``. You need a running database instance and BioCypher will connect to this instance and directly writes the output to the database. +- For the offline mode set ``offline: true``. BioCypher will write the knowledge graph to files in a designated output folder (standard being ``biocypher-out/`` and the current datetime). Furthermore you can generate a bash script to insert the knowledge graph files into the specified ``dbms`` by running ``bc.write_import_call()``. + +.. caution:: + + The ``online`` mode is currently only supported for the ``neo4j`` database. + + +Details about the usage of the ``online`` and ``offline`` mode and the different supported output formats are described on the following pages: + +.. toctree:: + :maxdepth: 2 + + neo4j.md + arangodb.md + postgres.md + sqlite.md diff --git a/docs/neo4j.md b/docs/output/neo4j.md similarity index 86% rename from docs/neo4j.md rename to docs/output/neo4j.md index a90e5647..e35115c1 100644 --- a/docs/neo4j.md +++ b/docs/output/neo4j.md @@ -1,34 +1,79 @@ +(neo4j_tut)= +# Neo4j -# Interacting with Neo4j - -BioCypher development was initially centred around a Neo4j graph database output -due to the migration of OmniPath to a Neo4j backend. Importantly, we understand -BioCypher as an abstration of the build process of a biomedical knowledge graph, -and thus are open towards any output format for the knowledge representation. We -are currently working on other output formats, such as RDF, SQL, and ArangoDB, -and will update the documentation accordingly. In the following section, we give +In the following section, we give an overview of interacting with Neo4j from the perspective of BioCypher, but we refer the reader to the Neo4j documentation for more details. +## Install Neo4j + +```{note} +Neo4j provide a [Neo4j Desktop +application](https://neo4j.com/download-center/#desktop) that can be used to +create a local instance of Neo4j. The desktop application provides information +about the DBMS folder and can open a terminal at the DBMS root location. The +import call generated by BioCypher can then be copied into the terminal of the +Neo4j Desktop application for each corresponding DBMS. + +Neo4j is also available as a command line interface (CLI) tool. To use the CLI +with the BioCypher admin import call, directory structures and permissions need +to be set up correctly. The Neo4j CLI tool can be downloaded from the [Neo4j +download center](https://neo4j.com/download-center/#community). Please follow +the [Neo4j documentation](https://neo4j.com/docs/) for correct setup and usage +on your system. + +Be mindful that different versions of Neo4j may differ in features and thus are +also documented differently. +``` + ```{note} We use the APOC library for Neo4j, which is not included automatically, but needs to be installed as a plugin to the DMBS. For more information, please refer to the [APOC documentation](https://neo4j.com/labs/apoc/). ``` -## Communication via the Neo4j Python Driver +## Neo4j settings -BioCypher provides a Python driver for interacting with Neo4j, which is -accessed through the ``BioCypher`` class when setting `offline` to `False`. -More details can be found in the [API docs](api_connect). +To overwrite the standard settings of Neo4j, add a `neo4j` section to the `biocypher_config.yaml` file. +The following settings are possible: -If there exists no BioCypher graph in the currently active database, or -if the user explicitly specifies so using the ``wipe`` attribute of the -driver, a new BioCypher database is created using the schema -configuration specified in the [schema-config.yaml](tut_01_schema). +```{code-block} yaml +:caption: biocypher_config.yaml + +neo4j: ### Neo4j configuration ### + + # Database name + database_name: neo4j + + # Wipe DB before import (offline mode: --force) + wipe: true + + # Neo4j authentication + uri: neo4j://localhost:7687 + user: neo4j + password: neo4j + + # Neo4j admin import batch writer settings + delimiter: ';' + array_delimiter: '|' + quote_character: "'" + + # MultiDB functionality + # Set to false for using community edition or older versions of Neo4j + multi_db: true + + # Import options + skip_duplicate_nodes: false + skip_bad_relationships: false + + # Import call prefixes to adjust the autogenerated shell script + import_call_bin_prefix: bin/ # path to "neo4j-admin" + import_call_file_prefix: path/to/files/ + +``` (admin_import)= -## Exporting for the `neo4j-admin import` feature +## Offline mode Particularly if the data are very extensive (or performance is of the utmost priority), BioCypher can be used to facilitate a speedy and safe @@ -49,7 +94,7 @@ with a running database, with the data representation being converted to a series of CSV files in a designated output folder (standard being ``biocypher-out/`` and the current datetime). BioCypher creates separate header and data files for all node and edge types to be represented in the graph. -Additionally, it creates a file called ``neo4j-admin-import-call.txt`` +Additionally, it creates a file called ``neo4j-admin-import-call.sh`` containing the console command for creating a new database, which only has to be executed from the directory of the currently running Neo4j database. @@ -63,9 +108,6 @@ running database (```` being the name assigned in the method): 2. ``create database `` 3. ``:use `` -(neo4j_tut)= -# Tutorial - Neo4j - After writing knowledge graph files with BioCypher in offline mode for the Neo4j DBMS (database management system), the graph can now be imported into Neo4j using the `neo4j-admin` command line tool. This is not necessary if the graph is @@ -132,21 +174,13 @@ refer to the Neo4j documentation to find the correct location of your DMBS. We are working on extensions of the BioCypher process to improve interoperability with Neo4j as well as other storage systems. -```{note} -Neo4j provide a [Neo4j Desktop -application](https://neo4j.com/download-center/#desktop) that can be used to -create a local instance of Neo4j. The desktop application provides information -about the DBMS folder and can open a terminal at the DBMS root location. The -import call generated by BioCypher can then be copied into the terminal of the -Neo4j Desktop application for each corresponding DBMS. +## Online mode -Neo4j is also available as a command line interface (CLI) tool. To use the CLI -with the BioCypher admin import call, directory structures and permissions need -to be set up correctly. The Neo4j CLI tool can be downloaded from the [Neo4j -download center](https://neo4j.com/download-center/#community). Please follow -the [Neo4j documentation](https://neo4j.com/docs/) for correct setup and usage -on your system. +BioCypher provides a Python driver for interacting with Neo4j, which is +accessed through the ``BioCypher`` class when setting `offline` to `False`. +More details can be found in the [API docs](api_connect). -Be mindful that different versions of Neo4j may differ in features and thus are -also documented differently. -``` +If there exists no BioCypher graph in the currently active database, or +if the user explicitly specifies so using the ``wipe`` attribute of the +driver, a new BioCypher database is created using the schema +configuration specified in the [schema-config.yaml](tut_01_schema). diff --git a/docs/output/postgres.md b/docs/output/postgres.md new file mode 100644 index 00000000..c1197e0b --- /dev/null +++ b/docs/output/postgres.md @@ -0,0 +1,76 @@ +# PostgreSQL + +When setting the `dbms` parameter in the `biocypher_config.yaml` to `postgres`, the BioCypher Knowledge Graph is written to a PostgreSQL database. +[PostgreSQL](https://www.postgresql.org/) is a relational database management system. + +## Install PostgreSQL + +To get a PostgreSQL instance running quickly, you can use Docker. The following command will start a PostgreSQL instance with the password `postgres` and the port `5432` exposed to the host system. + +``` +docker run --restart always --publish=5432:5432 --env POSTGRES_PASSWORD=postgres -d postgres +``` + +The ``postgresql-client`` (also known as ``psql`` command line tool) can be used to connect and interact with the running PostgreSQL database instance. Installation instructions can be found [here](https://www.postgresql.org/download/). + +## PostgreSQL settings + +To overwrite the standard settings of PostgreSQL, add a `postgresql` section to the `biocypher_config.yaml` file. +The following settings are possible: + +```{code-block} yaml +:caption: biocypher_config.yaml + +postgresql: ### PostgreSQL configuration ### + + # PostgreSQL connection credentials + database_name: postgres + user: postgres + password: postgres + port: 5432 + + # PostgreSQL import batch writer settings + quote_character: '"' + delimiter: '\t' + + # Import call prefixes to adjust the autogenerated shell script + import_call_bin_prefix: '' # path to "psql" + import_call_file_prefix: /path/to/files/ +``` + +## Offline mode + +### Running BioCypher + +After running BioCypher with the ``offline`` parameter set to ``true`` and the ``dbms`` set to ``postgres``, +the output folder contains: + +- ``entity-create_table.sql``: The SQL scripts to create the tables for the nodes/edges. Entity is replaced by your nodes and edges and for each node and edge type an own SQL script is generated. +- ``entity-part000.csv``: The CSV file containing the data for the entity. +- ``postgres-import-call.sh``: The import script to create a database with the SQL scripts and insert the data from the CSV files. + +```{note} +If the ``postgres-import-call.sh`` is missing, you can create it by running ``bc.write_import_call()``. +``` + +### Create the PostgreSQL database + +A running PostgreSQL instance (e.g. in a Docker container created with the command from above) is required to create the database and import the data. +By running the import script ``postgres-import-call.sh``, the content should be written to the PostgreSQL database. + +### Access the PostgreSQL database + +To check the content of the database, you can use the ``psql`` command line tool. + +First connect to the running PostgreSQL database instance: +```bash +psql -h localhost -p 5432 -U postgres +``` + +Then you can execute SQL queries. +For example, you can list all tables in the database by running the following command in the terminal: +```sql +SELECT table_name +FROM information_schema.tables +WHERE table_schema = 'public'; +``` diff --git a/docs/output/sqlite.md b/docs/output/sqlite.md new file mode 100644 index 00000000..72ad190d --- /dev/null +++ b/docs/output/sqlite.md @@ -0,0 +1,62 @@ +# SQLite + +When setting the `dbms` parameter in the `biocypher_config.yaml` to `sqlite`, the BioCypher Knowledge Graph is written to a SQLite database. +[SQLite](https://www.sqlite.org/) is a lightweight relational database management system. +It is suitable for fast prototyping and development. For more mature applications have a look at [PostgreSQL](postgres). + + + +## SQLite settings + +To overwrite the standard settings of SQLite, add a `sqlite` section to the `biocypher_config.yaml` file. +The following settings are possible: + +```{code-block} yaml +:caption: biocypher_config.yaml + +sqlite: + ### SQLite configuration ### + + database_name: sqlite.db # DB name + + # SQLite import batch writer settings + quote_character: '"' + delimiter: '\t' + # import_call_bin_prefix: '' # path to "sqlite3" + # import_call_file_prefix: '/path/to/files' +``` + +## Offline mode + +### Running BioCypher + +After running BioCypher with the ``offline`` parameter set to ``true`` and the ``dbms`` set to ``sqlite``, +the output folder contains: + +- ``entity-create_table.sql``: The SQL scripts to create the tables for the nodes/edges. Entity is replaced by your nodes and edges and for each node and edge type an own SQL script is generated. +- ``entity-part000.csv``: The CSV file containing the data for the entity. +- ``sqlite-import-call.sh``: The import script to create a database with the SQL scripts and insert the data from the CSV files. + +```{note} +If the ``sqlite-import-call.sh`` is missing, you can create it by running ``bc.write_import_call()``. +``` + +### Create the SQLite database + +To create the SQLite database, run the import script ``sqlite-import-call.sh``. +In the default case (without any changes to the ``database_name``in the configuration), the file containing the database is created with the name ``sqlite.db``. + +```{note} +The import script expects, that the sqlite3 command line tool is installed on your system. +``` + +### Access the SQLite database + +Now you can access the created SQLite database. +This can be done with the sqlite3 command line tool. +For example, you can list all tables in the database by running the following command in the terminal: +```bash +sqlite3 sqlite.db "SELECT name FROM sqlite_master WHERE type='table';" +``` From 2bc5ba88322e7c67c1e098323a23bbf961820a29 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Sat, 9 Mar 2024 18:26:46 +0100 Subject: [PATCH 328/343] #322: fix windows file pathes and imports --- test/conftest.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test/conftest.py b/test/conftest.py index d6cb3d07..a098e6f8 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -1,5 +1,6 @@ from glob import glob from test.fixtures.ontology import hybrid_ontology +import os import shutil import pytest @@ -10,8 +11,10 @@ # load all fixtures from the fixtures directory pytest_plugins = [ - fixture_file.replace("/", ".").replace(".py", "") - for fixture_file in glob("test/fixtures/[!__]*.py", recursive=True) + fixture_file.replace(os.sep, ".").replace(".py", "") + for fixture_file in glob( + f"test{os.sep}fixtures{os.sep}[!__]*.py", recursive=True + ) ] From 59e7c4a1b32b40444e628a6f1039d4caa7b4525c Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Mon, 11 Mar 2024 08:52:23 +0100 Subject: [PATCH 329/343] #314: fix tests on windows --- test/fixtures/sqlite.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/test/fixtures/sqlite.py b/test/fixtures/sqlite.py index 8d951fed..7463a3bb 100644 --- a/test/fixtures/sqlite.py +++ b/test/fixtures/sqlite.py @@ -19,6 +19,10 @@ def bw_tab_sqlite(translator, deduplicator, tmp_path_session): # teardown for f in os.listdir(tmp_path_session): - os.remove(os.path.join(tmp_path_session, f)) - - os.remove("test_sqlite.db") + try: + os.remove(os.path.join(tmp_path_session, f)) + except PermissionError: + # fix Windows error that once opened files can only be removed after a restart + # https://groups.google.com/g/python-sqlite/c/2KBI2cR-t70 + os.rename(f, f"{f}_renamed") + os.remove(f"{f}_renamed") From d34685282aed3b0f087e1dec0a2c0f7663734150 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Mon, 11 Mar 2024 09:27:17 +0100 Subject: [PATCH 330/343] #314: add debug output for windows error --- test/fixtures/sqlite.py | 20 +++++++++++++------- test/write/relational/test__sqlite.py | 5 +++++ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/test/fixtures/sqlite.py b/test/fixtures/sqlite.py index 7463a3bb..34d1e63b 100644 --- a/test/fixtures/sqlite.py +++ b/test/fixtures/sqlite.py @@ -19,10 +19,16 @@ def bw_tab_sqlite(translator, deduplicator, tmp_path_session): # teardown for f in os.listdir(tmp_path_session): - try: - os.remove(os.path.join(tmp_path_session, f)) - except PermissionError: - # fix Windows error that once opened files can only be removed after a restart - # https://groups.google.com/g/python-sqlite/c/2KBI2cR-t70 - os.rename(f, f"{f}_renamed") - os.remove(f"{f}_renamed") + remove_file(os.path.join(tmp_path_session, f)) + remove_file("test_sqlite.db") + + +def remove_file(file_path: str): + try: + os.remove(file_path) + except PermissionError: + # fix Windows error that once opened files can only be removed after a restart + # https://groups.google.com/g/python-sqlite/c/2KBI2cR-t70 + print("Permission error") + os.rename(file_path, f"renamed_{file_path}") + os.remove(f"renamed_{file_path}") diff --git a/test/write/relational/test__sqlite.py b/test/write/relational/test__sqlite.py index 4d52ff97..d932a215 100644 --- a/test/write/relational/test__sqlite.py +++ b/test/write/relational/test__sqlite.py @@ -45,10 +45,15 @@ def node_gen(nodes): write_result = bw_tab_sqlite.write_import_call() assert write_result + print("Import call:") + print(write_result) + print(bw_tab_sqlite._construct_import_call()) + import_script_path = os.path.join( bw_tab_sqlite.outdir, bw_tab_sqlite._get_import_script_name() ) output = subprocess.run(["bash", import_script_path]) + assert output.returncode == 0 conn = sqlite3.connect("test_sqlite.db") cursor = conn.cursor() From 264f356f86adf9da509979146143e2e8425c548b Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Mon, 11 Mar 2024 09:43:55 +0100 Subject: [PATCH 331/343] #314: correct call to bash script on all plattforms --- test/write/relational/test__sqlite.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/test/write/relational/test__sqlite.py b/test/write/relational/test__sqlite.py index d932a215..bdcf75d4 100644 --- a/test/write/relational/test__sqlite.py +++ b/test/write/relational/test__sqlite.py @@ -1,5 +1,6 @@ import os import sqlite3 +import platform import subprocess import pytest @@ -52,7 +53,16 @@ def node_gen(nodes): import_script_path = os.path.join( bw_tab_sqlite.outdir, bw_tab_sqlite._get_import_script_name() ) - output = subprocess.run(["bash", import_script_path]) + # output = subprocess.run(["bash", import_script_path]) + system = platform.system() + if system == "Windows": + output = subprocess.run( + ["cmd", "/c", import_script_path], check=True, shell=True + ) + elif system == "Linux" or system == "Darwin": + output = subprocess.run(["bash", import_script_path], check=True) + else: + raise OSError("Unsupported platform") assert output.returncode == 0 conn = sqlite3.connect("test_sqlite.db") From 6209a5ca354500ddc2dc1b6b75ba0d7eeb0a5a07 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Mon, 11 Mar 2024 10:02:56 +0100 Subject: [PATCH 332/343] #314: adapt test to handle platforms --- test/write/relational/test__sqlite.py | 37 ++++++++++++--------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/test/write/relational/test__sqlite.py b/test/write/relational/test__sqlite.py index bdcf75d4..4541ea7d 100644 --- a/test/write/relational/test__sqlite.py +++ b/test/write/relational/test__sqlite.py @@ -46,14 +46,9 @@ def node_gen(nodes): write_result = bw_tab_sqlite.write_import_call() assert write_result - print("Import call:") - print(write_result) - print(bw_tab_sqlite._construct_import_call()) - import_script_path = os.path.join( bw_tab_sqlite.outdir, bw_tab_sqlite._get_import_script_name() ) - # output = subprocess.run(["bash", import_script_path]) system = platform.system() if system == "Windows": output = subprocess.run( @@ -65,22 +60,24 @@ def node_gen(nodes): raise OSError("Unsupported platform") assert output.returncode == 0 - conn = sqlite3.connect("test_sqlite.db") - cursor = conn.cursor() + # TODO: check database creation on Windows + if system != "Windows": + conn = sqlite3.connect("test_sqlite.db") + cursor = conn.cursor() - cursor.execute("SELECT name FROM sqlite_master WHERE type='table';") - tables = cursor.fetchall() - table_names = [row[0] for row in tables] - assert "protein" in table_names - assert "microrna" in table_names + cursor.execute("SELECT name FROM sqlite_master WHERE type='table';") + tables = cursor.fetchall() + table_names = [row[0] for row in tables] + assert "protein" in table_names + assert "microrna" in table_names - cursor.execute("SELECT * FROM protein") - proteins = cursor.fetchall() - assert len(proteins) == 4 + cursor.execute("SELECT * FROM protein") + proteins = cursor.fetchall() + assert len(proteins) == 4 - cursor.execute("SELECT * FROM microrna") - microrna = cursor.fetchall() - assert len(microrna) == 4 + cursor.execute("SELECT * FROM microrna") + microrna = cursor.fetchall() + assert len(microrna) == 4 - cursor.close() - conn.close() + cursor.close() + conn.close() From 4ec1891805dc9ed93a658f156bacbfb9ae2e2d2b Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Mon, 11 Mar 2024 10:09:49 +0100 Subject: [PATCH 333/343] #314: fix teardwon for windows --- test/fixtures/sqlite.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/fixtures/sqlite.py b/test/fixtures/sqlite.py index 34d1e63b..af68b8dc 100644 --- a/test/fixtures/sqlite.py +++ b/test/fixtures/sqlite.py @@ -29,6 +29,8 @@ def remove_file(file_path: str): except PermissionError: # fix Windows error that once opened files can only be removed after a restart # https://groups.google.com/g/python-sqlite/c/2KBI2cR-t70 - print("Permission error") os.rename(file_path, f"renamed_{file_path}") os.remove(f"renamed_{file_path}") + except FileNotFoundError: + # at the moment on windows the file is not created + pass From e84d95f9ba676e29c82f22ec9841e947ca570831 Mon Sep 17 00:00:00 2001 From: Nils Krehl Date: Mon, 11 Mar 2024 10:30:55 +0100 Subject: [PATCH 334/343] #324: log schema_config.yaml path in on startup --- biocypher/_core.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/biocypher/_core.py b/biocypher/_core.py index c9972d62..165f84af 100644 --- a/biocypher/_core.py +++ b/biocypher/_core.py @@ -136,6 +136,10 @@ def __init__( if not self._schema_config_path: logger.warning("Running BioCypher without schema configuration.") + else: + logger.info( + f"Running BioCypher with schema configuration from {self._schema_config_path}." + ) self._head_ontology = head_ontology or self.base_config["head_ontology"] @@ -476,7 +480,7 @@ def log_missing_input_labels(self) -> Optional[dict[str, list[str]]]: if mt: msg = ( "Input entities not accounted for due to them not being " - "present in the `schema_config.yaml` configuration file " + f"present in the schema configuration file {self._schema_config_path} " "(this is not necessarily a problem, if you did not intend " "to include them in the database; see the log for details): \n" ) From 1ade966452dd4b0a9fb57d4acd9156d72e44c232 Mon Sep 17 00:00:00 2001 From: slobentanzer Date: Mon, 11 Mar 2024 16:16:53 +0100 Subject: [PATCH 335/343] add perspective as hot topic --- docs/index.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/index.rst b/docs/index.rst index effad65f..137297dc 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -14,6 +14,11 @@ Democratising Knowledge Graphs `_ and the `BioChatter website `_ for more information. + We have also recently published a perspective on connecting knowledge and + machine learning to enable causal reasoning in biomedicine, with a particular + focus on the currently emerging "foundation models." You can read it `here + `_. + Building a knowledge graph for biomedical tasks usually takes months or years. What if you could do it in weeks or days? We created BioCypher to make the process of creating a biomedical knowledge graph easier than ever, but still From f2ca51389054c214b4c252c115a9857e67d8c805 Mon Sep 17 00:00:00 2001 From: Johann Dreo Date: Tue, 12 Mar 2024 21:22:29 +0100 Subject: [PATCH 336/343] doc(error messages): more detailled error - More hints as to what could be wrong in Ontology. - Replaces reference to Biolink by "ontology". --- biocypher/_ontology.py | 2 +- biocypher/_translate.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/biocypher/_ontology.py b/biocypher/_ontology.py index 08235595..2a90fdfb 100644 --- a/biocypher/_ontology.py +++ b/biocypher/_ontology.py @@ -587,7 +587,7 @@ def _extend_ontology(self) -> None: raise ValueError( f"Node {key} not found in ontology, but also has no " "inheritance definition. Please check your schema for " - "spelling errors or a missing `is_a` definition." + "spelling errors, first letter not in lower case, use of underscores, a missing `is_a` definition (SubClassOf a root node), or missing labels in class or super-classes." ) continue diff --git a/biocypher/_translate.py b/biocypher/_translate.py index e9d9ee34..aa50b161 100644 --- a/biocypher/_translate.py +++ b/biocypher/_translate.py @@ -102,7 +102,7 @@ def translate_nodes( "Strict mode is enabled, so this is not allowed." ) - # find the node in leaves that represents biolink node type + # find the node in leaves that represents ontology node type _ontology_class = self._get_ontology_mapping(_type) if _ontology_class: @@ -324,7 +324,7 @@ def _record_no_type(self, _type: Any, what: Any) -> None: schema_config. """ - logger.debug(f"No Biolink type defined for `{_type}`: {what}") + logger.debug(f"No ontology type defined for `{_type}`: {what}") if self.notype.get(_type, None): self.notype[_type] += 1 From a866dca21bc61694f5c2344fe085d76ecc17590f Mon Sep 17 00:00:00 2001 From: Johann Dreo Date: Mon, 18 Sep 2023 09:34:14 +0200 Subject: [PATCH 337/343] refactor(write): return the path of the import call file instead of a bool This allows the user to manipulate the actual path, since no accessors exists otherwise. For instance, this can be printed on stdout and piped in a shell automatically. The returned string can still be used in a test, hence not changing the interface much. --- biocypher/_core.py | 7 +++++-- biocypher/_write.py | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/biocypher/_core.py b/biocypher/_core.py index c1b8a15d..3e657b37 100644 --- a/biocypher/_core.py +++ b/biocypher/_core.py @@ -558,10 +558,13 @@ def show_ontology_structure(self, **kwargs) -> None: return self._ontology.show_ontology_structure(**kwargs) - def write_import_call(self) -> None: + def write_import_call(self) -> str: """ Write a shell script to import the database depending on the chosen DBMS. + + Returns: + str: path toward the file holding the import call. """ if not self._offline: @@ -569,7 +572,7 @@ def write_import_call(self) -> None: "Cannot write import call in online mode." ) - self._writer.write_import_call() + return self._writer.write_import_call() def write_schema_info(self, as_node: bool = False) -> None: """ diff --git a/biocypher/_write.py b/biocypher/_write.py index 21958e38..149ee742 100644 --- a/biocypher/_write.py +++ b/biocypher/_write.py @@ -1007,14 +1007,14 @@ def get_import_call(self) -> str: return self._construct_import_call() - def write_import_call(self) -> bool: + def write_import_call(self) -> str: """ Function to write the import call detailing folder and individual node and edge headers and data files, as well as delimiters and database name, to the export folder as txt. Returns: - bool: The return value. True for success, False otherwise. + str: The path of the file holding the import call. """ file_path = os.path.join(self.outdir, self._get_import_script_name()) @@ -1023,7 +1023,7 @@ def write_import_call(self) -> bool: with open(file_path, "w", encoding="utf-8") as f: f.write(self._construct_import_call()) - return True + return file_path class _Neo4jBatchWriter(_BatchWriter): From 92c8ad8006925e1c75487d4a6725b87eb604b084 Mon Sep 17 00:00:00 2001 From: slobentanzer Date: Tue, 19 Mar 2024 13:24:36 +0100 Subject: [PATCH 338/343] =?UTF-8?q?Bump=20version:=200.5.38=20=E2=86=92=20?= =?UTF-8?q?0.5.39?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- biocypher/_metadata.py | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index a46857f9..8dedfad3 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.5.38 +current_version = 0.5.39 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+) diff --git a/biocypher/_metadata.py b/biocypher/_metadata.py index 83cd94b7..20a28856 100644 --- a/biocypher/_metadata.py +++ b/biocypher/_metadata.py @@ -19,7 +19,7 @@ import toml -_VERSION = "0.5.38" +_VERSION = "0.5.39" def get_metadata(): diff --git a/pyproject.toml b/pyproject.toml index cd453147..8435c5c0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "biocypher" -version = "0.5.38" +version = "0.5.39" description = "A unifying framework for biomedical research knowledge graphs" authors = [ "Sebastian Lobentanzer ", From 65255f1a4d20b0d540412e2490a81724523f31ed Mon Sep 17 00:00:00 2001 From: slobentanzer Date: Tue, 19 Mar 2024 16:14:05 +0100 Subject: [PATCH 339/343] remove dunder --- test/write/relational/{test__sqlite.py => test_sqlite.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename test/write/relational/{test__sqlite.py => test_sqlite.py} (100%) diff --git a/test/write/relational/test__sqlite.py b/test/write/relational/test_sqlite.py similarity index 100% rename from test/write/relational/test__sqlite.py rename to test/write/relational/test_sqlite.py From a86d3e5bfc0b535ce62ce458d819e8ed058fe4d1 Mon Sep 17 00:00:00 2001 From: slobentanzer Date: Tue, 19 Mar 2024 16:18:56 +0100 Subject: [PATCH 340/343] all write tests to directory --- test/{test_write_arango.py => write/graph/test_arango.py} | 0 test/{test_write_neo4j.py => write/graph/test_neo4j.py} | 0 .../relational/test_postgres.py} | 0 test/write/relational/test_sqlite.py | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) rename test/{test_write_arango.py => write/graph/test_arango.py} (100%) rename test/{test_write_neo4j.py => write/graph/test_neo4j.py} (100%) rename test/{test_write_postgres.py => write/relational/test_postgres.py} (100%) diff --git a/test/test_write_arango.py b/test/write/graph/test_arango.py similarity index 100% rename from test/test_write_arango.py rename to test/write/graph/test_arango.py diff --git a/test/test_write_neo4j.py b/test/write/graph/test_neo4j.py similarity index 100% rename from test/test_write_neo4j.py rename to test/write/graph/test_neo4j.py diff --git a/test/test_write_postgres.py b/test/write/relational/test_postgres.py similarity index 100% rename from test/test_write_postgres.py rename to test/write/relational/test_postgres.py diff --git a/test/write/relational/test_sqlite.py b/test/write/relational/test_sqlite.py index 4541ea7d..ee0b43f2 100644 --- a/test/write/relational/test_sqlite.py +++ b/test/write/relational/test_sqlite.py @@ -7,7 +7,7 @@ @pytest.mark.parametrize("length", [4], scope="module") -def test__construct_import_call(bw_tab_sqlite, _get_nodes): +def test_construct_import_call(bw_tab_sqlite, _get_nodes): nodes = _get_nodes def node_gen(nodes): From 600907a087ab6ceb43f0039592e2e6b9334db0c2 Mon Sep 17 00:00:00 2001 From: slobentanzer Date: Tue, 19 Mar 2024 16:31:09 +0100 Subject: [PATCH 341/343] move ontology files into directory --- biocypher/_config/biocypher_config.yaml | 14 +- docs/installation.md | 4 +- docs/tutorial-ontology.md | 4 +- test/fixtures/ontology.py | 14 +- test/mondo.obo | 258 ------------------------ test/{ => ontologies}/go.owl | 0 test/{ => ontologies}/mondo.owl | 0 test/{ => ontologies}/ontology1.ttl | 0 test/{ => ontologies}/ontology2.ttl | 0 test/{ => ontologies}/so.owl | 0 test/rdflib_playground.py | 2 +- test/so.obo | 103 ---------- test/test_core.py | 2 +- test/test_ontology.py | 4 +- 14 files changed, 21 insertions(+), 384 deletions(-) delete mode 100644 test/mondo.obo rename test/{ => ontologies}/go.owl (100%) rename test/{ => ontologies}/mondo.owl (100%) rename test/{ => ontologies}/ontology1.ttl (100%) rename test/{ => ontologies}/ontology2.ttl (100%) rename test/{ => ontologies}/so.owl (100%) delete mode 100644 test/so.obo diff --git a/biocypher/_config/biocypher_config.yaml b/biocypher/_config/biocypher_config.yaml index 42f05649..73bb4a72 100644 --- a/biocypher/_config/biocypher_config.yaml +++ b/biocypher/_config/biocypher_config.yaml @@ -3,7 +3,6 @@ Title: BioCypher python module configuration file ## Some options are not used by default. Uncomment them to use them. biocypher: - ### Required parameters ### ## DBMS type @@ -51,18 +50,17 @@ biocypher: # tail_ontologies: # so: - # url: test/so.owl + # url: test/ontologies/so.owl # head_join_node: sequence variant # tail_join_node: sequence_variant # mondo: - # url: test/mondo.owl + # url: test/ontologies/mondo.owl # head_join_node: disease # tail_join_node: disease ### DBMS configuration ### neo4j: - ### Neo4j configuration ### ## Database name @@ -80,8 +78,8 @@ neo4j: ## Neo4j admin import batch writer settings - delimiter: ';' - array_delimiter: '|' + delimiter: ";" + array_delimiter: "|" quote_character: "'" ## MultiDB functionality @@ -104,8 +102,8 @@ postgresql: # PostgreSQL connection credentials database_name: postgres # DB name - user: postgres # user name - password: postgres # password + user: postgres # user name + password: postgres # password host: localhost # host port: 5432 # port diff --git a/docs/installation.md b/docs/installation.md index b22537e1..e6052e10 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -151,11 +151,11 @@ biocypher: ### BioCypher module configuration ### # Optional tail ontologies tail_ontologies: so: - url: test/so.owl + url: test/ontologies/so.owl head_join_node: sequence variant tail_join_node: sequence_variant mondo: - url: test/mondo.owl + url: test/ontologies/mondo.owl head_join_node: disease tail_join_node: disease diff --git a/docs/tutorial-ontology.md b/docs/tutorial-ontology.md index 8af0a330..93d65f60 100644 --- a/docs/tutorial-ontology.md +++ b/docs/tutorial-ontology.md @@ -544,13 +544,13 @@ bc = BioCypher( tail_ontologies={ 'so': { - 'url': 'test/so.owl', + 'url': 'test/ontologies/so.owl', 'head_join_node': 'sequence variant', 'tail_join_node': 'sequence_variant', }, 'mondo': { - 'url': 'test/mondo.owl', + 'url': 'test/ontologies/mondo.owl', 'head_join_node': 'disease', 'tail_join_node': 'human disease', 'merge_nodes': False, diff --git a/test/fixtures/ontology.py b/test/fixtures/ontology.py index 78e93351..ea7ff88e 100644 --- a/test/fixtures/ontology.py +++ b/test/fixtures/ontology.py @@ -44,12 +44,12 @@ def hybrid_ontology(extended_ontology_mapping): ontology_mapping=extended_ontology_mapping, tail_ontologies={ "so": { - "url": "test/so.owl", + "url": "test/ontologies/so.owl", "head_join_node": "sequence variant", "tail_join_node": "sequence_variant", }, "mondo": { - "url": "test/mondo.owl", + "url": "test/ontologies/mondo.owl", "head_join_node": "disease", "tail_join_node": "human disease", "merge_nodes": False, @@ -62,13 +62,13 @@ def hybrid_ontology(extended_ontology_mapping): def simple_ontology(simple_ontology_mapping): return Ontology( head_ontology={ - "url": "test/ontology1.ttl", + "url": "test/ontologies/ontology1.ttl", "root_node": "Thing", }, ontology_mapping=simple_ontology_mapping, tail_ontologies={ "test": { - "url": "test/ontology2.ttl", + "url": "test/ontologies/ontology2.ttl", "head_join_node": "entity", "tail_join_node": "EvaluationCriterion", }, @@ -86,14 +86,14 @@ def biolink_adapter(): @pytest.fixture(scope="module") def so_adapter(): - return OntologyAdapter("test/so.owl", "sequence_variant") + return OntologyAdapter("test/ontologies/so.owl", "sequence_variant") @pytest.fixture(scope="module") def go_adapter(): - return OntologyAdapter("test/go.owl", "molecular_function") + return OntologyAdapter("test/ontologies/go.owl", "molecular_function") @pytest.fixture(scope="module") def mondo_adapter(): - return OntologyAdapter("test/mondo.owl", "disease") + return OntologyAdapter("test/ontologies/mondo.owl", "disease") diff --git a/test/mondo.obo b/test/mondo.obo deleted file mode 100644 index d9bcbd4d..00000000 --- a/test/mondo.obo +++ /dev/null @@ -1,258 +0,0 @@ -format-version: 1.2 -data-version: releases/2023-03-01 -subsetdef: clingen "initial subset used by clingen" -subsetdef: disease_grouping "disease_grouping" -subsetdef: do_inheritance_inconsistent "classes where the corresponding DO term is both AR and AD https://github.com/monarch-initiative/monarch-disease-ontology/issues/406" -subsetdef: gard_rare "GARD rare disease subset" -subsetdef: harrisons_view "harrisons_view" -subsetdef: historic_epidemic "classes representing a historic epidemic" -subsetdef: implicit_genetic_in_ordo "in ORDO this is classified as genetic even though the class is used for non-genetic disorders" -subsetdef: merged_class "this class merges distinct concepts in other resources" -subsetdef: metaclass "A grouping of disease classes. Should be excluded from analysis" -subsetdef: mostly_harmless "condition has no severe phenotypes and is harmless or mostly harmless" -subsetdef: n_of_one "N of one" -subsetdef: not_a_disease "classes that do not represent diseases" -subsetdef: obsoletion_candidate "obsoletion candidate" -subsetdef: ordo_biological_anomaly "biological anomaly" -subsetdef: ordo_clinical_situation "particular clinical situation in a disease or syndrome" -subsetdef: ordo_clinical_subtype "clinical subtype" -subsetdef: ordo_clinical_syndrome "clinical syndrome" -subsetdef: ordo_disease "disease" -subsetdef: ordo_disorder "disorder" -subsetdef: ordo_etiological_subtype "etiological subtype" -subsetdef: ordo_group_of_disorders "group of disorders" -subsetdef: ordo_histopathological_subtype "histopathological subtype" -subsetdef: ordo_inheritance_inconsistent "classes where the corresponding ordo term is both AR and AD https://github.com/monarch-initiative/monarch-disease-ontology/issues/406" -subsetdef: ordo_malformation_syndrome "malformation syndrome" -subsetdef: ordo_morphological_anomaly "morphological anomaly" -subsetdef: ordo_subtype_of_a_disorder "subtype of a disorder" -subsetdef: other_hierarchy "A bin for classes that are likely not diseases and may be moved to a separate hierarchy" -subsetdef: predisposition "Diseases that are pre-dispositions to other diseases" -subsetdef: prototype_pattern "Conforms to the prototype design pattern where the classic/type1 form may be confused with the grouping type. See https://github.com/monarch-initiative/monarch-disease-ontology/issues/149" -subsetdef: rare "rare" -subsetdef: speculative "A hypothesized disease whose existence is speculative" -synonymtypedef: ABBREVIATION "abbreviation" -synonymtypedef: AMBIGUOUS "ambiguous" -synonymtypedef: DEPRECATED "A synonym that is historic and discouraged" -synonymtypedef: DUBIOUS "dubious synonym" -synonymtypedef: EXCLUDE "Synonym to be removed from public release but maintained in edit version as record of external usage" -synonymtypedef: MISSPELLING "A synonym that is recorded for consistency with another source but is a misspelling" -synonymtypedef: NON_HUMAN "A synonym that is used for non-human animal variants of a disease" -remark: Includes Ontology(OntologyID(Anonymous-49)) [Axioms: 73749 Logical Axioms: 0] -ontology: mondo -property_value: http://purl.org/dc/elements/1.1/description "A semi-automatically constructed ontology that merges in multiple disease resources to yield a coherent merged ontology." xsd:string -property_value: http://purl.org/dc/elements/1.1/title "Mondo Disease Ontology" xsd:string -property_value: http://purl.org/dc/terms/license http://creativecommons.org/licenses/by/4.0/ -property_value: http://purl.org/dc/terms/source http://purl.obolibrary.org/obo/chebi.owl -property_value: http://purl.org/dc/terms/source http://purl.obolibrary.org/obo/doid.owl -property_value: http://purl.org/dc/terms/source http://purl.obolibrary.org/obo/envo.owl -property_value: http://purl.org/dc/terms/source http://purl.obolibrary.org/obo/go.owl -property_value: http://purl.org/dc/terms/source http://purl.obolibrary.org/obo/hp.owl -property_value: http://purl.org/dc/terms/source http://purl.obolibrary.org/obo/mf.owl -property_value: http://purl.org/dc/terms/source http://purl.obolibrary.org/obo/ncbitaxon.owl -property_value: http://purl.org/dc/terms/source http://purl.obolibrary.org/obo/ncit.owl -property_value: http://purl.org/dc/terms/source http://purl.obolibrary.org/obo/uberon.owl -property_value: http://purl.org/dc/terms/source http://www.orpha.net/ontology/orphanet.owl -property_value: http://purl.org/dc/terms/source https://id.nlm.nih.gov/mesh/ -property_value: http://purl.org/dc/terms/source https://rarediseases.info.nih.gov/ -property_value: http://xmlns.com/foaf/0.1/homepage http://obofoundry.org/ontology/mondo.html xsd:anyURI -property_value: IAO:0000700 MONDO:0000001 -property_value: IAO:0000700 MONDO:0021125 -property_value: IAO:0000700 MONDO:0042489 - -[Term] -id: MONDO:0000001 -name: disease -def: "A disease is a disposition to undergo pathological processes that exists in an organism because of one or more disorders in that organism." [OGMS:0000031] -synonym: "condition" EXACT [NCIT:C2991] -synonym: "disease" EXACT [NCIT:C2991] -synonym: "disease or disorder" EXACT [NCIT:C2991] -synonym: "disease or disorder, non-neoplastic" EXACT [NCIT:C2991] -synonym: "diseases" EXACT [NCIT:C2991] -synonym: "diseases and disorders" EXACT [NCIT:C2991] -synonym: "disorder" EXACT [NCIT:C2991] -synonym: "disorders" EXACT [NCIT:C2991] -synonym: "medical condition" EXACT [] -synonym: "other disease" EXACT [NCIT:C2991] -xref: DOID:4 {source="MONDO:equivalentTo", source="EFO:0000408"} -xref: EFO:0000408 {source="MONDO:equivalentTo"} -xref: ICD9:799.9 {source="MONDO:relatedTo", source="MONDO:i2s"} -xref: MESH:D004194 {source="MONDO:equivalentTo", source="DOID:4", source="EFO:0000408"} -xref: NCIT:C2991 {source="MONDO:equivalentTo", source="DOID:4"} -xref: OGMS:0000031 {source="MONDO:equivalentTo"} -xref: Orphanet:377788 {source="MONDO:equivalentTo"} -xref: SCTID:64572001 {source="MONDO:equivalentTo", source="DOID:4", source="EFO:0000408"} -xref: UMLS:C0012634 {source="MONDO:equivalentTo", source="NCIT:C2991", source="DOID:4"} -property_value: exactMatch DOID:4 -property_value: exactMatch http://identifiers.org/mesh/D004194 -property_value: exactMatch http://identifiers.org/snomedct/64572001 -property_value: exactMatch http://linkedlifedata.com/resource/umls/id/C0012634 -property_value: exactMatch NCIT:C2991 -property_value: exactMatch Orphanet:377788 - -[Term] -id: MONDO:0700096 -name: human disease -synonym: "human disease or disorder" EXACT [https://orcid.org/0000-0001-5208-3432] -is_a: MONDO:0000001 {source="http://orcid.org/0000-0002-4142-7153"} ! disease -property_value: IAO:0000233 https://github.com/monarch-initiative/mondo/issues/5858 xsd:anyURI -property_value: RO:0002175 NCBITaxon:9606 -created_by: http://orcid.org/0000-0002-4142-7153 - -[Term] -id: MONDO:0002025 -name: psychiatric disorder -def: "A disorder characterized by behavioral and/or psychological abnormalities, often accompanied by physical symptoms. The symptoms may cause clinically significant distress or impairment in social and occupational areas of functioning. Representative examples include anxiety disorders, cognitive disorders, mood disorders and schizophrenia." [NCIT:C2893] -synonym: "disease of mental health" NARROW [DOID:150] -synonym: "mental disorder" NARROW [NCIT:C2893] -synonym: "mental dysfunction" NARROW [NCIT:C2893] -synonym: "mental illness" NARROW [NCIT:C2893] -synonym: "Psychiatric disease" EXACT [NCIT:C2893] -synonym: "Psychiatric disorder" EXACT [NCIT:C2893] -xref: DOID:150 {source="MONDO:equivalentTo"} -xref: MESH:D001523 {source="DOID:150", source="MONDO:equivalentTo"} -xref: MFOMD:0000004 -xref: NCIT:C2893 {source="DOID:150", source="MONDO:equivalentTo"} -xref: SCTID:74732009 {source="MONDO:relatedTo", source="DOID:150"} -is_a: MONDO:0700096 ! human disease -relationship: excluded_subClassOf MONDO:0005071 {source="ISBN-13:978-1-259-64403-0"} ! nervous system disorder -property_value: exactMatch DOID:150 -property_value: exactMatch http://identifiers.org/mesh/D001523 -property_value: exactMatch NCIT:C2893 - -[Term] -id: MONDO:0003847 -name: hereditary disease -def: "A disease that is caused by genetic modifications where those modifications are inherited from a parent's genome." [MONDO:cjm] -comment: Usage note: this is intended only for diseases with an inherited genetic etiology. Somatic genetic mutations are excluded. Some ontologies use the term 'genetic disease' in the sense of inherited disorders only, we are here careful to distinguish. -subset: harrisons_view -synonym: "familial disorder" RELATED [] -synonym: "genetic condition" BROAD [NCIT:C3101] -synonym: "genetic disease" BROAD [] -synonym: "genetic disorder" BROAD [NCIT:C3101] -synonym: "hereditary disease" EXACT [MONDO:patterns/hereditary, NCIT:C3101] -synonym: "hereditary disease or disorder" EXACT [MONDO:patterns/hereditary] -synonym: "hereditary diseases" EXACT [NCIT:C3101] -synonym: "inborn disorder" RELATED [] -synonym: "inherited disease" EXACT [NCIT:C3101] -synonym: "inherited genetic disease" EXACT [https://github.com/monarch-initiative/mondo/issues/1758] -synonym: "Mendelian disease" NARROW [DOID:0050177] -synonym: "molecular disease" EXACT [NCIT:C3101] -xref: DOID:630 {source="MONDO:equivalentTo"} -xref: EFO:0000508 {source="MONDO:equivalentTo"} -xref: ICD9:799.89 {source="MONDO:relatedTo", source="MONDO:i2s"} -xref: MESH:D030342 {source="EFO:0000508", source="MONDO:equivalentTo", source="DOID:630"} -xref: NCIT:C3101 {source="EFO:0000508", source="MONDO:equivalentTo", source="DOID:630"} -xref: SCTID:32895009 {source="MONDO:equivalentTo", source="DOID:630"} -xref: UMLS:C0019247 {source="EFO:0000508", source="MONDO:equivalentTo", source="NCIT:C3101", source="DOID:630"} -is_a: MONDO:0700096 ! human disease -intersection_of: MONDO:0700096 ! human disease -intersection_of: has_characteristic MONDO:0021152 ! inherited -disjoint_from: MONDO:0016592 ! non-hereditary degenerative ataxia -relationship: has_characteristic MONDO:0021152 ! inherited -property_value: exactMatch DOID:630 -property_value: exactMatch http://identifiers.org/mesh/D030342 -property_value: exactMatch http://identifiers.org/snomedct/32895009 -property_value: exactMatch http://linkedlifedata.com/resource/umls/id/C0019247 -property_value: exactMatch NCIT:C3101 - -[Term] -id: MONDO:0024429 -name: Alice in Wonderland syndrome -def: "A disorienting neuropsychological condition that affects perception. People experience size distortion such as micropsia, macropsia, pelopsia, or teleopsia. Size distortion may occur of other sensory modalities." [Wikipedia:Alice_in_Wonderland_syndrome] -xref: MESH:D062026 {source="MONDO:equivalentTo"} -xref: NCIT:C116362 {source="MONDO:equivalentTo"} -is_a: MONDO:0002025 {source="PMID:27347442"} ! psychiatric disorder -is_a: MONDO:0002254 {source="NCIT:C116362"} ! syndromic disease -is_a: MONDO:0021084 {source="MESH:D062026"} ! vision disorder -property_value: exactMatch http://identifiers.org/mesh/D062026 -property_value: exactMatch NCIT:C116362 - -[Term] -id: MONDO:0800105 -name: catatonia -def: "A psychiatric disorder featuring stupor, posturing, and echophenomena." [PMID:31196793] -xref: MESH:D002389 {source="https://orcid.org/0000-0003-1967-3726", source="MONDO:equivalentTo"} -is_a: MONDO:0002025 {source="PMID:31196793"} ! psychiatric disorder -property_value: exactMatch http://identifiers.org/mesh/D002389 -property_value: IAO:0000233 https://github.com/monarch-initiative/mondo/issues/5199 xsd:anyURI -property_value: IAO:0000233 https://github.com/monarch-initiative/mondo/issues/5537 xsd:anyURI - -[Term] -id: MONDO:0000429 -name: autosomal genetic disease -def: "A monogenic disease that is has material basis in a mutation in a single gene on one of the non-sex chromosomes." [DOID:0050739, http://ghr.nlm.nih.gov/glossary=autosomaldominant, http://ghr.nlm.nih.gov/handbook/inheritance/inheritancepatterns] -synonym: "autosomal hereditary disorder" EXACT [] -synonym: "autosomal inherited disease" EXACT [] -synonym: "autosomal inherited disorder" EXACT [] -xref: DOID:0050739 {source="MONDO:equivalentTo"} -xref: ICD9:758.5 {source="MONDO:relatedTo", source="MONDO:i2s"} -xref: SCTID:1899006 {source="MONDO:equivalentTo"} -xref: UMLS:C0265384 {source="MONDO:equivalentTo"} -is_a: MONDO:0003847 {source="https://github.com/monarch-initiative/mondo/issues/1758"} ! hereditary disease -property_value: exactMatch DOID:0050739 -property_value: exactMatch http://identifiers.org/snomedct/1899006 -property_value: exactMatch http://linkedlifedata.com/resource/umls/id/C0265384 - -[Term] -id: MONDO:0006025 -name: autosomal recessive disease -def: "Autosomal recessive form of disease." [MONDO:patterns/autosomal_recessive] -synonym: "autosomal recessive disease or disorder" EXACT [MONDO:design_pattern] -synonym: "autosomal recessive hereditary disease" EXACT [] -synonym: "autosomal recessive hereditary disorder" EXACT [] -synonym: "autosomal recessive inherited disease" EXACT [] -synonym: "autosomal recessive inherited disorder" EXACT [] -synonym: "disease or disorder, autosomal recessive" EXACT [MONDO:patterns/autosomal_recessive] -synonym: "disease, autosomal recessive" EXACT [MONDO:patterns/autosomal_recessive] -synonym: "recessive hereditary disorder (autosomal)" RELATED [] -xref: DOID:0050737 {source="MONDO:equivalentTo"} -xref: EFO:1000017 {source="MONDO:equivalentTo"} -xref: ICD9:758.5 {source="MONDO:relatedTo", source="MONDO:i2s"} -xref: SCTID:85995004 {source="MONDO:equivalentTo"} -xref: UMLS:C0265388 {source="MONDO:equivalentTo"} -is_a: MONDO:0000429 {source="DOID:0050737"} ! autosomal genetic disease -property_value: exactMatch DOID:0050737 -property_value: exactMatch http://identifiers.org/snomedct/85995004 -property_value: exactMatch http://linkedlifedata.com/resource/umls/id/C0265388 - -[Term] -id: MONDO:0009061 -name: cystic fibrosis -def: "Cystic fibrosis (CF) is a genetic disorder characterized by the production of sweat with a high salt content and mucus secretions with an abnormal viscosity." [Orphanet:586, Wikipedia:Cystic_fibrosis] -subset: gard_rare {source="GARD:0006233"} -subset: ordo_disease {source="Orphanet:586"} -synonym: "CF" EXACT ABBREVIATION [DOID:1485, MONDO:Lexical, OMIM:219700, Orphanet:586] -synonym: "cystic fibrosis" EXACT [MONDO:Lexical, OMIM:219700] -synonym: "cystic fibrosis lung disease, modifier of" EXACT [OMIM:219700, OMIM:genemap2] -synonym: "mucoviscidosis" EXACT [DOID:1485, OMIM:219700, Orphanet:586] -synonym: "pseudomonas aeruginosa, susceptibility to chronic infection by, in cystic fibrosis" EXACT [OMIM:219700, OMIM:genemap2] -xref: DOID:1485 {source="MONDO:equivalentTo"} -xref: GARD:0006233 {source="MONDO:equivalentTo"} -xref: ICD10CM:E84 {source="DOID:1485", source="MONDO:equivalentTo"} -xref: ICD9:277.0 {source="DOID:1485"} -xref: MedDRA:10011762 {source="Orphanet:586/e", source="Orphanet:586"} -xref: MESH:D003550 {source="DOID:1485", source="Orphanet:586/e", source="MONDO:equivalentTo", source="Orphanet:586"} -xref: NCIT:C2975 {source="DOID:1485", source="MONDO:equivalentTo"} -xref: OMIM:219700 {source="DOID:1485", source="Orphanet:586/e", source="MONDO:equivalentTo", source="Orphanet:586"} -xref: Orphanet:586 {source="OMIM:219700", source="MONDO:equivalentTo"} -xref: SCTID:190905008 {source="DOID:1485", source="MONDO:equivalentTo"} -xref: UMLS:C0010674 {source="DOID:1485", source="Orphanet:586/e", source="OMIM:219700", source="MONDO:equivalentTo", source="MONDO:ncbi_mim2gene_medline", source="NCIT:C2975", source="Orphanet:586"} -is_a: MONDO:0005087 {source="Orphanet:586"} ! respiratory system disorder -is_a: MONDO:0006025 {source="DOID:1485", source="MONDO:Redundant"} ! autosomal recessive disease -relationship: excluded_subClassOf MONDO:0002356 {source="MONDO:Redundant", source="Orphanet:586"} ! pancreas disorder -relationship: excluded_subClassOf MONDO:0015509 {source="Orphanet:586"} ! genetic biliary tract disease -relationship: excluded_subClassOf MONDO:0018396 {source="Orphanet:586"} ! obsolete rare male fertility disorder with obstructive azoospermia -relationship: excluded_subClassOf MONDO:0018409 {source="Orphanet:586"} ! obsolete rare genetic disorder with obstructive azoospermia -relationship: has_characteristic MONDO:0021136 {source="MONDO:0015112", source="MONDO:0015510", source="MONDO:0015618"} ! rare -property_value: closeMatch http://identifiers.org/meddra/10011762 -property_value: exactMatch DOID:1485 -property_value: exactMatch http://identifiers.org/mesh/D003550 -property_value: exactMatch http://identifiers.org/snomedct/190905008 -property_value: exactMatch http://linkedlifedata.com/resource/umls/id/C0010674 -property_value: exactMatch http://purl.bioontology.org/ontology/ICD10CM/E84 -property_value: exactMatch https://omim.org/entry/219700 -property_value: exactMatch NCIT:C2975 -property_value: exactMatch Orphanet:586 -property_value: IAO:0000233 https://github.com/monarch-initiative/mondo/issues/4521 xsd:anyURI -property_value: seeAlso https://rarediseases.info.nih.gov/diseases/6233/cystic-fibrosis xsd:anyURI {source="GARD:0006233"} diff --git a/test/go.owl b/test/ontologies/go.owl similarity index 100% rename from test/go.owl rename to test/ontologies/go.owl diff --git a/test/mondo.owl b/test/ontologies/mondo.owl similarity index 100% rename from test/mondo.owl rename to test/ontologies/mondo.owl diff --git a/test/ontology1.ttl b/test/ontologies/ontology1.ttl similarity index 100% rename from test/ontology1.ttl rename to test/ontologies/ontology1.ttl diff --git a/test/ontology2.ttl b/test/ontologies/ontology2.ttl similarity index 100% rename from test/ontology2.ttl rename to test/ontologies/ontology2.ttl diff --git a/test/so.owl b/test/ontologies/so.owl similarity index 100% rename from test/so.owl rename to test/ontologies/so.owl diff --git a/test/rdflib_playground.py b/test/rdflib_playground.py index 44ae877b..047653e0 100644 --- a/test/rdflib_playground.py +++ b/test/rdflib_playground.py @@ -94,7 +94,7 @@ def remove_prefix(uri: str) -> str: if __name__ == "__main__": - path = "test/so.owl" + path = "test/ontologies/so.owl" url = "https://raw.githubusercontent.com/biolink/biolink-model/v3.2.1/biolink-model.owl.ttl" root_label = "entity" G = ontology_to_tree(url, root_label, switch_id_and_label=True) diff --git a/test/so.obo b/test/so.obo deleted file mode 100644 index f4179367..00000000 --- a/test/so.obo +++ /dev/null @@ -1,103 +0,0 @@ -format-version: 1.2 -data-version: 2021-11-22 -date: 22:11:2021 06:31 -saved-by: Evan Christensen -auto-generated-by: OBO-Edit 2.3.1 -subsetdef: Alliance_of_Genome_Resources "Alliance of Genome Resources Gene Biotype Slim" -subsetdef: biosapiens "biosapiens protein feature ontology" -subsetdef: DBVAR "database of genomic structural variation" -subsetdef: SOFA "SO feature annotation" -synonymtypedef: aa1 "amino acid 1 letter code" -synonymtypedef: aa3 "amino acid 3 letter code" -synonymtypedef: AAMOD "amino acid modification" -synonymtypedef: AGR "Alliance of Genome Resources" -synonymtypedef: BS "biosapiens" -synonymtypedef: dbsnp "dbsnp variant terms" -synonymtypedef: dbvar "DBVAR" -synonymtypedef: ebi_variants "ensembl variant terms" -synonymtypedef: RNAMOD "RNA modification" EXACT -synonymtypedef: VAR "variant annotation term" -default-namespace: sequence -ontology: so - -[Term] -id: SO:0000000 -name: Sequence_Ontology -subset: SOFA -is_obsolete: true - -[Term] -id: SO:0000001 -name: region -def: "A sequence_feature with an extent greater than zero. A nucleotide region is composed of bases and a polypeptide region is composed of amino acids." [SO:ke] -subset: SOFA -synonym: "sequence" EXACT [] - -[Term] -id: SO:0001060 -name: sequence_variant -def: "A sequence_variant is a non exact copy of a sequence_feature or genome exhibiting one or more sequence_alteration." [SO:ke] -synonym: "ANNOVAR:unknown" RELATED VAR [http://www.openbioinformatics.org/annovar/annovar_download.html] -synonym: "Jannovar:sequence_variant" EXACT VAR [http://doc-openbio.readthedocs.org/projects/jannovar/en/master/var_effects.html] -synonym: "sequence variant" EXACT [] -synonym: "VAAST:sequence_variant" EXACT VAR [] - -[Term] -id: SO:0001536 -name: functional_effect_variant -def: "A variant whereby the effect is evaluated with respect to a reference." [SO:ke] -comment: Updated after request from Lea Starita, lea.starita@gmail.com from the NCBI. -synonym: "functional effect variant" EXACT [] -synonym: "functional variant" EXACT [] -is_a: SO:0001060 ! sequence_variant -created_by: kareneilbeck -creation_date: 2010-03-22T11:30:25Z - -[Term] -id: SO:0002314 -name: altered_gene_product_level -def: "A sequence variant that alters the level of transcription of a gene." [GenCC:AR] -comment: Added as per request from Ang Roberts as part of GenCC November 2020. See Issue Request #501 (https://github.com/The-Sequence-Ontology/SO-Ontologies/issues/501) -synonym: "altered gene product level" EXACT [] -synonym: "altered transcription level" EXACT [] -synonym: "altered_transcription_level" EXACT [] -is_a: SO:0001536 ! functional_effect_variant -created_by: david -creation_date: 2020-12-18T22:35:30Z - -[Term] -id: SO:0002218 -name: functionally_abnormal -def: "A sequence variant in which the function of a gene product is altered with respect to a reference." [] -comment: Added after request from Lea Starita, lea.starita@gmail.com from the NCBI Feb 2019. -synonym: "function modified variant" EXACT [] -synonym: "function_modified_variant" RELATED [] -synonym: "functionally abnormal" RELATED [] -is_a: SO:0001536 ! functional_effect_variant -created_by: david -creation_date: 2019-03-01T10:21:26Z - -[Term] -id: SO:0002316 -name: decreased_gene_product_level -def: "A sequence variant that decreases the level of transcription of a gene." [GenCC:AR] -comment: Added as per request from Ang Roberts as part of GenCC November 2020. See Issue Request #501 (https://github.com/The-Sequence-Ontology/SO-Ontologies/issues/501) -synonym: "decreased gene product level" EXACT [] -synonym: "decreased transcription level" EXACT [] -synonym: "decreased_transcription_level" EXACT [] -synonym: "reduced gene product level" EXACT [] -synonym: "reduced transcription level" EXACT [] -synonym: "reduced_gene_product_level" EXACT [] -synonym: "reduced_transcription_level" EXACT [] -is_a: SO:0002314 ! altered_gene_product_level -created_by: david -creation_date: 2020-12-18T22:35:30Z - -[Term] -id: SO:0001773 -name: lethal_variant -def: "A sequence variant where the mutated gene product does not allow for one or more basic functions necessary for survival." [] -synonym: "lethal variant" EXACT [] -is_a: SO:0002218 ! functionally_abnormal -created_by: kareneilbeck -creation_date: 2011-03-15T04:06:22Z diff --git a/test/test_core.py b/test/test_core.py index 8583d160..4e477ce9 100644 --- a/test/test_core.py +++ b/test/test_core.py @@ -92,7 +92,7 @@ def test_write_schema_info(core, _get_nodes, _get_edges, _get_rel_as_nodes): def test_show_full_ontology_structure_without_schema(): bc = BioCypher( head_ontology={ - "url": "test/so.owl", + "url": "test/ontologies/so.owl", "root_node": "sequence_variant", } ) diff --git a/test/test_ontology.py b/test/test_ontology.py index 5ef17444..5654a448 100644 --- a/test/test_ontology.py +++ b/test/test_ontology.py @@ -32,7 +32,7 @@ def test_mondo_adapter(mondo_adapter): def test_ontology_adapter_root_node_missing(): with pytest.raises(ValueError): - OntologyAdapter("test/so.owl", "not_in_tree") + OntologyAdapter("test/ontologies/so.owl", "not_in_tree") def test_ontology_functions(hybrid_ontology): @@ -115,7 +115,7 @@ def test_disconnected_exception(disconnected_mapping): with pytest.raises(ValueError): Ontology( head_ontology={ - "url": "test/so.owl", + "url": "test/ontologies/so.owl", "root_node": "sequence_variant", }, ontology_mapping=disconnected_mapping, From d47d0d7f92772539a5f02598208ec301b73bd835 Mon Sep 17 00:00:00 2001 From: slobentanzer Date: Tue, 19 Mar 2024 17:55:53 +0100 Subject: [PATCH 342/343] =?UTF-8?q?Bump=20version:=200.5.39=20=E2=86=92=20?= =?UTF-8?q?0.5.40?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- biocypher/_metadata.py | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 8dedfad3..11bc776f 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.5.39 +current_version = 0.5.40 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+) diff --git a/biocypher/_metadata.py b/biocypher/_metadata.py index 20a28856..85144d78 100644 --- a/biocypher/_metadata.py +++ b/biocypher/_metadata.py @@ -19,7 +19,7 @@ import toml -_VERSION = "0.5.39" +_VERSION = "0.5.40" def get_metadata(): diff --git a/pyproject.toml b/pyproject.toml index 8435c5c0..e1864f34 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "biocypher" -version = "0.5.39" +version = "0.5.40" description = "A unifying framework for biomedical research knowledge graphs" authors = [ "Sebastian Lobentanzer ", From f1f57de1979c2cdaf7d6aa940c3410a362eba9ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Apr 2024 07:08:36 +0000 Subject: [PATCH 343/343] Bump pillow from 10.0.1 to 10.3.0 Bumps [pillow](https://github.com/python-pillow/Pillow) from 10.0.1 to 10.3.0. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst) - [Commits](https://github.com/python-pillow/Pillow/compare/10.0.1...10.3.0) --- updated-dependencies: - dependency-name: pillow dependency-type: indirect ... Signed-off-by: dependabot[bot] --- poetry.lock | 465 +++++++++++++++------------------------------------- 1 file changed, 129 insertions(+), 336 deletions(-) diff --git a/poetry.lock b/poetry.lock index b7c44642..2ae7db9f 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,10 +1,9 @@ -# This file is automatically @generated by Poetry and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. [[package]] name = "alabaster" version = "0.7.13" description = "A configurable sidebar-enabled Sphinx theme" -category = "dev" optional = false python-versions = ">=3.6" files = [ @@ -16,7 +15,6 @@ files = [ name = "appdirs" version = "1.4.4" description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." -category = "main" optional = false python-versions = "*" files = [ @@ -28,7 +26,6 @@ files = [ name = "appnope" version = "0.1.3" description = "Disable App Nap on macOS >= 10.9" -category = "dev" optional = false python-versions = "*" files = [ @@ -40,7 +37,6 @@ files = [ name = "asttokens" version = "2.4.0" description = "Annotate AST trees with source code positions" -category = "dev" optional = false python-versions = "*" files = [ @@ -58,7 +54,6 @@ test = ["astroid", "pytest"] name = "attrs" version = "23.1.0" description = "Classes Without Boilerplate" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -77,7 +72,6 @@ tests-no-zope = ["cloudpickle", "hypothesis", "mypy (>=1.1.1)", "pympler", "pyte name = "babel" version = "2.13.0" description = "Internationalization utilities" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -92,7 +86,6 @@ dev = ["freezegun (>=1.0,<2.0)", "pytest (>=6.0)", "pytest-cov"] name = "backcall" version = "0.2.0" description = "Specifications for callback functions passed in to an API" -category = "dev" optional = false python-versions = "*" files = [ @@ -104,7 +97,6 @@ files = [ name = "beautifulsoup4" version = "4.12.2" description = "Screen-scraping library" -category = "dev" optional = false python-versions = ">=3.6.0" files = [ @@ -123,7 +115,6 @@ lxml = ["lxml"] name = "black" version = "23.9.1" description = "The uncompromising code formatter." -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -170,7 +161,6 @@ uvloop = ["uvloop (>=0.15.2)"] name = "bleach" version = "6.1.0" description = "An easy safelist-based HTML-sanitizing tool." -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -189,7 +179,6 @@ css = ["tinycss2 (>=1.1.0,<1.3)"] name = "bump2version" version = "1.0.1" description = "Version-bump your software with a single command!" -category = "dev" optional = false python-versions = ">=3.5" files = [ @@ -201,7 +190,6 @@ files = [ name = "cachetools" version = "5.3.1" description = "Extensible memoizing collections and decorators" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -213,7 +201,6 @@ files = [ name = "certifi" version = "2023.7.22" description = "Python package for providing Mozilla's CA Bundle." -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -225,7 +212,6 @@ files = [ name = "cffi" version = "1.16.0" description = "Foreign Function Interface for Python calling C code." -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -290,7 +276,6 @@ pycparser = "*" name = "cfgv" version = "3.4.0" description = "Validate configuration and produce human readable error messages." -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -302,7 +287,6 @@ files = [ name = "chardet" version = "5.2.0" description = "Universal encoding detector for Python 3" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -314,7 +298,6 @@ files = [ name = "charset-normalizer" version = "3.3.0" description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." -category = "main" optional = false python-versions = ">=3.7.0" files = [ @@ -414,7 +397,6 @@ files = [ name = "click" version = "8.1.7" description = "Composable command line interface toolkit" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -429,7 +411,6 @@ colorama = {version = "*", markers = "platform_system == \"Windows\""} name = "colorama" version = "0.4.6" description = "Cross-platform colored terminal text." -category = "main" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7" files = [ @@ -441,7 +422,6 @@ files = [ name = "colorlog" version = "6.7.0" description = "Add colours to the output of Python's logging module." -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -459,7 +439,6 @@ development = ["black", "flake8", "mypy", "pytest", "types-colorama"] name = "comm" version = "0.1.4" description = "Jupyter Python Comm implementation, for usage in ipykernel, xeus-python etc." -category = "dev" optional = false python-versions = ">=3.6" files = [ @@ -475,74 +454,10 @@ lint = ["black (>=22.6.0)", "mdformat (>0.7)", "mdformat-gfm (>=0.3.5)", "ruff ( test = ["pytest"] typing = ["mypy (>=0.990)"] -[[package]] -name = "contourpy" -version = "1.1.0" -description = "Python library for calculating contours of 2D quadrilateral grids" -category = "dev" -optional = false -python-versions = ">=3.8" -files = [ - {file = "contourpy-1.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:89f06eff3ce2f4b3eb24c1055a26981bffe4e7264acd86f15b97e40530b794bc"}, - {file = "contourpy-1.1.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:dffcc2ddec1782dd2f2ce1ef16f070861af4fb78c69862ce0aab801495dda6a3"}, - {file = "contourpy-1.1.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:25ae46595e22f93592d39a7eac3d638cda552c3e1160255258b695f7b58e5655"}, - {file = "contourpy-1.1.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:17cfaf5ec9862bc93af1ec1f302457371c34e688fbd381f4035a06cd47324f48"}, - {file = "contourpy-1.1.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:18a64814ae7bce73925131381603fff0116e2df25230dfc80d6d690aa6e20b37"}, - {file = "contourpy-1.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:90c81f22b4f572f8a2110b0b741bb64e5a6427e0a198b2cdc1fbaf85f352a3aa"}, - {file = "contourpy-1.1.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:53cc3a40635abedbec7f1bde60f8c189c49e84ac180c665f2cd7c162cc454baa"}, - {file = "contourpy-1.1.0-cp310-cp310-win32.whl", hash = "sha256:9b2dd2ca3ac561aceef4c7c13ba654aaa404cf885b187427760d7f7d4c57cff8"}, - {file = "contourpy-1.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:1f795597073b09d631782e7245016a4323cf1cf0b4e06eef7ea6627e06a37ff2"}, - {file = "contourpy-1.1.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:0b7b04ed0961647691cfe5d82115dd072af7ce8846d31a5fac6c142dcce8b882"}, - {file = "contourpy-1.1.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:27bc79200c742f9746d7dd51a734ee326a292d77e7d94c8af6e08d1e6c15d545"}, - {file = "contourpy-1.1.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:052cc634bf903c604ef1a00a5aa093c54f81a2612faedaa43295809ffdde885e"}, - {file = "contourpy-1.1.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9382a1c0bc46230fb881c36229bfa23d8c303b889b788b939365578d762b5c18"}, - {file = "contourpy-1.1.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e5cec36c5090e75a9ac9dbd0ff4a8cf7cecd60f1b6dc23a374c7d980a1cd710e"}, - {file = "contourpy-1.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1f0cbd657e9bde94cd0e33aa7df94fb73c1ab7799378d3b3f902eb8eb2e04a3a"}, - {file = "contourpy-1.1.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:181cbace49874f4358e2929aaf7ba84006acb76694102e88dd15af861996c16e"}, - {file = "contourpy-1.1.0-cp311-cp311-win32.whl", hash = "sha256:edb989d31065b1acef3828a3688f88b2abb799a7db891c9e282df5ec7e46221b"}, - {file = "contourpy-1.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:fb3b7d9e6243bfa1efb93ccfe64ec610d85cfe5aec2c25f97fbbd2e58b531256"}, - {file = "contourpy-1.1.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:bcb41692aa09aeb19c7c213411854402f29f6613845ad2453d30bf421fe68fed"}, - {file = "contourpy-1.1.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:5d123a5bc63cd34c27ff9c7ac1cd978909e9c71da12e05be0231c608048bb2ae"}, - {file = "contourpy-1.1.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:62013a2cf68abc80dadfd2307299bfa8f5aa0dcaec5b2954caeb5fa094171103"}, - {file = "contourpy-1.1.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0b6616375d7de55797d7a66ee7d087efe27f03d336c27cf1f32c02b8c1a5ac70"}, - {file = "contourpy-1.1.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:317267d915490d1e84577924bd61ba71bf8681a30e0d6c545f577363157e5e94"}, - {file = "contourpy-1.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d551f3a442655f3dcc1285723f9acd646ca5858834efeab4598d706206b09c9f"}, - {file = "contourpy-1.1.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:e7a117ce7df5a938fe035cad481b0189049e8d92433b4b33aa7fc609344aafa1"}, - {file = "contourpy-1.1.0-cp38-cp38-win32.whl", hash = "sha256:108dfb5b3e731046a96c60bdc46a1a0ebee0760418951abecbe0fc07b5b93b27"}, - {file = "contourpy-1.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:d4f26b25b4f86087e7d75e63212756c38546e70f2a92d2be44f80114826e1cd4"}, - {file = "contourpy-1.1.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:bc00bb4225d57bff7ebb634646c0ee2a1298402ec10a5fe7af79df9a51c1bfd9"}, - {file = "contourpy-1.1.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:189ceb1525eb0655ab8487a9a9c41f42a73ba52d6789754788d1883fb06b2d8a"}, - {file = "contourpy-1.1.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9f2931ed4741f98f74b410b16e5213f71dcccee67518970c42f64153ea9313b9"}, - {file = "contourpy-1.1.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:30f511c05fab7f12e0b1b7730ebdc2ec8deedcfb505bc27eb570ff47c51a8f15"}, - {file = "contourpy-1.1.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:143dde50520a9f90e4a2703f367cf8ec96a73042b72e68fcd184e1279962eb6f"}, - {file = "contourpy-1.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e94bef2580e25b5fdb183bf98a2faa2adc5b638736b2c0a4da98691da641316a"}, - {file = "contourpy-1.1.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:ed614aea8462735e7d70141374bd7650afd1c3f3cb0c2dbbcbe44e14331bf002"}, - {file = "contourpy-1.1.0-cp39-cp39-win32.whl", hash = "sha256:71551f9520f008b2950bef5f16b0e3587506ef4f23c734b71ffb7b89f8721999"}, - {file = "contourpy-1.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:438ba416d02f82b692e371858143970ed2eb6337d9cdbbede0d8ad9f3d7dd17d"}, - {file = "contourpy-1.1.0-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:a698c6a7a432789e587168573a864a7ea374c6be8d4f31f9d87c001d5a843493"}, - {file = "contourpy-1.1.0-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:397b0ac8a12880412da3551a8cb5a187d3298a72802b45a3bd1805e204ad8439"}, - {file = "contourpy-1.1.0-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:a67259c2b493b00e5a4d0f7bfae51fb4b3371395e47d079a4446e9b0f4d70e76"}, - {file = "contourpy-1.1.0-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:2b836d22bd2c7bb2700348e4521b25e077255ebb6ab68e351ab5aa91ca27e027"}, - {file = "contourpy-1.1.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:084eaa568400cfaf7179b847ac871582199b1b44d5699198e9602ecbbb5f6104"}, - {file = "contourpy-1.1.0-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:911ff4fd53e26b019f898f32db0d4956c9d227d51338fb3b03ec72ff0084ee5f"}, - {file = "contourpy-1.1.0.tar.gz", hash = "sha256:e53046c3863828d21d531cc3b53786e6580eb1ba02477e8681009b6aa0870b21"}, -] - -[package.dependencies] -numpy = ">=1.16" - -[package.extras] -bokeh = ["bokeh", "selenium"] -docs = ["furo", "sphinx-copybutton"] -mypy = ["contourpy[bokeh,docs]", "docutils-stubs", "mypy (==1.2.0)", "types-Pillow"] -test = ["Pillow", "contourpy[test-no-images]", "matplotlib"] -test-no-images = ["pytest", "pytest-cov", "wurlitzer"] - [[package]] name = "contourpy" version = "1.1.1" description = "Python library for calculating contours of 2D quadrilateral grids" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -601,7 +516,10 @@ files = [ ] [package.dependencies] -numpy = {version = ">=1.16,<2.0", markers = "python_version <= \"3.11\""} +numpy = [ + {version = ">=1.16,<2.0", markers = "python_version <= \"3.11\""}, + {version = ">=1.26.0rc1,<2.0", markers = "python_version >= \"3.12\""}, +] [package.extras] bokeh = ["bokeh", "selenium"] @@ -614,7 +532,6 @@ test-no-images = ["pytest", "pytest-cov", "wurlitzer"] name = "coverage" version = "7.3.2" description = "Code coverage measurement for Python" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -682,7 +599,6 @@ toml = ["tomli"] name = "coverage-badge" version = "1.1.0" description = "Generate coverage badges for Coverage.py." -category = "dev" optional = false python-versions = "*" files = [ @@ -697,7 +613,6 @@ coverage = "*" name = "cycler" version = "0.12.1" description = "Composable style cycles" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -713,7 +628,6 @@ tests = ["pytest", "pytest-cov", "pytest-xdist"] name = "debugpy" version = "1.8.0" description = "An implementation of the Debug Adapter Protocol for Python" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -741,7 +655,6 @@ files = [ name = "decorator" version = "5.1.1" description = "Decorators for Humans" -category = "dev" optional = false python-versions = ">=3.5" files = [ @@ -753,7 +666,6 @@ files = [ name = "defusedxml" version = "0.7.1" description = "XML bomb protection for Python stdlib modules" -category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" files = [ @@ -765,7 +677,6 @@ files = [ name = "distlib" version = "0.3.7" description = "Distribution utilities" -category = "dev" optional = false python-versions = "*" files = [ @@ -777,7 +688,6 @@ files = [ name = "docutils" version = "0.18.1" description = "Docutils -- Python Documentation Utilities" -category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" files = [ @@ -789,7 +699,6 @@ files = [ name = "exceptiongroup" version = "1.1.3" description = "Backport of PEP 654 (exception groups)" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -804,7 +713,6 @@ test = ["pytest (>=6)"] name = "executing" version = "2.0.0" description = "Get the currently executing AST node of a frame, and other information" -category = "dev" optional = false python-versions = "*" files = [ @@ -819,7 +727,6 @@ tests = ["asttokens (>=2.1.0)", "coverage", "coverage-enable-subprocess", "ipyth name = "fastjsonschema" version = "2.18.1" description = "Fastest Python implementation of JSON schema" -category = "dev" optional = false python-versions = "*" files = [ @@ -834,7 +741,6 @@ devel = ["colorama", "json-spec", "jsonschema", "pylint", "pytest", "pytest-benc name = "filelock" version = "3.12.4" description = "A platform independent file lock." -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -851,7 +757,6 @@ typing = ["typing-extensions (>=4.7.1)"] name = "flake8" version = "6.1.0" description = "the modular source code checker: pep8 pyflakes and co" -category = "dev" optional = false python-versions = ">=3.8.1" files = [ @@ -868,7 +773,6 @@ pyflakes = ">=3.1.0,<3.2.0" name = "fonttools" version = "4.43.1" description = "Tools to manipulate font files" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -934,7 +838,6 @@ woff = ["brotli (>=1.0.1)", "brotlicffi (>=0.8.0)", "zopfli (>=0.1.4)"] name = "hypothesis" version = "6.87.3" description = "A library for property-based testing" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -967,7 +870,6 @@ zoneinfo = ["backports.zoneinfo (>=0.2.1)", "tzdata (>=2023.3)"] name = "identify" version = "2.5.30" description = "File identification library for Python" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -982,7 +884,6 @@ license = ["ukkonen"] name = "idna" version = "3.4" description = "Internationalized Domain Names in Applications (IDNA)" -category = "main" optional = false python-versions = ">=3.5" files = [ @@ -994,7 +895,6 @@ files = [ name = "imagesize" version = "1.4.1" description = "Getting image size from png/jpeg/jpeg2000/gif file" -category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" files = [ @@ -1006,7 +906,6 @@ files = [ name = "importlib-metadata" version = "6.8.0" description = "Read metadata from Python packages" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -1026,7 +925,6 @@ testing = ["flufl.flake8", "importlib-resources (>=1.3)", "packaging", "pyfakefs name = "importlib-resources" version = "6.1.0" description = "Read resources from Python packages" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -1045,7 +943,6 @@ testing = ["pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", name = "iniconfig" version = "2.0.0" description = "brain-dead simple config-ini parsing" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -1057,7 +954,6 @@ files = [ name = "ipykernel" version = "6.25.2" description = "IPython Kernel for Jupyter" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -1071,7 +967,7 @@ comm = ">=0.1.1" debugpy = ">=1.6.5" ipython = ">=7.23.1" jupyter-client = ">=6.1.12" -jupyter-core = ">=4.12,<5.0.0 || >=5.1.0" +jupyter-core = ">=4.12,<5.0.dev0 || >=5.1.dev0" matplotlib-inline = ">=0.1" nest-asyncio = "*" packaging = "*" @@ -1091,7 +987,6 @@ test = ["flaky", "ipyparallel", "pre-commit", "pytest (>=7.0)", "pytest-asyncio" name = "ipython" version = "8.16.1" description = "IPython: Productive Interactive Computing" -category = "dev" optional = false python-versions = ">=3.9" files = [ @@ -1132,7 +1027,6 @@ test-extra = ["curio", "matplotlib (!=3.2.0)", "nbformat", "numpy (>=1.21)", "pa name = "isodate" version = "0.6.1" description = "An ISO 8601 date/time/duration parser and formatter" -category = "main" optional = false python-versions = "*" files = [ @@ -1147,7 +1041,6 @@ six = "*" name = "isort" version = "5.12.0" description = "A Python utility / library to sort Python imports." -category = "dev" optional = false python-versions = ">=3.8.0" files = [ @@ -1165,7 +1058,6 @@ requirements-deprecated-finder = ["pip-api", "pipreqs"] name = "jedi" version = "0.19.1" description = "An autocompletion tool for Python that can be used for text editors." -category = "dev" optional = false python-versions = ">=3.6" files = [ @@ -1185,7 +1077,6 @@ testing = ["Django", "attrs", "colorama", "docopt", "pytest (<7.0.0)"] name = "jinja2" version = "3.1.2" description = "A very fast and expressive template engine." -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -1203,7 +1094,6 @@ i18n = ["Babel (>=2.7)"] name = "jsonschema" version = "4.19.1" description = "An implementation of JSON Schema validation for Python" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -1225,7 +1115,6 @@ format-nongpl = ["fqdn", "idna", "isoduration", "jsonpointer (>1.13)", "rfc3339- name = "jsonschema-specifications" version = "2023.7.1" description = "The JSON Schema meta-schemas and vocabularies, exposed as a Registry" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -1240,7 +1129,6 @@ referencing = ">=0.28.0" name = "jupyter-client" version = "8.3.1" description = "Jupyter protocol implementation and client libraries" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -1250,7 +1138,7 @@ files = [ [package.dependencies] importlib-metadata = {version = ">=4.8.3", markers = "python_version < \"3.10\""} -jupyter-core = ">=4.12,<5.0.0 || >=5.1.0" +jupyter-core = ">=4.12,<5.0.dev0 || >=5.1.dev0" python-dateutil = ">=2.8.2" pyzmq = ">=23.0" tornado = ">=6.2" @@ -1264,7 +1152,6 @@ test = ["coverage", "ipykernel (>=6.14)", "mypy", "paramiko", "pre-commit", "pyt name = "jupyter-core" version = "5.4.0" description = "Jupyter core package. A base package on which Jupyter projects rely." -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -1285,7 +1172,6 @@ test = ["ipykernel", "pre-commit", "pytest", "pytest-cov", "pytest-timeout"] name = "jupyterlab-pygments" version = "0.2.2" description = "Pygments theme using JupyterLab CSS variables" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -1297,7 +1183,6 @@ files = [ name = "kiwisolver" version = "1.4.5" description = "A fast implementation of the Cassowary constraint solver" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -1411,7 +1296,6 @@ files = [ name = "markdown-it-py" version = "2.2.0" description = "Python port of markdown-it. Markdown parsing, done right!" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -1436,7 +1320,6 @@ testing = ["coverage", "pytest", "pytest-cov", "pytest-regressions"] name = "markupsafe" version = "2.1.3" description = "Safely add untrusted strings to HTML/XML markup." -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -1506,7 +1389,6 @@ files = [ name = "matplotlib" version = "3.8.0" description = "Python plotting package" -category = "dev" optional = false python-versions = ">=3.9" files = [ @@ -1557,7 +1439,6 @@ setuptools_scm = ">=7" name = "matplotlib-inline" version = "0.1.6" description = "Inline Matplotlib backend for Jupyter" -category = "dev" optional = false python-versions = ">=3.5" files = [ @@ -1572,7 +1453,6 @@ traitlets = "*" name = "mccabe" version = "0.7.0" description = "McCabe checker, plugin for flake8" -category = "dev" optional = false python-versions = ">=3.6" files = [ @@ -1584,7 +1464,6 @@ files = [ name = "mdit-py-plugins" version = "0.3.5" description = "Collection of plugins for markdown-it-py" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -1604,7 +1483,6 @@ testing = ["coverage", "pytest", "pytest-cov", "pytest-regressions"] name = "mdurl" version = "0.1.2" description = "Markdown URL utilities" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -1616,7 +1494,6 @@ files = [ name = "mistune" version = "3.0.2" description = "A sane and fast Markdown parser with useful plugins and renderers" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -1628,7 +1505,6 @@ files = [ name = "more-itertools" version = "10.1.0" description = "More routines for operating on iterables, beyond itertools" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -1640,7 +1516,6 @@ files = [ name = "mypy-extensions" version = "1.0.0" description = "Type system extensions for programs checked with the mypy type checker." -category = "dev" optional = false python-versions = ">=3.5" files = [ @@ -1652,7 +1527,6 @@ files = [ name = "myst-parser" version = "0.18.1" description = "An extended commonmark compliant parser, with bridges to docutils & sphinx." -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -1679,7 +1553,6 @@ testing = ["beautifulsoup4", "coverage[toml]", "pytest (>=6,<7)", "pytest-cov", name = "nbclient" version = "0.8.0" description = "A client library for executing notebooks. Formerly nbconvert's ExecutePreprocessor." -category = "dev" optional = false python-versions = ">=3.8.0" files = [ @@ -1689,7 +1562,7 @@ files = [ [package.dependencies] jupyter-client = ">=6.1.12" -jupyter-core = ">=4.12,<5.0.0 || >=5.1.0" +jupyter-core = ">=4.12,<5.0.dev0 || >=5.1.dev0" nbformat = ">=5.1" traitlets = ">=5.4" @@ -1702,7 +1575,6 @@ test = ["flaky", "ipykernel (>=6.19.3)", "ipython", "ipywidgets", "nbconvert (>= name = "nbconvert" version = "7.9.2" description = "Converting Jupyter Notebooks" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -1741,7 +1613,6 @@ webpdf = ["playwright"] name = "nbformat" version = "5.9.2" description = "The Jupyter Notebook format" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -1763,7 +1634,6 @@ test = ["pep440", "pre-commit", "pytest", "testpath"] name = "nbsphinx" version = "0.9.3" description = "Jupyter Notebook Tools for Sphinx" -category = "dev" optional = false python-versions = ">=3.6" files = [ @@ -1783,7 +1653,6 @@ traitlets = ">=5" name = "neo4j" version = "4.4.11" description = "Neo4j Bolt driver for Python" -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -1797,7 +1666,6 @@ pytz = "*" name = "neo4j-utils" version = "0.0.7" description = "" -category = "main" optional = false python-versions = ">=3.8,<4.0" files = [ @@ -1815,7 +1683,6 @@ toml = "*" name = "nest-asyncio" version = "1.5.8" description = "Patch asyncio to allow nested event loops" -category = "dev" optional = false python-versions = ">=3.5" files = [ @@ -1827,7 +1694,6 @@ files = [ name = "networkx" version = "3.1" description = "Python package for creating and manipulating graphs and networks" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -1846,7 +1712,6 @@ test = ["codecov (>=2.1)", "pytest (>=7.2)", "pytest-cov (>=4.0)"] name = "nodeenv" version = "1.8.0" description = "Node.js virtual environment builder" -category = "dev" optional = false python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*" files = [ @@ -1861,7 +1726,6 @@ setuptools = "*" name = "numpy" version = "1.25.2" description = "Fundamental package for array computing in Python" -category = "main" optional = false python-versions = ">=3.9" files = [ @@ -1896,7 +1760,6 @@ files = [ name = "numpy" version = "1.26.0" description = "Fundamental package for array computing in Python" -category = "main" optional = false python-versions = "<3.13,>=3.9" files = [ @@ -1934,11 +1797,55 @@ files = [ {file = "numpy-1.26.0.tar.gz", hash = "sha256:f93fc78fe8bf15afe2b8d6b6499f1c73953169fad1e9a8dd086cdff3190e7fdf"}, ] +[[package]] +name = "numpy" +version = "1.26.4" +description = "Fundamental package for array computing in Python" +optional = false +python-versions = ">=3.9" +files = [ + {file = "numpy-1.26.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:9ff0f4f29c51e2803569d7a51c2304de5554655a60c5d776e35b4a41413830d0"}, + {file = "numpy-1.26.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:2e4ee3380d6de9c9ec04745830fd9e2eccb3e6cf790d39d7b98ffd19b0dd754a"}, + {file = "numpy-1.26.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d209d8969599b27ad20994c8e41936ee0964e6da07478d6c35016bc386b66ad4"}, + {file = "numpy-1.26.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ffa75af20b44f8dba823498024771d5ac50620e6915abac414251bd971b4529f"}, + {file = "numpy-1.26.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:62b8e4b1e28009ef2846b4c7852046736bab361f7aeadeb6a5b89ebec3c7055a"}, + {file = "numpy-1.26.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:a4abb4f9001ad2858e7ac189089c42178fcce737e4169dc61321660f1a96c7d2"}, + {file = "numpy-1.26.4-cp310-cp310-win32.whl", hash = "sha256:bfe25acf8b437eb2a8b2d49d443800a5f18508cd811fea3181723922a8a82b07"}, + {file = "numpy-1.26.4-cp310-cp310-win_amd64.whl", hash = "sha256:b97fe8060236edf3662adfc2c633f56a08ae30560c56310562cb4f95500022d5"}, + {file = "numpy-1.26.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:4c66707fabe114439db9068ee468c26bbdf909cac0fb58686a42a24de1760c71"}, + {file = "numpy-1.26.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:edd8b5fe47dab091176d21bb6de568acdd906d1887a4584a15a9a96a1dca06ef"}, + {file = "numpy-1.26.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7ab55401287bfec946ced39700c053796e7cc0e3acbef09993a9ad2adba6ca6e"}, + {file = "numpy-1.26.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:666dbfb6ec68962c033a450943ded891bed2d54e6755e35e5835d63f4f6931d5"}, + {file = "numpy-1.26.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:96ff0b2ad353d8f990b63294c8986f1ec3cb19d749234014f4e7eb0112ceba5a"}, + {file = "numpy-1.26.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:60dedbb91afcbfdc9bc0b1f3f402804070deed7392c23eb7a7f07fa857868e8a"}, + {file = "numpy-1.26.4-cp311-cp311-win32.whl", hash = "sha256:1af303d6b2210eb850fcf03064d364652b7120803a0b872f5211f5234b399f20"}, + {file = "numpy-1.26.4-cp311-cp311-win_amd64.whl", hash = "sha256:cd25bcecc4974d09257ffcd1f098ee778f7834c3ad767fe5db785be9a4aa9cb2"}, + {file = "numpy-1.26.4-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:b3ce300f3644fb06443ee2222c2201dd3a89ea6040541412b8fa189341847218"}, + {file = "numpy-1.26.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:03a8c78d01d9781b28a6989f6fa1bb2c4f2d51201cf99d3dd875df6fbd96b23b"}, + {file = "numpy-1.26.4-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9fad7dcb1aac3c7f0584a5a8133e3a43eeb2fe127f47e3632d43d677c66c102b"}, + {file = "numpy-1.26.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:675d61ffbfa78604709862923189bad94014bef562cc35cf61d3a07bba02a7ed"}, + {file = "numpy-1.26.4-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:ab47dbe5cc8210f55aa58e4805fe224dac469cde56b9f731a4c098b91917159a"}, + {file = "numpy-1.26.4-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:1dda2e7b4ec9dd512f84935c5f126c8bd8b9f2fc001e9f54af255e8c5f16b0e0"}, + {file = "numpy-1.26.4-cp312-cp312-win32.whl", hash = "sha256:50193e430acfc1346175fcbdaa28ffec49947a06918b7b92130744e81e640110"}, + {file = "numpy-1.26.4-cp312-cp312-win_amd64.whl", hash = "sha256:08beddf13648eb95f8d867350f6a018a4be2e5ad54c8d8caed89ebca558b2818"}, + {file = "numpy-1.26.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:7349ab0fa0c429c82442a27a9673fc802ffdb7c7775fad780226cb234965e53c"}, + {file = "numpy-1.26.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:52b8b60467cd7dd1e9ed082188b4e6bb35aa5cdd01777621a1658910745b90be"}, + {file = "numpy-1.26.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d5241e0a80d808d70546c697135da2c613f30e28251ff8307eb72ba696945764"}, + {file = "numpy-1.26.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f870204a840a60da0b12273ef34f7051e98c3b5961b61b0c2c1be6dfd64fbcd3"}, + {file = "numpy-1.26.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:679b0076f67ecc0138fd2ede3a8fd196dddc2ad3254069bcb9faf9a79b1cebcd"}, + {file = "numpy-1.26.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:47711010ad8555514b434df65f7d7b076bb8261df1ca9bb78f53d3b2db02e95c"}, + {file = "numpy-1.26.4-cp39-cp39-win32.whl", hash = "sha256:a354325ee03388678242a4d7ebcd08b5c727033fcff3b2f536aea978e15ee9e6"}, + {file = "numpy-1.26.4-cp39-cp39-win_amd64.whl", hash = "sha256:3373d5d70a5fe74a2c1bb6d2cfd9609ecf686d47a2d7b1d37a8f3b6bf6003aea"}, + {file = "numpy-1.26.4-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:afedb719a9dcfc7eaf2287b839d8198e06dcd4cb5d276a3df279231138e83d30"}, + {file = "numpy-1.26.4-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:95a7476c59002f2f6c590b9b7b998306fba6a5aa646b1e22ddfeaf8f78c3a29c"}, + {file = "numpy-1.26.4-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:7e50d0a0cc3189f9cb0aeb3a6a6af18c16f59f004b866cd2be1c14b36134a4a0"}, + {file = "numpy-1.26.4.tar.gz", hash = "sha256:2a02aba9ed12e4ac4eb3ea9421c420301a0c6460d9830d74a9df87efa4912010"}, +] + [[package]] name = "packaging" version = "23.2" description = "Core utilities for Python packages" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -1950,7 +1857,6 @@ files = [ name = "pandas" version = "2.1.0" description = "Powerful data structures for data analysis, time series, and statistics" -category = "main" optional = false python-versions = ">=3.9" files = [ @@ -1975,75 +1881,10 @@ files = [ {file = "pandas-2.1.0.tar.gz", hash = "sha256:62c24c7fc59e42b775ce0679cfa7b14a5f9bfb7643cfbe708c960699e05fb918"}, ] -[package.dependencies] -numpy = {version = ">=1.23.2", markers = "python_version >= \"3.11\""} -python-dateutil = ">=2.8.2" -pytz = ">=2020.1" -tzdata = ">=2022.1" - -[package.extras] -all = ["PyQt5 (>=5.15.6)", "SQLAlchemy (>=1.4.36)", "beautifulsoup4 (>=4.11.1)", "bottleneck (>=1.3.4)", "dataframe-api-compat (>=0.1.7)", "fastparquet (>=0.8.1)", "fsspec (>=2022.05.0)", "gcsfs (>=2022.05.0)", "html5lib (>=1.1)", "hypothesis (>=6.46.1)", "jinja2 (>=3.1.2)", "lxml (>=4.8.0)", "matplotlib (>=3.6.1)", "numba (>=0.55.2)", "numexpr (>=2.8.0)", "odfpy (>=1.4.1)", "openpyxl (>=3.0.10)", "pandas-gbq (>=0.17.5)", "psycopg2 (>=2.9.3)", "pyarrow (>=7.0.0)", "pymysql (>=1.0.2)", "pyreadstat (>=1.1.5)", "pytest (>=7.3.2)", "pytest-asyncio (>=0.17.0)", "pytest-xdist (>=2.2.0)", "pyxlsb (>=1.0.9)", "qtpy (>=2.2.0)", "s3fs (>=2022.05.0)", "scipy (>=1.8.1)", "tables (>=3.7.0)", "tabulate (>=0.8.10)", "xarray (>=2022.03.0)", "xlrd (>=2.0.1)", "xlsxwriter (>=3.0.3)", "zstandard (>=0.17.0)"] -aws = ["s3fs (>=2022.05.0)"] -clipboard = ["PyQt5 (>=5.15.6)", "qtpy (>=2.2.0)"] -compression = ["zstandard (>=0.17.0)"] -computation = ["scipy (>=1.8.1)", "xarray (>=2022.03.0)"] -consortium-standard = ["dataframe-api-compat (>=0.1.7)"] -excel = ["odfpy (>=1.4.1)", "openpyxl (>=3.0.10)", "pyxlsb (>=1.0.9)", "xlrd (>=2.0.1)", "xlsxwriter (>=3.0.3)"] -feather = ["pyarrow (>=7.0.0)"] -fss = ["fsspec (>=2022.05.0)"] -gcp = ["gcsfs (>=2022.05.0)", "pandas-gbq (>=0.17.5)"] -hdf5 = ["tables (>=3.7.0)"] -html = ["beautifulsoup4 (>=4.11.1)", "html5lib (>=1.1)", "lxml (>=4.8.0)"] -mysql = ["SQLAlchemy (>=1.4.36)", "pymysql (>=1.0.2)"] -output-formatting = ["jinja2 (>=3.1.2)", "tabulate (>=0.8.10)"] -parquet = ["pyarrow (>=7.0.0)"] -performance = ["bottleneck (>=1.3.4)", "numba (>=0.55.2)", "numexpr (>=2.8.0)"] -plot = ["matplotlib (>=3.6.1)"] -postgresql = ["SQLAlchemy (>=1.4.36)", "psycopg2 (>=2.9.3)"] -spss = ["pyreadstat (>=1.1.5)"] -sql-other = ["SQLAlchemy (>=1.4.36)"] -test = ["hypothesis (>=6.46.1)", "pytest (>=7.3.2)", "pytest-asyncio (>=0.17.0)", "pytest-xdist (>=2.2.0)"] -xml = ["lxml (>=4.8.0)"] - -[[package]] -name = "pandas" -version = "2.1.1" -description = "Powerful data structures for data analysis, time series, and statistics" -category = "main" -optional = false -python-versions = ">=3.9" -files = [ - {file = "pandas-2.1.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:58d997dbee0d4b64f3cb881a24f918b5f25dd64ddf31f467bb9b67ae4c63a1e4"}, - {file = "pandas-2.1.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:02304e11582c5d090e5a52aec726f31fe3f42895d6bfc1f28738f9b64b6f0614"}, - {file = "pandas-2.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffa8f0966de2c22de408d0e322db2faed6f6e74265aa0856f3824813cf124363"}, - {file = "pandas-2.1.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c1f84c144dee086fe4f04a472b5cd51e680f061adf75c1ae4fc3a9275560f8f4"}, - {file = "pandas-2.1.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:75ce97667d06d69396d72be074f0556698c7f662029322027c226fd7a26965cb"}, - {file = "pandas-2.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:4c3f32fd7c4dccd035f71734df39231ac1a6ff95e8bdab8d891167197b7018d2"}, - {file = "pandas-2.1.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:9e2959720b70e106bb1d8b6eadd8ecd7c8e99ccdbe03ee03260877184bb2877d"}, - {file = "pandas-2.1.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:25e8474a8eb258e391e30c288eecec565bfed3e026f312b0cbd709a63906b6f8"}, - {file = "pandas-2.1.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b8bd1685556f3374520466998929bade3076aeae77c3e67ada5ed2b90b4de7f0"}, - {file = "pandas-2.1.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dc3657869c7902810f32bd072f0740487f9e030c1a3ab03e0af093db35a9d14e"}, - {file = "pandas-2.1.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:05674536bd477af36aa2effd4ec8f71b92234ce0cc174de34fd21e2ee99adbc2"}, - {file = "pandas-2.1.1-cp311-cp311-win_amd64.whl", hash = "sha256:b407381258a667df49d58a1b637be33e514b07f9285feb27769cedb3ab3d0b3a"}, - {file = "pandas-2.1.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:c747793c4e9dcece7bb20156179529898abf505fe32cb40c4052107a3c620b49"}, - {file = "pandas-2.1.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:3bcad1e6fb34b727b016775bea407311f7721db87e5b409e6542f4546a4951ea"}, - {file = "pandas-2.1.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f5ec7740f9ccb90aec64edd71434711f58ee0ea7f5ed4ac48be11cfa9abf7317"}, - {file = "pandas-2.1.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:29deb61de5a8a93bdd033df328441a79fcf8dd3c12d5ed0b41a395eef9cd76f0"}, - {file = "pandas-2.1.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:4f99bebf19b7e03cf80a4e770a3e65eee9dd4e2679039f542d7c1ace7b7b1daa"}, - {file = "pandas-2.1.1-cp312-cp312-win_amd64.whl", hash = "sha256:84e7e910096416adec68075dc87b986ff202920fb8704e6d9c8c9897fe7332d6"}, - {file = "pandas-2.1.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:366da7b0e540d1b908886d4feb3d951f2f1e572e655c1160f5fde28ad4abb750"}, - {file = "pandas-2.1.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:9e50e72b667415a816ac27dfcfe686dc5a0b02202e06196b943d54c4f9c7693e"}, - {file = "pandas-2.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cc1ab6a25da197f03ebe6d8fa17273126120874386b4ac11c1d687df288542dd"}, - {file = "pandas-2.1.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a0dbfea0dd3901ad4ce2306575c54348d98499c95be01b8d885a2737fe4d7a98"}, - {file = "pandas-2.1.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:0489b0e6aa3d907e909aef92975edae89b1ee1654db5eafb9be633b0124abe97"}, - {file = "pandas-2.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:4cdb0fab0400c2cb46dafcf1a0fe084c8bb2480a1fa8d81e19d15e12e6d4ded2"}, - {file = "pandas-2.1.1.tar.gz", hash = "sha256:fecb198dc389429be557cde50a2d46da8434a17fe37d7d41ff102e3987fd947b"}, -] - [package.dependencies] numpy = [ {version = ">=1.22.4", markers = "python_version < \"3.11\""}, - {version = ">=1.23.2", markers = "python_version == \"3.11\""}, + {version = ">=1.23.2", markers = "python_version >= \"3.11\""}, ] python-dateutil = ">=2.8.2" pytz = ">=2020.1" @@ -2077,7 +1918,6 @@ xml = ["lxml (>=4.8.0)"] name = "pandocfilters" version = "1.5.0" description = "Utilities for writing pandoc filters in python" -category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" files = [ @@ -2089,7 +1929,6 @@ files = [ name = "parso" version = "0.8.3" description = "A Python Parser" -category = "dev" optional = false python-versions = ">=3.6" files = [ @@ -2105,7 +1944,6 @@ testing = ["docopt", "pytest (<6.0.0)"] name = "pathspec" version = "0.11.2" description = "Utility library for gitignore style pattern matching of file paths." -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -2117,7 +1955,6 @@ files = [ name = "pexpect" version = "4.8.0" description = "Pexpect allows easy control of interactive console applications." -category = "dev" optional = false python-versions = "*" files = [ @@ -2132,7 +1969,6 @@ ptyprocess = ">=0.5" name = "pickleshare" version = "0.7.5" description = "Tiny 'shelve'-like database with concurrency support" -category = "dev" optional = false python-versions = "*" files = [ @@ -2142,77 +1978,94 @@ files = [ [[package]] name = "pillow" -version = "10.0.1" +version = "10.3.0" description = "Python Imaging Library (Fork)" -category = "dev" optional = false python-versions = ">=3.8" files = [ - {file = "Pillow-10.0.1-cp310-cp310-macosx_10_10_x86_64.whl", hash = "sha256:8f06be50669087250f319b706decf69ca71fdecd829091a37cc89398ca4dc17a"}, - {file = "Pillow-10.0.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:50bd5f1ebafe9362ad622072a1d2f5850ecfa44303531ff14353a4059113b12d"}, - {file = "Pillow-10.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e6a90167bcca1216606223a05e2cf991bb25b14695c518bc65639463d7db722d"}, - {file = "Pillow-10.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f11c9102c56ffb9ca87134bd025a43d2aba3f1155f508eff88f694b33a9c6d19"}, - {file = "Pillow-10.0.1-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:186f7e04248103482ea6354af6d5bcedb62941ee08f7f788a1c7707bc720c66f"}, - {file = "Pillow-10.0.1-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:0462b1496505a3462d0f35dc1c4d7b54069747d65d00ef48e736acda2c8cbdff"}, - {file = "Pillow-10.0.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d889b53ae2f030f756e61a7bff13684dcd77e9af8b10c6048fb2c559d6ed6eaf"}, - {file = "Pillow-10.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:552912dbca585b74d75279a7570dd29fa43b6d93594abb494ebb31ac19ace6bd"}, - {file = "Pillow-10.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:787bb0169d2385a798888e1122c980c6eff26bf941a8ea79747d35d8f9210ca0"}, - {file = "Pillow-10.0.1-cp311-cp311-macosx_10_10_x86_64.whl", hash = "sha256:fd2a5403a75b54661182b75ec6132437a181209b901446ee5724b589af8edef1"}, - {file = "Pillow-10.0.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:2d7e91b4379f7a76b31c2dda84ab9e20c6220488e50f7822e59dac36b0cd92b1"}, - {file = "Pillow-10.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:19e9adb3f22d4c416e7cd79b01375b17159d6990003633ff1d8377e21b7f1b21"}, - {file = "Pillow-10.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:93139acd8109edcdeffd85e3af8ae7d88b258b3a1e13a038f542b79b6d255c54"}, - {file = "Pillow-10.0.1-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:92a23b0431941a33242b1f0ce6c88a952e09feeea9af4e8be48236a68ffe2205"}, - {file = "Pillow-10.0.1-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:cbe68deb8580462ca0d9eb56a81912f59eb4542e1ef8f987405e35a0179f4ea2"}, - {file = "Pillow-10.0.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:522ff4ac3aaf839242c6f4e5b406634bfea002469656ae8358644fc6c4856a3b"}, - {file = "Pillow-10.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:84efb46e8d881bb06b35d1d541aa87f574b58e87f781cbba8d200daa835b42e1"}, - {file = "Pillow-10.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:898f1d306298ff40dc1b9ca24824f0488f6f039bc0e25cfb549d3195ffa17088"}, - {file = "Pillow-10.0.1-cp312-cp312-macosx_10_10_x86_64.whl", hash = "sha256:bcf1207e2f2385a576832af02702de104be71301c2696d0012b1b93fe34aaa5b"}, - {file = "Pillow-10.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:5d6c9049c6274c1bb565021367431ad04481ebb54872edecfcd6088d27edd6ed"}, - {file = "Pillow-10.0.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:28444cb6ad49726127d6b340217f0627abc8732f1194fd5352dec5e6a0105635"}, - {file = "Pillow-10.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:de596695a75496deb3b499c8c4f8e60376e0516e1a774e7bc046f0f48cd620ad"}, - {file = "Pillow-10.0.1-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:2872f2d7846cf39b3dbff64bc1104cc48c76145854256451d33c5faa55c04d1a"}, - {file = "Pillow-10.0.1-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:4ce90f8a24e1c15465048959f1e94309dfef93af272633e8f37361b824532e91"}, - {file = "Pillow-10.0.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:ee7810cf7c83fa227ba9125de6084e5e8b08c59038a7b2c9045ef4dde61663b4"}, - {file = "Pillow-10.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:b1be1c872b9b5fcc229adeadbeb51422a9633abd847c0ff87dc4ef9bb184ae08"}, - {file = "Pillow-10.0.1-cp312-cp312-win_amd64.whl", hash = "sha256:98533fd7fa764e5f85eebe56c8e4094db912ccbe6fbf3a58778d543cadd0db08"}, - {file = "Pillow-10.0.1-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:764d2c0daf9c4d40ad12fbc0abd5da3af7f8aa11daf87e4fa1b834000f4b6b0a"}, - {file = "Pillow-10.0.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:fcb59711009b0168d6ee0bd8fb5eb259c4ab1717b2f538bbf36bacf207ef7a68"}, - {file = "Pillow-10.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:697a06bdcedd473b35e50a7e7506b1d8ceb832dc238a336bd6f4f5aa91a4b500"}, - {file = "Pillow-10.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9f665d1e6474af9f9da5e86c2a3a2d2d6204e04d5af9c06b9d42afa6ebde3f21"}, - {file = "Pillow-10.0.1-cp38-cp38-manylinux_2_28_aarch64.whl", hash = "sha256:2fa6dd2661838c66f1a5473f3b49ab610c98a128fc08afbe81b91a1f0bf8c51d"}, - {file = "Pillow-10.0.1-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:3a04359f308ebee571a3127fdb1bd01f88ba6f6fb6d087f8dd2e0d9bff43f2a7"}, - {file = "Pillow-10.0.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:723bd25051454cea9990203405fa6b74e043ea76d4968166dfd2569b0210886a"}, - {file = "Pillow-10.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:71671503e3015da1b50bd18951e2f9daf5b6ffe36d16f1eb2c45711a301521a7"}, - {file = "Pillow-10.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:44e7e4587392953e5e251190a964675f61e4dae88d1e6edbe9f36d6243547ff3"}, - {file = "Pillow-10.0.1-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:3855447d98cced8670aaa63683808df905e956f00348732448b5a6df67ee5849"}, - {file = "Pillow-10.0.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ed2d9c0704f2dc4fa980b99d565c0c9a543fe5101c25b3d60488b8ba80f0cce1"}, - {file = "Pillow-10.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f5bb289bb835f9fe1a1e9300d011eef4d69661bb9b34d5e196e5e82c4cb09b37"}, - {file = "Pillow-10.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3a0d3e54ab1df9df51b914b2233cf779a5a10dfd1ce339d0421748232cea9876"}, - {file = "Pillow-10.0.1-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:2cc6b86ece42a11f16f55fe8903595eff2b25e0358dec635d0a701ac9586588f"}, - {file = "Pillow-10.0.1-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:ca26ba5767888c84bf5a0c1a32f069e8204ce8c21d00a49c90dabeba00ce0145"}, - {file = "Pillow-10.0.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:f0b4b06da13275bc02adfeb82643c4a6385bd08d26f03068c2796f60d125f6f2"}, - {file = "Pillow-10.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:bc2e3069569ea9dbe88d6b8ea38f439a6aad8f6e7a6283a38edf61ddefb3a9bf"}, - {file = "Pillow-10.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:8b451d6ead6e3500b6ce5c7916a43d8d8d25ad74b9102a629baccc0808c54971"}, - {file = "Pillow-10.0.1-pp310-pypy310_pp73-macosx_10_10_x86_64.whl", hash = "sha256:32bec7423cdf25c9038fef614a853c9d25c07590e1a870ed471f47fb80b244db"}, - {file = "Pillow-10.0.1-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b7cf63d2c6928b51d35dfdbda6f2c1fddbe51a6bc4a9d4ee6ea0e11670dd981e"}, - {file = "Pillow-10.0.1-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:f6d3d4c905e26354e8f9d82548475c46d8e0889538cb0657aa9c6f0872a37aa4"}, - {file = "Pillow-10.0.1-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:847e8d1017c741c735d3cd1883fa7b03ded4f825a6e5fcb9378fd813edee995f"}, - {file = "Pillow-10.0.1-pp39-pypy39_pp73-macosx_10_10_x86_64.whl", hash = "sha256:7f771e7219ff04b79e231d099c0a28ed83aa82af91fd5fa9fdb28f5b8d5addaf"}, - {file = "Pillow-10.0.1-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:459307cacdd4138edee3875bbe22a2492519e060660eaf378ba3b405d1c66317"}, - {file = "Pillow-10.0.1-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:b059ac2c4c7a97daafa7dc850b43b2d3667def858a4f112d1aa082e5c3d6cf7d"}, - {file = "Pillow-10.0.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:d6caf3cd38449ec3cd8a68b375e0c6fe4b6fd04edb6c9766b55ef84a6e8ddf2d"}, - {file = "Pillow-10.0.1.tar.gz", hash = "sha256:d72967b06be9300fed5cfbc8b5bafceec48bf7cdc7dab66b1d2549035287191d"}, + {file = "pillow-10.3.0-cp310-cp310-macosx_10_10_x86_64.whl", hash = "sha256:90b9e29824800e90c84e4022dd5cc16eb2d9605ee13f05d47641eb183cd73d45"}, + {file = "pillow-10.3.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:a2c405445c79c3f5a124573a051062300936b0281fee57637e706453e452746c"}, + {file = "pillow-10.3.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:78618cdbccaa74d3f88d0ad6cb8ac3007f1a6fa5c6f19af64b55ca170bfa1edf"}, + {file = "pillow-10.3.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:261ddb7ca91fcf71757979534fb4c128448b5b4c55cb6152d280312062f69599"}, + {file = "pillow-10.3.0-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:ce49c67f4ea0609933d01c0731b34b8695a7a748d6c8d186f95e7d085d2fe475"}, + {file = "pillow-10.3.0-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:b14f16f94cbc61215115b9b1236f9c18403c15dd3c52cf629072afa9d54c1cbf"}, + {file = "pillow-10.3.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d33891be6df59d93df4d846640f0e46f1a807339f09e79a8040bc887bdcd7ed3"}, + {file = "pillow-10.3.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:b50811d664d392f02f7761621303eba9d1b056fb1868c8cdf4231279645c25f5"}, + {file = "pillow-10.3.0-cp310-cp310-win32.whl", hash = "sha256:ca2870d5d10d8726a27396d3ca4cf7976cec0f3cb706debe88e3a5bd4610f7d2"}, + {file = "pillow-10.3.0-cp310-cp310-win_amd64.whl", hash = "sha256:f0d0591a0aeaefdaf9a5e545e7485f89910c977087e7de2b6c388aec32011e9f"}, + {file = "pillow-10.3.0-cp310-cp310-win_arm64.whl", hash = "sha256:ccce24b7ad89adb5a1e34a6ba96ac2530046763912806ad4c247356a8f33a67b"}, + {file = "pillow-10.3.0-cp311-cp311-macosx_10_10_x86_64.whl", hash = "sha256:5f77cf66e96ae734717d341c145c5949c63180842a545c47a0ce7ae52ca83795"}, + {file = "pillow-10.3.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:e4b878386c4bf293578b48fc570b84ecfe477d3b77ba39a6e87150af77f40c57"}, + {file = "pillow-10.3.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fdcbb4068117dfd9ce0138d068ac512843c52295ed996ae6dd1faf537b6dbc27"}, + {file = "pillow-10.3.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9797a6c8fe16f25749b371c02e2ade0efb51155e767a971c61734b1bf6293994"}, + {file = "pillow-10.3.0-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:9e91179a242bbc99be65e139e30690e081fe6cb91a8e77faf4c409653de39451"}, + {file = "pillow-10.3.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:1b87bd9d81d179bd8ab871603bd80d8645729939f90b71e62914e816a76fc6bd"}, + {file = "pillow-10.3.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:81d09caa7b27ef4e61cb7d8fbf1714f5aec1c6b6c5270ee53504981e6e9121ad"}, + {file = "pillow-10.3.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:048ad577748b9fa4a99a0548c64f2cb8d672d5bf2e643a739ac8faff1164238c"}, + {file = "pillow-10.3.0-cp311-cp311-win32.whl", hash = "sha256:7161ec49ef0800947dc5570f86568a7bb36fa97dd09e9827dc02b718c5643f09"}, + {file = "pillow-10.3.0-cp311-cp311-win_amd64.whl", hash = "sha256:8eb0908e954d093b02a543dc963984d6e99ad2b5e36503d8a0aaf040505f747d"}, + {file = "pillow-10.3.0-cp311-cp311-win_arm64.whl", hash = "sha256:4e6f7d1c414191c1199f8996d3f2282b9ebea0945693fb67392c75a3a320941f"}, + {file = "pillow-10.3.0-cp312-cp312-macosx_10_10_x86_64.whl", hash = "sha256:e46f38133e5a060d46bd630faa4d9fa0202377495df1f068a8299fd78c84de84"}, + {file = "pillow-10.3.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:50b8eae8f7334ec826d6eeffaeeb00e36b5e24aa0b9df322c247539714c6df19"}, + {file = "pillow-10.3.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9d3bea1c75f8c53ee4d505c3e67d8c158ad4df0d83170605b50b64025917f338"}, + {file = "pillow-10.3.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:19aeb96d43902f0a783946a0a87dbdad5c84c936025b8419da0a0cd7724356b1"}, + {file = "pillow-10.3.0-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:74d28c17412d9caa1066f7a31df8403ec23d5268ba46cd0ad2c50fb82ae40462"}, + {file = "pillow-10.3.0-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:ff61bfd9253c3915e6d41c651d5f962da23eda633cf02262990094a18a55371a"}, + {file = "pillow-10.3.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:d886f5d353333b4771d21267c7ecc75b710f1a73d72d03ca06df49b09015a9ef"}, + {file = "pillow-10.3.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:4b5ec25d8b17217d635f8935dbc1b9aa5907962fae29dff220f2659487891cd3"}, + {file = "pillow-10.3.0-cp312-cp312-win32.whl", hash = "sha256:51243f1ed5161b9945011a7360e997729776f6e5d7005ba0c6879267d4c5139d"}, + {file = "pillow-10.3.0-cp312-cp312-win_amd64.whl", hash = "sha256:412444afb8c4c7a6cc11a47dade32982439925537e483be7c0ae0cf96c4f6a0b"}, + {file = "pillow-10.3.0-cp312-cp312-win_arm64.whl", hash = "sha256:798232c92e7665fe82ac085f9d8e8ca98826f8e27859d9a96b41d519ecd2e49a"}, + {file = "pillow-10.3.0-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:4eaa22f0d22b1a7e93ff0a596d57fdede2e550aecffb5a1ef1106aaece48e96b"}, + {file = "pillow-10.3.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:cd5e14fbf22a87321b24c88669aad3a51ec052eb145315b3da3b7e3cc105b9a2"}, + {file = "pillow-10.3.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1530e8f3a4b965eb6a7785cf17a426c779333eb62c9a7d1bbcf3ffd5bf77a4aa"}, + {file = "pillow-10.3.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5d512aafa1d32efa014fa041d38868fda85028e3f930a96f85d49c7d8ddc0383"}, + {file = "pillow-10.3.0-cp38-cp38-manylinux_2_28_aarch64.whl", hash = "sha256:339894035d0ede518b16073bdc2feef4c991ee991a29774b33e515f1d308e08d"}, + {file = "pillow-10.3.0-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:aa7e402ce11f0885305bfb6afb3434b3cd8f53b563ac065452d9d5654c7b86fd"}, + {file = "pillow-10.3.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:0ea2a783a2bdf2a561808fe4a7a12e9aa3799b701ba305de596bc48b8bdfce9d"}, + {file = "pillow-10.3.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:c78e1b00a87ce43bb37642c0812315b411e856a905d58d597750eb79802aaaa3"}, + {file = "pillow-10.3.0-cp38-cp38-win32.whl", hash = "sha256:72d622d262e463dfb7595202d229f5f3ab4b852289a1cd09650362db23b9eb0b"}, + {file = "pillow-10.3.0-cp38-cp38-win_amd64.whl", hash = "sha256:2034f6759a722da3a3dbd91a81148cf884e91d1b747992ca288ab88c1de15999"}, + {file = "pillow-10.3.0-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:2ed854e716a89b1afcedea551cd85f2eb2a807613752ab997b9974aaa0d56936"}, + {file = "pillow-10.3.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:dc1a390a82755a8c26c9964d457d4c9cbec5405896cba94cf51f36ea0d855002"}, + {file = "pillow-10.3.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4203efca580f0dd6f882ca211f923168548f7ba334c189e9eab1178ab840bf60"}, + {file = "pillow-10.3.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3102045a10945173d38336f6e71a8dc71bcaeed55c3123ad4af82c52807b9375"}, + {file = "pillow-10.3.0-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:6fb1b30043271ec92dc65f6d9f0b7a830c210b8a96423074b15c7bc999975f57"}, + {file = "pillow-10.3.0-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:1dfc94946bc60ea375cc39cff0b8da6c7e5f8fcdc1d946beb8da5c216156ddd8"}, + {file = "pillow-10.3.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:b09b86b27a064c9624d0a6c54da01c1beaf5b6cadfa609cf63789b1d08a797b9"}, + {file = "pillow-10.3.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:d3b2348a78bc939b4fed6552abfd2e7988e0f81443ef3911a4b8498ca084f6eb"}, + {file = "pillow-10.3.0-cp39-cp39-win32.whl", hash = "sha256:45ebc7b45406febf07fef35d856f0293a92e7417ae7933207e90bf9090b70572"}, + {file = "pillow-10.3.0-cp39-cp39-win_amd64.whl", hash = "sha256:0ba26351b137ca4e0db0342d5d00d2e355eb29372c05afd544ebf47c0956ffeb"}, + {file = "pillow-10.3.0-cp39-cp39-win_arm64.whl", hash = "sha256:50fd3f6b26e3441ae07b7c979309638b72abc1a25da31a81a7fbd9495713ef4f"}, + {file = "pillow-10.3.0-pp310-pypy310_pp73-macosx_10_10_x86_64.whl", hash = "sha256:6b02471b72526ab8a18c39cb7967b72d194ec53c1fd0a70b050565a0f366d355"}, + {file = "pillow-10.3.0-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:8ab74c06ffdab957d7670c2a5a6e1a70181cd10b727cd788c4dd9005b6a8acd9"}, + {file = "pillow-10.3.0-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:048eeade4c33fdf7e08da40ef402e748df113fd0b4584e32c4af74fe78baaeb2"}, + {file = "pillow-10.3.0-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9e2ec1e921fd07c7cda7962bad283acc2f2a9ccc1b971ee4b216b75fad6f0463"}, + {file = "pillow-10.3.0-pp310-pypy310_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:4c8e73e99da7db1b4cad7f8d682cf6abad7844da39834c288fbfa394a47bbced"}, + {file = "pillow-10.3.0-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:16563993329b79513f59142a6b02055e10514c1a8e86dca8b48a893e33cf91e3"}, + {file = "pillow-10.3.0-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:dd78700f5788ae180b5ee8902c6aea5a5726bac7c364b202b4b3e3ba2d293170"}, + {file = "pillow-10.3.0-pp39-pypy39_pp73-macosx_10_10_x86_64.whl", hash = "sha256:aff76a55a8aa8364d25400a210a65ff59d0168e0b4285ba6bf2bd83cf675ba32"}, + {file = "pillow-10.3.0-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:b7bc2176354defba3edc2b9a777744462da2f8e921fbaf61e52acb95bafa9828"}, + {file = "pillow-10.3.0-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:793b4e24db2e8742ca6423d3fde8396db336698c55cd34b660663ee9e45ed37f"}, + {file = "pillow-10.3.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d93480005693d247f8346bc8ee28c72a2191bdf1f6b5db469c096c0c867ac015"}, + {file = "pillow-10.3.0-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl", hash = "sha256:c83341b89884e2b2e55886e8fbbf37c3fa5efd6c8907124aeb72f285ae5696e5"}, + {file = "pillow-10.3.0-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:1a1d1915db1a4fdb2754b9de292642a39a7fb28f1736699527bb649484fb966a"}, + {file = "pillow-10.3.0-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:a0eaa93d054751ee9964afa21c06247779b90440ca41d184aeb5d410f20ff591"}, + {file = "pillow-10.3.0.tar.gz", hash = "sha256:9d2455fbf44c914840c793e89aa82d0e1763a14253a000743719ae5946814b2d"}, ] [package.extras] docs = ["furo", "olefile", "sphinx (>=2.4)", "sphinx-copybutton", "sphinx-inline-tabs", "sphinx-removed-in", "sphinxext-opengraph"] +fpx = ["olefile"] +mic = ["olefile"] tests = ["check-manifest", "coverage", "defusedxml", "markdown2", "olefile", "packaging", "pyroma", "pytest", "pytest-cov", "pytest-timeout"] +typing = ["typing-extensions"] +xmp = ["defusedxml"] [[package]] name = "platformdirs" version = "3.11.0" description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -2228,7 +2081,6 @@ test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.4)", "pytest-co name = "pluggy" version = "1.3.0" description = "plugin and hook calling mechanisms for python" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -2244,7 +2096,6 @@ testing = ["pytest", "pytest-benchmark"] name = "pooch" version = "1.7.0" description = "\"Pooch manages your Python library's sample data files: it automatically downloads and stores them in a local directory, with support for versioning and corruption checks.\"" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -2266,7 +2117,6 @@ xxhash = ["xxhash (>=1.4.3)"] name = "pre-commit" version = "3.4.0" description = "A framework for managing and maintaining multi-language pre-commit hooks." -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -2285,7 +2135,6 @@ virtualenv = ">=20.10.0" name = "prompt-toolkit" version = "3.0.39" description = "Library for building powerful interactive command lines in Python" -category = "dev" optional = false python-versions = ">=3.7.0" files = [ @@ -2300,7 +2149,6 @@ wcwidth = "*" name = "psutil" version = "5.9.5" description = "Cross-platform lib for process and system monitoring in Python." -category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" files = [ @@ -2327,7 +2175,6 @@ test = ["enum34", "ipaddress", "mock", "pywin32", "wmi"] name = "ptyprocess" version = "0.7.0" description = "Run a subprocess in a pseudo terminal" -category = "dev" optional = false python-versions = "*" files = [ @@ -2339,7 +2186,6 @@ files = [ name = "pure-eval" version = "0.2.2" description = "Safely evaluate AST nodes without side effects" -category = "dev" optional = false python-versions = "*" files = [ @@ -2354,7 +2200,6 @@ tests = ["pytest"] name = "pycodestyle" version = "2.11.0" description = "Python style guide checker" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -2366,7 +2211,6 @@ files = [ name = "pycparser" version = "2.21" description = "C parser in Python" -category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" files = [ @@ -2378,7 +2222,6 @@ files = [ name = "pyflakes" version = "3.1.0" description = "passive checker of Python programs" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -2390,7 +2233,6 @@ files = [ name = "pygments" version = "2.16.1" description = "Pygments is a syntax highlighting package written in Python." -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -2405,7 +2247,6 @@ plugins = ["importlib-metadata"] name = "pyparsing" version = "3.1.1" description = "pyparsing module - Classes and methods to define and execute parsing grammars" -category = "main" optional = false python-versions = ">=3.6.8" files = [ @@ -2420,7 +2261,6 @@ diagrams = ["jinja2", "railroad-diagrams"] name = "pyproject-api" version = "1.6.1" description = "API to interact with the python pyproject.toml based projects" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -2440,7 +2280,6 @@ testing = ["covdefaults (>=2.3)", "pytest (>=7.4)", "pytest-cov (>=4.1)", "pytes name = "pytest" version = "7.4.2" description = "pytest: simple powerful testing with Python" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -2463,7 +2302,6 @@ testing = ["argcomplete", "attrs (>=19.2.0)", "hypothesis (>=3.56)", "mock", "no name = "pytest-cov" version = "3.0.0" description = "Pytest plugin for measuring coverage." -category = "dev" optional = false python-versions = ">=3.6" files = [ @@ -2482,7 +2320,6 @@ testing = ["fields", "hunter", "process-tests", "pytest-xdist", "six", "virtuale name = "python-dateutil" version = "2.8.2" description = "Extensions to the standard Python datetime module" -category = "main" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7" files = [ @@ -2497,7 +2334,6 @@ six = ">=1.5" name = "pytz" version = "2023.3.post1" description = "World timezone definitions, modern and historical" -category = "main" optional = false python-versions = "*" files = [ @@ -2509,7 +2345,6 @@ files = [ name = "pywin32" version = "306" description = "Python for Window Extensions" -category = "dev" optional = false python-versions = "*" files = [ @@ -2533,7 +2368,6 @@ files = [ name = "pyyaml" version = "6.0.1" description = "YAML parser and emitter for Python" -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -2555,6 +2389,7 @@ files = [ {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"}, {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"}, {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"}, + {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef"}, {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"}, {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"}, {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"}, @@ -2593,7 +2428,6 @@ files = [ name = "pyzmq" version = "25.1.1" description = "Python bindings for 0MQ" -category = "dev" optional = false python-versions = ">=3.6" files = [ @@ -2699,7 +2533,6 @@ cffi = {version = "*", markers = "implementation_name == \"pypy\""} name = "rdflib" version = "6.3.2" description = "RDFLib is a Python library for working with RDF, a simple yet powerful language for representing information." -category = "main" optional = false python-versions = ">=3.7,<4.0" files = [ @@ -2721,7 +2554,6 @@ networkx = ["networkx (>=2.0.0,<3.0.0)"] name = "referencing" version = "0.30.2" description = "JSON Referencing + Python" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -2737,7 +2569,6 @@ rpds-py = ">=0.7.0" name = "requests" version = "2.31.0" description = "Python HTTP for Humans." -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -2759,7 +2590,6 @@ use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"] name = "rpds-py" version = "0.10.4" description = "Python bindings to Rust's persistent data structures (rpds)" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -2868,7 +2698,6 @@ files = [ name = "setuptools" version = "68.2.2" description = "Easily download, build, install, upgrade, and uninstall Python packages" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -2885,7 +2714,6 @@ testing-integration = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "jar name = "setuptools-scm" version = "8.0.4" description = "the blessed package to manage your versions by scm tags" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -2908,7 +2736,6 @@ test = ["build", "pytest", "rich", "wheel"] name = "six" version = "1.16.0" description = "Python 2 and 3 compatibility utilities" -category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*" files = [ @@ -2920,7 +2747,6 @@ files = [ name = "snowballstemmer" version = "2.2.0" description = "This package provides 29 stemmers for 28 languages generated from Snowball algorithms." -category = "dev" optional = false python-versions = "*" files = [ @@ -2932,7 +2758,6 @@ files = [ name = "sortedcontainers" version = "2.4.0" description = "Sorted Containers -- Sorted List, Sorted Dict, Sorted Set" -category = "dev" optional = false python-versions = "*" files = [ @@ -2944,7 +2769,6 @@ files = [ name = "soupsieve" version = "2.5" description = "A modern CSS selector implementation for Beautiful Soup." -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -2956,7 +2780,6 @@ files = [ name = "sphinx" version = "5.3.0" description = "Python documentation generator" -category = "dev" optional = false python-versions = ">=3.6" files = [ @@ -2992,7 +2815,6 @@ test = ["cython", "html5lib", "pytest (>=4.6)", "typed_ast"] name = "sphinx-autodoc-typehints" version = "1.23.0" description = "Type hints (PEP 484) support for the Sphinx autodoc extension" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -3012,7 +2834,6 @@ type-comment = ["typed-ast (>=1.5.4)"] name = "sphinx-design" version = "0.3.0" description = "A sphinx extension for designing beautiful, view size responsive web components." -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -3036,7 +2857,6 @@ theme-sbt = ["sphinx-book-theme (>=0.3.0,<0.4.0)"] name = "sphinx-last-updated-by-git" version = "0.3.6" description = "Get the \"last updated\" time for each Sphinx page from Git" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -3051,7 +2871,6 @@ sphinx = ">=1.8" name = "sphinx-rtd-theme" version = "1.3.0" description = "Read the Docs theme for Sphinx" -category = "dev" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,>=2.7" files = [ @@ -3071,7 +2890,6 @@ dev = ["bump2version", "sphinxcontrib-httpdomain", "transifex-client", "wheel"] name = "sphinxcontrib-applehelp" version = "1.0.7" description = "sphinxcontrib-applehelp is a Sphinx extension which outputs Apple help books" -category = "dev" optional = false python-versions = ">=3.9" files = [ @@ -3090,7 +2908,6 @@ test = ["pytest"] name = "sphinxcontrib-devhelp" version = "1.0.5" description = "sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp documents" -category = "dev" optional = false python-versions = ">=3.9" files = [ @@ -3109,7 +2926,6 @@ test = ["pytest"] name = "sphinxcontrib-htmlhelp" version = "2.0.4" description = "sphinxcontrib-htmlhelp is a sphinx extension which renders HTML help files" -category = "dev" optional = false python-versions = ">=3.9" files = [ @@ -3128,7 +2944,6 @@ test = ["html5lib", "pytest"] name = "sphinxcontrib-jquery" version = "4.1" description = "Extension to include jQuery on newer Sphinx releases" -category = "dev" optional = false python-versions = ">=2.7" files = [ @@ -3143,7 +2958,6 @@ Sphinx = ">=1.8" name = "sphinxcontrib-jsmath" version = "1.0.1" description = "A sphinx extension which renders display math in HTML via JavaScript" -category = "dev" optional = false python-versions = ">=3.5" files = [ @@ -3158,7 +2972,6 @@ test = ["flake8", "mypy", "pytest"] name = "sphinxcontrib-qthelp" version = "1.0.6" description = "sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp documents" -category = "dev" optional = false python-versions = ">=3.9" files = [ @@ -3177,7 +2990,6 @@ test = ["pytest"] name = "sphinxcontrib-serializinghtml" version = "1.1.9" description = "sphinxcontrib-serializinghtml is a sphinx extension which outputs \"serialized\" HTML files (json and pickle)" -category = "dev" optional = false python-versions = ">=3.9" files = [ @@ -3196,7 +3008,6 @@ test = ["pytest"] name = "sphinxext-opengraph" version = "0.8.2" description = "Sphinx Extension to enable OGP support" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -3212,7 +3023,6 @@ sphinx = ">=4.0" name = "stack-data" version = "0.6.3" description = "Extract data from python stack frames and tracebacks for informative displays" -category = "dev" optional = false python-versions = "*" files = [ @@ -3232,7 +3042,6 @@ tests = ["cython", "littleutils", "pygments", "pytest", "typeguard"] name = "stringcase" version = "1.2.0" description = "String case converter." -category = "main" optional = false python-versions = "*" files = [ @@ -3243,7 +3052,6 @@ files = [ name = "tinycss2" version = "1.2.1" description = "A tiny CSS parser" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -3262,7 +3070,6 @@ test = ["flake8", "isort", "pytest"] name = "toml" version = "0.10.2" description = "Python Library for Tom's Obvious, Minimal Language" -category = "main" optional = false python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" files = [ @@ -3274,7 +3081,6 @@ files = [ name = "tomli" version = "2.0.1" description = "A lil' TOML parser" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -3286,7 +3092,6 @@ files = [ name = "tornado" version = "6.3.3" description = "Tornado is a Python web framework and asynchronous networking library, originally developed at FriendFeed." -category = "dev" optional = false python-versions = ">= 3.8" files = [ @@ -3307,7 +3112,6 @@ files = [ name = "tox" version = "4.11.3" description = "tox is a generic virtualenv management and test command line tool" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -3335,7 +3139,6 @@ testing = ["build[virtualenv] (>=0.10)", "covdefaults (>=2.3)", "detect-test-pol name = "tqdm" version = "4.66.1" description = "Fast, Extensible Progress Meter" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -3356,7 +3159,6 @@ telegram = ["requests"] name = "traitlets" version = "5.11.2" description = "Traitlets Python configuration system" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -3372,7 +3174,6 @@ test = ["argcomplete (>=3.0.3)", "mypy (>=1.5.1)", "pre-commit", "pytest (>=7.0, name = "treelib" version = "1.6.4" description = "A Python 2/3 implementation of tree structure." -category = "main" optional = false python-versions = "*" files = [ @@ -3387,7 +3188,6 @@ six = "*" name = "typing-extensions" version = "4.8.0" description = "Backported and Experimental Type Hints for Python 3.8+" -category = "dev" optional = false python-versions = ">=3.8" files = [ @@ -3399,7 +3199,6 @@ files = [ name = "tzdata" version = "2023.3" description = "Provider of IANA time zone data" -category = "main" optional = false python-versions = ">=2" files = [ @@ -3411,7 +3210,6 @@ files = [ name = "urllib3" version = "2.0.6" description = "HTTP library with thread-safe connection pooling, file post, and more." -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -3429,7 +3227,6 @@ zstd = ["zstandard (>=0.18.0)"] name = "virtualenv" version = "20.24.5" description = "Virtual Python Environment builder" -category = "dev" optional = false python-versions = ">=3.7" files = [ @@ -3450,7 +3247,6 @@ test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess name = "wcwidth" version = "0.2.8" description = "Measures the displayed width of unicode strings in a terminal" -category = "dev" optional = false python-versions = "*" files = [ @@ -3462,7 +3258,6 @@ files = [ name = "webencodings" version = "0.5.1" description = "Character encoding aliases for legacy web content" -category = "dev" optional = false python-versions = "*" files = [ @@ -3474,7 +3269,6 @@ files = [ name = "yapf" version = "0.32.0" description = "A formatter for Python code." -category = "dev" optional = false python-versions = "*" files = [ @@ -3486,7 +3280,6 @@ files = [ name = "zipp" version = "3.17.0" description = "Backport of pathlib-compatible object wrapper for zip files" -category = "dev" optional = false python-versions = ">=3.8" files = [