Skip to content

Commit 74f4a28

Browse files
committed
revamping SPARQL
1 parent f08cb2c commit 74f4a28

File tree

3 files changed

+1783
-1657
lines changed

3 files changed

+1783
-1657
lines changed

Notebooks/10_Dolthub.ipynb

+37-21
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,44 @@
1414
},
1515
{
1616
"cell_type": "code",
17-
"execution_count": 7,
17+
"execution_count": 6,
1818
"metadata": {},
19-
"outputs": [],
19+
"outputs": [
20+
{
21+
"name": "stdout",
22+
"output_type": "stream",
23+
"text": [
24+
"Requirement already satisfied: doltcli in /home/rsouza/environments/default_env/lib/python3.8/site-packages (0.1.15)\n",
25+
"Requirement already satisfied: doltpy in /home/rsouza/environments/default_env/lib/python3.8/site-packages (2.0.9)\n",
26+
"Requirement already satisfied: decorator==4.4.2 in /home/rsouza/environments/default_env/lib/python3.8/site-packages (from doltpy) (4.4.2)\n",
27+
"Requirement already satisfied: pytz==2020.1 in /home/rsouza/environments/default_env/lib/python3.8/site-packages (from doltpy) (2020.1)\n",
28+
"Requirement already satisfied: more-itertools<9.0.0,>=8.6.0 in /home/rsouza/environments/default_env/lib/python3.8/site-packages (from doltpy) (8.10.0)\n",
29+
"Requirement already satisfied: psutil==5.7.2 in /home/rsouza/environments/default_env/lib/python3.8/site-packages (from doltpy) (5.7.2)\n",
30+
"Requirement already satisfied: numpy==1.19.0 in /home/rsouza/environments/default_env/lib/python3.8/site-packages (from doltpy) (1.19.0)\n",
31+
"Requirement already satisfied: packaging==20.4 in /home/rsouza/environments/default_env/lib/python3.8/site-packages (from doltpy) (20.4)\n",
32+
"Requirement already satisfied: attrs==19.3.0 in /home/rsouza/environments/default_env/lib/python3.8/site-packages (from doltpy) (19.3.0)\n",
33+
"Requirement already satisfied: python-dateutil==2.8.1 in /home/rsouza/environments/default_env/lib/python3.8/site-packages (from doltpy) (2.8.1)\n",
34+
"Requirement already satisfied: wcwidth==0.2.5 in /home/rsouza/environments/default_env/lib/python3.8/site-packages (from doltpy) (0.2.5)\n",
35+
"Requirement already satisfied: protobuf==3.12.2 in /home/rsouza/environments/default_env/lib/python3.8/site-packages (from doltpy) (3.12.2)\n",
36+
"Requirement already satisfied: retry==0.9.2 in /home/rsouza/environments/default_env/lib/python3.8/site-packages (from doltpy) (0.9.2)\n",
37+
"Requirement already satisfied: SQLAlchemy==1.3.18 in /home/rsouza/environments/default_env/lib/python3.8/site-packages (from doltpy) (1.3.18)\n",
38+
"Requirement already satisfied: pyparsing==2.4.7 in /home/rsouza/environments/default_env/lib/python3.8/site-packages (from doltpy) (2.4.7)\n",
39+
"Requirement already satisfied: mysql-connector-python<9.0.0,>=8.0.20 in /home/rsouza/environments/default_env/lib/python3.8/site-packages (from doltpy) (8.0.21)\n",
40+
"Requirement already satisfied: pluggy==0.13.1 in /home/rsouza/environments/default_env/lib/python3.8/site-packages (from doltpy) (0.13.1)\n",
41+
"Requirement already satisfied: six==1.15.0 in /home/rsouza/environments/default_env/lib/python3.8/site-packages (from doltpy) (1.15.0)\n",
42+
"Requirement already satisfied: pandas>=1.0.5 in /home/rsouza/environments/default_env/lib/python3.8/site-packages (from doltpy) (1.3.4)\n",
43+
"Requirement already satisfied: setuptools in /home/rsouza/environments/default_env/lib/python3.8/site-packages (from protobuf==3.12.2->doltpy) (57.0.0)\n",
44+
"Requirement already satisfied: py<2.0.0,>=1.4.26 in /home/rsouza/environments/default_env/lib/python3.8/site-packages (from retry==0.9.2->doltpy) (1.10.0)\n"
45+
]
46+
}
47+
],
2048
"source": [
21-
"!pip install -q -U doltpy"
49+
"!pip install -U doltcli doltpy"
2250
]
2351
},
2452
{
2553
"cell_type": "code",
26-
"execution_count": 9,
54+
"execution_count": 2,
2755
"metadata": {},
2856
"outputs": [
2957
{
@@ -33,7 +61,7 @@
3361
"traceback": [
3462
"\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
3563
"\u001b[0;31mModuleNotFoundError\u001b[0m Traceback (most recent call last)",
36-
"\u001b[0;32m<ipython-input-9-5268883495b6>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m\u001b[0m\n\u001b[0;32m----> 1\u001b[0;31m \u001b[0;32mfrom\u001b[0m \u001b[0mdoltpy\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mcore\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0mDolt\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m 2\u001b[0m \u001b[0;32mfrom\u001b[0m \u001b[0mdoltpy\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mcore\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mwrite\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0mbulk_import\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n",
64+
"\u001b[0;32m/tmp/ipykernel_1092875/122803734.py\u001b[0m in \u001b[0;36m<module>\u001b[0;34m\u001b[0m\n\u001b[0;32m----> 1\u001b[0;31m \u001b[0;32mfrom\u001b[0m \u001b[0mdoltpy\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mcore\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0mDolt\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m 2\u001b[0m \u001b[0;32mfrom\u001b[0m \u001b[0mdoltpy\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mcore\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mwrite\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0mbulk_import\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n",
3765
"\u001b[0;31mModuleNotFoundError\u001b[0m: No module named 'doltpy.core'"
3866
]
3967
}
@@ -45,21 +73,9 @@
4573
},
4674
{
4775
"cell_type": "code",
48-
"execution_count": 8,
76+
"execution_count": null,
4977
"metadata": {},
50-
"outputs": [
51-
{
52-
"ename": "ModuleNotFoundError",
53-
"evalue": "No module named 'doltpy.core'",
54-
"output_type": "error",
55-
"traceback": [
56-
"\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
57-
"\u001b[0;31mModuleNotFoundError\u001b[0m Traceback (most recent call last)",
58-
"\u001b[0;32m<ipython-input-8-fd9e390d6bdf>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m\u001b[0m\n\u001b[1;32m 3\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0mtime\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 4\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0mpandas\u001b[0m \u001b[0;32mas\u001b[0m \u001b[0mpd\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m----> 5\u001b[0;31m \u001b[0;32mfrom\u001b[0m \u001b[0mdoltpy\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mcore\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0mDolt\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m 6\u001b[0m \u001b[0;32mfrom\u001b[0m \u001b[0mdoltpy\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mcore\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mread\u001b[0m \u001b[0;32mimport\u001b[0m \u001b[0mread_table\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mpandas_read_sql\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n",
59-
"\u001b[0;31mModuleNotFoundError\u001b[0m: No module named 'doltpy.core'"
60-
]
61-
}
62-
],
78+
"outputs": [],
6379
"source": [
6480
"import requests\n",
6581
"import json\n",
@@ -867,7 +883,7 @@
867883
],
868884
"metadata": {
869885
"kernelspec": {
870-
"display_name": "Python 3",
886+
"display_name": "Python 3 (ipykernel)",
871887
"language": "python",
872888
"name": "python3"
873889
},
@@ -881,7 +897,7 @@
881897
"name": "python",
882898
"nbconvert_exporter": "python",
883899
"pygments_lexer": "ipython3",
884-
"version": "3.8.5"
900+
"version": "3.8.10"
885901
}
886902
},
887903
"nbformat": 4,

0 commit comments

Comments
 (0)