Loglan-Core 0.4.7__tar.gz → 0.4.9__tar.gz

{loglan_core-0.4.7 → loglan_core-0.4.9/Loglan_Core.egg-info}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: Loglan-Core
-Version: 0.4.7
+Version: 0.4.9
 Summary: Loglan Dictionary Database Model for SQLAlchemy
 Author-email: torrua <torrua@gmail.com>
 License: MIT
-Project-URL: Download, https://github.com/torrua/loglan_core/archive/0.4.7.tar.gz
+Project-URL: Download, https://github.com/torrua/loglan_core/archive/0.4.9.tar.gz
 Project-URL: Homepage, https://github.com/torrua/loglan_core
 Project-URL: Repository, https://github.com/torrua/loglan_core
 Keywords: Loglan,Dictionary,Database,Model,LOD

{loglan_core-0.4.7 → loglan_core-0.4.9}/Loglan_Core.egg-info/SOURCES.txt

@@ -1,8 +1,6 @@
 LICENSE
 README.md
 pyproject.toml
-setup.cfg
-setup.py
 Loglan_Core.egg-info/PKG-INFO
 Loglan_Core.egg-info/SOURCES.txt
 Loglan_Core.egg-info/dependency_links.txt

{loglan_core-0.4.7/Loglan_Core.egg-info → loglan_core-0.4.9}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: Loglan-Core
-Version: 0.4.7
+Version: 0.4.9
 Summary: Loglan Dictionary Database Model for SQLAlchemy
 Author-email: torrua <torrua@gmail.com>
 License: MIT
-Project-URL: Download, https://github.com/torrua/loglan_core/archive/0.4.7.tar.gz
+Project-URL: Download, https://github.com/torrua/loglan_core/archive/0.4.9.tar.gz
 Project-URL: Homepage, https://github.com/torrua/loglan_core
 Project-URL: Repository, https://github.com/torrua/loglan_core
 Keywords: Loglan,Dictionary,Database,Model,LOD

{loglan_core-0.4.7 → loglan_core-0.4.9}/loglan_core/addons/base_selector.py

@@ -2,8 +2,6 @@
 This module provides a base selector for SQLAlchemy
 """
 
-from __future__ import annotations
-
 from typing import Type, Iterable, Any
 
 from sqlalchemy import select, Select
@@ -46,7 +44,7 @@ class BaseSelector:  # pylint: disable=too-many-ancestors
         """Initializes the Selector.
 
         Args:
-            model (Type): The SQLAlchemy model class to query.
+            model (Type): The SQLAlchemy model class to select from.
             is_sqlite (bool): Flag indicating if the database is SQLite.
             case_sensitive (bool): Flag indicating if the queries should be case-sensitive.
             disable_model_check (bool): Flag indicating if the model check should be disabled.
@@ -62,27 +60,30 @@ class BaseSelector:  # pylint: disable=too-many-ancestors
         self.is_sqlite = is_sqlite
         self.case_sensitive = case_sensitive
 
-    def execute(self, session: Session):
+    def execute(self, session: Session, unique: bool = False) -> Any:
         """Executes the given session and returns the result.
 
         Args:
             session (Session): SQLAlchemy Session object.
-
+            unique (bool, optional): Flag indicating if the result should be unique.
+            Defaults to False.
         Returns:
             ResultProxy: The result of the executed session.
         """
-        return session.execute(self._statement)
+        result = session.execute(self._statement)
+        return result.unique() if unique else result
 
-    def all(self, session: Session):
+    def all(self, session: Session, unique: bool = False):
         """Executes the given session and returns all the results as a list.
 
         Args:
             session (Session): SQLAlchemy Session object.
-
+            unique (bool, optional): Flag indicating if the result should contain unique items.
+            Defaults to False.
         Returns:
             List[ResultRow]: All the results of the executed session.
         """
-        return session.execute(self._statement).scalars().all()
+        return self.execute(session, unique).scalars().all()
 
     def scalar(self, session: Session):
         """Executes the given session and returns a scalar result.
@@ -93,19 +94,34 @@ class BaseSelector:  # pylint: disable=too-many-ancestors
         Returns:
             Any: The scalar result of the executed session.
         """
-        return session.execute(self._statement).scalar()
+        return self.execute(session).scalar()
 
-    def fetchmany(self, session: Session, size: int | None = None):
+    def fetchmany(
+        self, session: Session, size: int | None = None, unique: bool = False
+    ):
         """Executes the given session and fetches a specified number of results.
 
         Args:
             session (Session): SQLAlchemy Session object.
             size (int, optional): Number of results to fetch. If None, fetches all results.
-
+            unique (bool, optional): Flag indicating if the result should contain unique items.
+            Defaults to False.
         Returns:
             List[ResultRow]: The fetched results.
         """
-        return session.execute(self._statement).scalars().fetchmany(size)
+        return self.execute(session, unique).scalars().fetchmany(size)
+
+    def __call__(self, session: Session, unique: bool = False) -> list:
+        """Execute the current _statement and return the results.
+
+        Args:
+            session (Session): The SQLAlchemy session to use for executing the query.
+            unique (bool, optional): Flag indicating if the result should contain unique items.
+            Defaults to False.
+        Returns:
+            list: The results of the query.
+        """
+        return self.all(session, unique)
 
     def select_columns(self, *columns: type[BaseModel]) -> Self:
         """Specify which columns to select without resetting the filters.
@@ -254,17 +270,6 @@ class BaseSelector:  # pylint: disable=too-many-ancestors
         """
         return self._statement
 
-    def __call__(self, session: Session):
-        """Execute the current _statement and return the results.
-
-        Args:
-            session (Session): The SQLAlchemy session to use for executing the query.
-
-        Returns:
-            list: The results of the query.
-        """
-        return self.all(session)
-
     def with_relationships(self, selected: Iterable[str] | None = None) -> Self:
         """Adds relationships to the query.
 

{loglan_core-0.4.7 → loglan_core-0.4.9}/loglan_core/addons/utils.py

@@ -2,8 +2,6 @@
 This module provides utility functions for the loglan_core package.
 """
 
-from __future__ import annotations
-
 from sqlalchemy import select, true, func
 from sqlalchemy.sql.elements import BinaryExpression
 from sqlalchemy.sql.elements import BooleanClauseList

{loglan_core-0.4.7 → loglan_core-0.4.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = "Loglan-Core"
-version = "0.4.7"  # Placeholder, will be replaced by the script
+version = "0.4.9"
 description = "Loglan Dictionary Database Model for SQLAlchemy"
 readme = "README.md"
 license = { text = "MIT" }
@@ -29,7 +29,7 @@ dependencies = [
 ]
 
 [project.urls]
-"Download" = "https://github.com/torrua/loglan_core/archive/0.4.7.tar.gz"  # Placeholder, will be replaced by the script
+"Download" = "https://github.com/torrua/loglan_core/archive/0.4.9.tar.gz"
 "Homepage" = "https://github.com/torrua/loglan_core"
 "Repository" = "https://github.com/torrua/loglan_core"
 

loglan_core-0.4.9/setup.cfg

@@ -0,0 +1,4 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+

loglan_core-0.4.7/setup.cfg

@@ -1,7 +0,0 @@
-[metadata]
-description_file = README.md
-
-[egg_info]
-tag_build = 
-tag_date = 0
-

loglan_core-0.4.7/setup.py

@@ -1,9 +0,0 @@
-from setuptools import setup
-
-
-setup(
-    package_data={
-        "loglan_core": ["*"],
-    },
-    include_package_data=True,
-)