notion-database 1.2.1__tar.gz → 2.0.dev0__tar.gz

{notion_database-1.2.1 → notion_database-2.0.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: notion-database
-Version: 1.2.1
+Version: 2.0.dev0
 Summary:  Python bindings for Notion Database API
 Home-page: https://github.com/minwook-shin/notion-database
 Author: minwook-shin
@@ -9,16 +9,15 @@ Project-URL: Bug Tracker, https://github.com/minwook-shin/notion-database/issues
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Development Status :: 5 - Production/Stable
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: requests==2.32.0
+Requires-Dist: requests==2.32.3
 Requires-Dist: urllib3<2.0
 
 [![Test Python Package](https://github.com/minwook-shin/notion-database/actions/workflows/python-publish.yml/badge.svg)](https://github.com/minwook-shin/notion-database/actions/workflows/python-publish.yml)
@@ -35,19 +34,18 @@ created by database from the official Notion API.
 ```python
 import os
 
-from notion_database.page import Page
-from notion_database.properties import Properties
+from notion_database.service.properties import Properties
 from notion_database.const.query import Direction, Timestamp
-from notion_database.search import Search
+from notion_database import NotionDatabase
 
-S = Search(integrations_token=os.getenv('NOTION_KEY'))
-S.search_database(query="", sort={"direction": Direction.ascending, "timestamp": Timestamp.last_edited_time})
-for i in S.result:
+result = NotionDatabase.search_database(integrations_token=os.getenv('NOTION_KEY'),
+                                        sort={"direction": Direction.ascending, "timestamp": Timestamp.last_edited_time})
+
+for i in result:
   PROPERTY = Properties()
   PROPERTY.set_title("title", "title")
   PROPERTY.set_rich_text("Description", "description text")
-  P = Page(integrations_token=os.getenv('NOTION_KEY'))
-  P.create_page(database_id=i["id"], properties=PROPERTY)
+  NotionDatabase.create_page(integrations_token=os.getenv('NOTION_KEY'), database_id=i["id"], properties=PROPERTY)
 ```
 See detailed example [here](example.py).
 
@@ -59,6 +57,9 @@ previous version is GPL, please be careful when using this out of version.
 
 ## What's new notion-version
 
+* 2.0
+  * refactor the code to be more readable and maintainable.
+
 * 1.0.0
   * Now that we've implemented all features, 
   * change the version rule to the semantic version.

{notion_database-1.2.1 → notion_database-2.0.dev0}/README.md

@@ -12,19 +12,18 @@ created by database from the official Notion API.
 ```python
 import os
 
-from notion_database.page import Page
-from notion_database.properties import Properties
+from notion_database.service.properties import Properties
 from notion_database.const.query import Direction, Timestamp
-from notion_database.search import Search
+from notion_database import NotionDatabase
 
-S = Search(integrations_token=os.getenv('NOTION_KEY'))
-S.search_database(query="", sort={"direction": Direction.ascending, "timestamp": Timestamp.last_edited_time})
-for i in S.result:
+result = NotionDatabase.search_database(integrations_token=os.getenv('NOTION_KEY'),
+                                        sort={"direction": Direction.ascending, "timestamp": Timestamp.last_edited_time})
+
+for i in result:
   PROPERTY = Properties()
   PROPERTY.set_title("title", "title")
   PROPERTY.set_rich_text("Description", "description text")
-  P = Page(integrations_token=os.getenv('NOTION_KEY'))
-  P.create_page(database_id=i["id"], properties=PROPERTY)
+  NotionDatabase.create_page(integrations_token=os.getenv('NOTION_KEY'), database_id=i["id"], properties=PROPERTY)
 ```
 See detailed example [here](example.py).
 
@@ -36,6 +35,9 @@ previous version is GPL, please be careful when using this out of version.
 
 ## What's new notion-version
 
+* 2.0
+  * refactor the code to be more readable and maintainable.
+
 * 1.0.0
   * Now that we've implemented all features, 
   * change the version rule to the semantic version.

notion_database-2.0.dev0/notion_database/NotionDatabase.py

@@ -0,0 +1,107 @@
+from typing import Dict
+
+from notion_database.service.children import Children
+from notion_database.service.cover import Cover
+from notion_database.service.database import Database
+from notion_database.service.icon import Icon
+from notion_database.service.properties import Properties
+from notion_database.service.search import Search
+from notion_database.service.block import Block
+from notion_database.service.page import Page
+
+
+class NotionDatabase:
+    """
+    Notion API Search, Database class
+    """
+
+    # Search
+    @staticmethod
+    def search_database(integrations_token: str, sort: Dict, query: str = ""):
+        search = Search(integrations_token=integrations_token)
+        search.search_database(query=query, sort=sort)
+        return search.result
+
+    @staticmethod
+    def search_pages(integrations_token: str,
+                     sort: Dict, query: str = "", page_size: int = 100, start_cursor: str = None):
+        search = Search(integrations_token=integrations_token)
+        search.search_pages(query=query, sort=sort, page_size=page_size, start_cursor=start_cursor)
+        return search.result
+
+    # Database
+    @staticmethod
+    def retrieve_database(integrations_token: str, database_id: str, get_properties: bool = False):
+        db = Database(integrations_token=integrations_token)
+        db.retrieve_database(database_id=database_id, get_properties=get_properties)
+        return db.result
+
+    @staticmethod
+    def run_query_database(integrations_token: str, database_id: str, db_filter: Dict = None, db_sort: Dict = None):
+        db = Database(integrations_token=integrations_token)
+        db.run_query_database(database_id=database_id, db_filter=db_filter, db_sort=db_sort)
+        return db.result
+
+    @staticmethod
+    def find_all_page(integrations_token: str, database_id: str, page_size: int = 100, start_cursor: str = None):
+        db = Database(integrations_token=integrations_token)
+        db.find_all_page(database_id=database_id, page_size=page_size, start_cursor=start_cursor)
+        return db.result
+
+    @staticmethod
+    def list_databases(integrations_token: str):
+        db = Database(integrations_token=integrations_token)
+        db.list_databases()
+        return db.result
+
+    @staticmethod
+    def create_database(integrations_token: str, page_id: str,
+                        title: str, properties: Properties,
+                        cover: Cover = None, icon: Icon = None, is_inline: bool = False):
+        db = Database(integrations_token=integrations_token)
+        db.create_database(page_id=page_id, title=title, properties=properties, cover=cover, icon=icon,
+                           is_inline=is_inline)
+        return db.result
+
+    @staticmethod
+    def update_database(integrations_token: str, database_id: str, title: str,
+                        remove_properties=None, add_properties=None, cover: Cover = None, icon: Icon = None):
+        db = Database(integrations_token=integrations_token)
+        db.update_database(database_id=database_id, title=title,
+                           remove_properties=remove_properties, add_properties=add_properties, cover=cover, icon=icon)
+        return db.result
+
+    # Block
+    @staticmethod
+    def retrieve_block(integrations_token: str, block_id: str, is_children: bool = False,
+                       page_size: int = 100, start_cursor: str = None):
+        block = Block(integrations_token=integrations_token)
+        block.retrieve_block(block_id=block_id, is_children=is_children, page_size=page_size, start_cursor=start_cursor)
+        return block.result
+
+    # Page
+    @staticmethod
+    def retrieve_page(integrations_token: str, page_id: str):
+        page = Page(integrations_token=integrations_token)
+        page.retrieve_page(page_id=page_id)
+        return page.result
+
+    @staticmethod
+    def create_page(integrations_token: str, database_id: str, properties: Properties = None,
+                    children: Children = None, cover: Cover = None, icon: Icon = None):
+        page = Page(integrations_token=integrations_token)
+        page.create_page(database_id=database_id, properties=properties, children=children, cover=cover, icon=icon)
+        return page.result
+
+    @staticmethod
+    def update_page(integrations_token: str, page_id: str, properties: Properties = None,
+                    cover: Cover = None, icon: Icon = None):
+        page = Page(integrations_token=integrations_token)
+        page.update_page(page_id=page_id, properties=properties, cover=cover, icon=icon)
+        return page.result
+
+    @staticmethod
+    def archive_page(integrations_token: str, page_id: str, archived: bool):
+        page = Page(integrations_token=integrations_token)
+        page.archive_page(page_id=page_id, archived=archived)
+        return page.result

notion_database-2.0.dev0/notion_database/__init__.py

@@ -0,0 +1,7 @@
+"""
+init NOTION_VERSION
+"""
+from notion_database.NotionDatabase import NotionDatabase
+
+
+__all__ = ["NotionDatabase"]

{notion_database-1.2.1 → notion_database-2.0.dev0}/notion_database/components/request.py

@@ -6,7 +6,7 @@ from typing import Dict
 
 import requests
 
-from notion_database import NOTION_VERSION
+from notion_database.const import NOTION_VERSION
 
 
 class Request:

{notion_database-1.2.1/notion_database → notion_database-2.0.dev0/notion_database/const}/__init__.py

@@ -1,4 +1 @@
-"""
-init NOTION_VERSION
-"""
 NOTION_VERSION = "2022-06-28"

{notion_database-1.2.1/notion_database → notion_database-2.0.dev0/notion_database/service}/database.py

@@ -5,11 +5,11 @@ from typing import Dict, List
 
 from notion_database.utils import deprecate
 
-from notion_database.properties import Properties
+from notion_database.service.properties import Properties
 from notion_database.components.request import Request
 
-from notion_database.cover import Cover
-from notion_database.icon import Icon
+from notion_database.service.cover import Cover
+from notion_database.service.icon import Icon
 
 
 class Database:

{notion_database-1.2.1/notion_database → notion_database-2.0.dev0/notion_database/service}/page.py

@@ -4,12 +4,12 @@ Notion API Page
 import logging
 from typing import Dict
 
-from notion_database.children import Children
-from notion_database.properties import Properties
+from notion_database.service.children import Children
+from notion_database.service.properties import Properties
 from notion_database.components.request import Request
 
-from notion_database.cover import Cover
-from notion_database.icon import Icon
+from notion_database.service.cover import Cover
+from notion_database.service.icon import Icon
 
 LOGGER = logging.getLogger("Notion-Database")
 

{notion_database-1.2.1 → notion_database-2.0.dev0}/notion_database.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: notion-database
-Version: 1.2.1
+Version: 2.0.dev0
 Summary:  Python bindings for Notion Database API
 Home-page: https://github.com/minwook-shin/notion-database
 Author: minwook-shin
@@ -9,16 +9,15 @@ Project-URL: Bug Tracker, https://github.com/minwook-shin/notion-database/issues
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Development Status :: 5 - Production/Stable
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: requests==2.32.0
+Requires-Dist: requests==2.32.3
 Requires-Dist: urllib3<2.0
 
 [![Test Python Package](https://github.com/minwook-shin/notion-database/actions/workflows/python-publish.yml/badge.svg)](https://github.com/minwook-shin/notion-database/actions/workflows/python-publish.yml)
@@ -35,19 +34,18 @@ created by database from the official Notion API.
 ```python
 import os
 
-from notion_database.page import Page
-from notion_database.properties import Properties
+from notion_database.service.properties import Properties
 from notion_database.const.query import Direction, Timestamp
-from notion_database.search import Search
+from notion_database import NotionDatabase
 
-S = Search(integrations_token=os.getenv('NOTION_KEY'))
-S.search_database(query="", sort={"direction": Direction.ascending, "timestamp": Timestamp.last_edited_time})
-for i in S.result:
+result = NotionDatabase.search_database(integrations_token=os.getenv('NOTION_KEY'),
+                                        sort={"direction": Direction.ascending, "timestamp": Timestamp.last_edited_time})
+
+for i in result:
   PROPERTY = Properties()
   PROPERTY.set_title("title", "title")
   PROPERTY.set_rich_text("Description", "description text")
-  P = Page(integrations_token=os.getenv('NOTION_KEY'))
-  P.create_page(database_id=i["id"], properties=PROPERTY)
+  NotionDatabase.create_page(integrations_token=os.getenv('NOTION_KEY'), database_id=i["id"], properties=PROPERTY)
 ```
 See detailed example [here](example.py).
 
@@ -59,6 +57,9 @@ previous version is GPL, please be careful when using this out of version.
 
 ## What's new notion-version
 
+* 2.0
+  * refactor the code to be more readable and maintainable.
+
 * 1.0.0
   * Now that we've implemented all features, 
   * change the version rule to the semantic version.

{notion_database-1.2.1 → notion_database-2.0.dev0}/notion_database.egg-info/SOURCES.txt

@@ -1,15 +1,8 @@
 LICENSE
 README.md
 setup.py
+notion_database/NotionDatabase.py
 notion_database/__init__.py
-notion_database/block.py
-notion_database/children.py
-notion_database/cover.py
-notion_database/database.py
-notion_database/icon.py
-notion_database/page.py
-notion_database/properties.py
-notion_database/search.py
 notion_database.egg-info/PKG-INFO
 notion_database.egg-info/SOURCES.txt
 notion_database.egg-info/dependency_links.txt
@@ -20,6 +13,15 @@ notion_database/components/request.py
 notion_database/const/__init__.py
 notion_database/const/color.py
 notion_database/const/query.py
+notion_database/service/__init__.py
+notion_database/service/block.py
+notion_database/service/children.py
+notion_database/service/cover.py
+notion_database/service/database.py
+notion_database/service/icon.py
+notion_database/service/page.py
+notion_database/service/properties.py
+notion_database/service/search.py
 notion_database/utils/__init__.py
 notion_database/utils/deprecate.py
 tests/__init__.py

notion_database-2.0.dev0/notion_database.egg-info/requires.txt

@@ -0,0 +1,2 @@
+requests==2.32.3
+urllib3<2.0

{notion_database-1.2.1 → notion_database-2.0.dev0}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setuptools.setup(
     name="notion-database",
-    version="1.2.1",
+    version="2.0.dev0",
     author="minwook-shin",
     author_email="minwook0106@gmail.com",
     description=" Python bindings for Notion Database API",
@@ -16,14 +16,13 @@ setuptools.setup(
         "Bug Tracker": "https://github.com/minwook-shin/notion-database/issues",
     },
     install_requires=[
-        "requests==2.32.0",
+        "requests==2.32.3",
         "urllib3<2.0"
     ],
     classifiers=[
         "Programming Language :: Python :: 3",
         "License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)",
         "Operating System :: OS Independent",
-        'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
@@ -31,5 +30,5 @@ setuptools.setup(
         'Development Status :: 5 - Production/Stable'
     ],
     packages=setuptools.find_packages(),
-    python_requires=">=3.8",
+    python_requires=">=3.9",
 )

{notion_database-1.2.1 → notion_database-2.0.dev0}/tests/test_children.py

@@ -1,6 +1,6 @@
 import unittest
 
-from notion_database.children import Children
+from notion_database.service.children import Children
 
 
 class TestChildrenMethods(unittest.TestCase):

{notion_database-1.2.1 → notion_database-2.0.dev0}/tests/test_cover.py

@@ -1,6 +1,6 @@
 import unittest
 
-from notion_database.cover import Cover
+from notion_database.service.cover import Cover
 
 
 class TestCoverMethods(unittest.TestCase):

{notion_database-1.2.1 → notion_database-2.0.dev0}/tests/test_icon.py

@@ -1,6 +1,6 @@
 import unittest
 
-from notion_database.icon import Icon
+from notion_database.service.icon import Icon
 
 
 class TestIconMethods(unittest.TestCase):

{notion_database-1.2.1 → notion_database-2.0.dev0}/tests/test_properties.py

@@ -1,6 +1,6 @@
 import unittest
 
-from notion_database.properties import Properties
+from notion_database.service.properties import Properties
 
 
 class TestPropertyMethods(unittest.TestCase):

notion_database-1.2.1/notion_database.egg-info/requires.txt

@@ -1,2 +0,0 @@
-requests==2.32.0
-urllib3<2.0