Merge branch 'master' of github.com:jamalex/notion-py

Author: jamalex

README.md

@@ -201,7 +201,7 @@ result = cv.build_query(sort=sort_params).execute()
 print("Sorted results, showing most valuable first:", result)
 ```
 
-Note: You can combine `filter`, `aggregate`, and `sort`. See more examples of queries by setting up complex views in Notion, and then inspecting `cv.get("query")`
+Note: You can combine `filter`, `aggregate`, and `sort`. See more examples of queries by setting up complex views in Notion, and then inspecting the full query: `cv.get("query2")`.
 
 You can also see [more examples in action in the smoke test runner](https://github.com/jamalex/notion-py/blob/master/notion/smoke_test.py). Run it using:
 
@@ -226,6 +226,24 @@ page.locked = True
 page.locked = False
 ```
 
+## Example: Set the current user for multi-account user
+
+```python
+from notion.client import NotionClient
+client = NotionClient(token_v2="<token_v2>")
+
+# The initial current_user of a multi-account user may be an unwanted user
+print(client.current_user.email) # → [email protected]
+
+# Set current_user to the desired user
+client.set_user_by_email('[email protected]')
+print(client.current_user.email) # → [email protected]
+
+# You can also set the current_user by uid.
+client.set_user_by_uid('<uid>')
+print(client.current_user.email) # → [email protected]
+```
+
 # _Quick plug: Learning Equality needs your support!_
 
 If you'd like to support notion-py development, please consider [donating to my open-source nonprofit, Learning Equality](https://learningequality.org/donate/), since when I'm not working on notion-py, it probably means I'm heads-down fundraising for our global education work (bringing resources like Khan Academy to communities with no Internet). COVID has further amplified needs, with over a billion kids stuck at home, and over half of them without the connectivity they need for distance learning. You can now also [support our work via GitHub Sponsors](https://github.com/sponsors/learningequality)!
@@ -234,6 +252,7 @@ If you'd like to support notion-py development, please consider [donating to my
 
 - [md2notion](https://github.com/Cobertos/md2notion): import Markdown files to Notion
 - [notion-export-ics](https://github.com/evertheylen/notion-export-ics): Export Notion Databases to ICS calendar files
+- [notion-tqdm](https://github.com/shunyooo/notion-tqdm): Progress Bar displayed in Notion like tqdm
 
 # TODO
 

notion/client.py

@@ -96,6 +96,24 @@ def __init__(
 
     def start_monitoring(self):
         self._monitor.poll_async()
+    
+    def _fetch_guest_space_data(self, records):
+        """
+        guest users have an empty `space` dict, so get the space_id from the `space_view` dict instead,
+        and fetch the space data from the getPublicSpaceData endpoint.
+
+        Note: This mutates the records dict
+        """
+        space_id = list(records["space_view"].values())[0]["value"]["space_id"]
+
+        space_data = self.post(
+            "getPublicSpaceData", {"type": "space-ids", "spaceIds": [space_id]}
+        ).json()
+
+        records["space"] = {
+            space["id"]: {"value": space} for space in space_data["results"]
+        }
+
 
     def _set_token(self, email=None, password=None):
         if not email:
@@ -106,6 +124,9 @@ def _set_token(self, email=None, password=None):
 
     def _update_user_info(self):
         records = self.post("loadUserContent", {}).json()["recordMap"]
+        if not records["space"]:
+            self._fetch_guest_space_data(records)
+
         self._store.store_recordmap(records)
         self.current_user = self.get_user(list(records["notion_user"].keys())[0])
         self.current_space = self.get_space(list(records["space"].keys())[0])