|
121 | 121 | " protocol = \"https\", \n",
|
122 | 122 | " server = os.getenv(\"GRAPHISTRY_SERVER\"),\n",
|
123 | 123 | " username = os.getenv(\"GRAPHISTRY_USERNAME\"),\n",
|
124 |
| - " password = os.getenv(\"GRAPHISTRY_PASSWORD\")\n", |
125 |
| - " )" |
| 124 | + " password = os.getenv(\"GRAPHISTRY_PASSWORD\"))" |
126 | 125 | ]
|
127 | 126 | },
|
128 | 127 | {
|
|
135 | 134 | },
|
136 | 135 | {
|
137 | 136 | "cell_type": "code",
|
138 |
| - "execution_count": 4, |
139 |
| - "id": "1297168f", |
| 137 | + "execution_count": null, |
| 138 | + "id": "2e051930", |
140 | 139 | "metadata": {},
|
141 | 140 | "outputs": [],
|
142 | 141 | "source": [
|
143 |
| - "# Insert your Spanner configuration\n", |
144 | 142 | "SPANNER_INSTANCE_ID = os.getenv(\"SPANNER_INSTANCE_ID\") or \"finance-graph-instance\"\n",
|
145 | 143 | "SPANNER_DATABASE_ID = os.getenv(\"SPANNER_DATABASE_ID\") or \"finance-graph-db\"\n",
|
146 | 144 | "\n",
|
147 |
| - "# Service Account JSON Path -or- Project ID for interactive login\n", |
148 |
| - "SPANNER_SERVICE_ACCOUNT_JSON_PATH = os.getenv(\"SPANNER_SERVICE_ACCOUNT_JSON_PATH\") or \"path/to/credentials.json\"\n", |
149 |
| - "SPANNER_PROJECT_ID = os.getenv(\"SPANNER_PROJECT_ID\") or \"finance-graph-project\"" |
150 |
| - ] |
151 |
| - }, |
152 |
| - { |
153 |
| - "cell_type": "markdown", |
154 |
| - "id": "bb895e0d-b2a4-474e-aba9-46f791ec9600", |
155 |
| - "metadata": {}, |
156 |
| - "source": [ |
157 |
| - "#### Google web-based auth below, only required if not using a credentials json file:" |
| 145 | + "# Option 1: Project ID is required for interactive login\n", |
| 146 | + "SPANNER_PROJECT_ID = os.getenv(\"SPANNER_PROJECT_ID\") or \"finance-graph-project\"\n", |
| 147 | + "\n", |
| 148 | + "# Option 2: use a service account key: \n", |
| 149 | + "# SPANNER_SERVICE_ACCOUNT_JSON_PATH = os.getenv(\"SPANNER_SERVICE_ACCOUNT_JSON_PATH\") or \"path/to/credentials.json\"" |
158 | 150 | ]
|
159 | 151 | },
|
160 | 152 | {
|
|
165 | 157 | "outputs": [],
|
166 | 158 | "source": [
|
167 | 159 | "# Set the google project id for interactive login\n",
|
168 |
| - "# !gcloud config set project {PROJECT_ID}\n", |
169 |
| - "# %env GOOGLE_CLOUD_PROJECT={PROJECT_ID}" |
170 |
| - ] |
171 |
| - }, |
172 |
| - { |
173 |
| - "cell_type": "code", |
174 |
| - "execution_count": null, |
175 |
| - "id": "f175d952-c1cc-4793-aad5-0cdb5142b6fe", |
176 |
| - "metadata": {}, |
177 |
| - "outputs": [], |
178 |
| - "source": [ |
| 160 | + "\n", |
| 161 | + "# !gcloud config set project {SPANNER_PROJECT_ID}\n", |
| 162 | + "# %env GOOGLE_CLOUD_PROJECT={SPANNER_PROJECT_ID}\n", |
| 163 | + "\n", |
179 | 164 | "#!gcloud auth application-default login"
|
180 | 165 | ]
|
181 | 166 | },
|
|
186 | 171 | "metadata": {},
|
187 | 172 | "outputs": [],
|
188 | 173 | "source": [
|
189 |
| - "# Spanner can be configured with a credentials JSON or using gcloud auth application-default login (below)\n", |
| 174 | + "# Option 1: interactive login using gcloud auth application-default login (below)\n", |
| 175 | + "graphistry.configure_spanner(\n", |
| 176 | + " project_id=SPANNER_PROJECT_ID,\n", |
| 177 | + " instance_id=SPANNER_INSTANCE_ID,\n", |
| 178 | + " database_id=SPANNER_DATABASE_ID\n", |
| 179 | + ")\n", |
190 | 180 | "\n",
|
191 | 181 | "\n",
|
192 |
| - "# Option 1: interactive login using gcloud auth application-default login (below)\n", |
| 182 | + "# Option 2: use a service account key: \n", |
193 | 183 | "# graphistry.configure_spanner(\n",
|
194 |
| - "# project_id=SPANNER_PROJECT_ID,\n", |
195 | 184 | "# instance_id=SPANNER_INSTANCE_ID,\n",
|
196 |
| - "# database_id=SPANNER_DATABASE_ID\n", |
| 185 | + "# database_id=SPANNER_DATABASE_ID,\n", |
| 186 | + "# credentials_file=SPANNER_SERVICE_ACCOUNT_JSON_PATH\n", |
197 | 187 | "# )\n",
|
198 | 188 | "\n",
|
199 | 189 | "\n",
|
200 |
| - "# Option 2: use a service account key: \n", |
201 |
| - "graphistry.configure_spanner(\n", |
202 |
| - " instance_id=SPANNER_INSTANCE_ID,\n", |
203 |
| - " database_id=SPANNER_DATABASE_ID,\n", |
204 |
| - " credentials_file=SPANNER_SERVICE_ACCOUNT_JSON_PATH\n", |
205 |
| - ")\n", |
206 |
| - "\n", |
207 |
| - "\n", |
208 | 190 | "\n",
|
209 | 191 | "# optional setting to limit the number of records returned\n",
|
210 | 192 | "LIMIT_CLAUSE = \"\"\n",
|
|
0 commit comments