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

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

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: Loglan-Core
-Version: 0.4.6
+Version: 0.4.7
 Summary: Loglan Dictionary Database Model for SQLAlchemy
-Home-page: https://github.com/torrua/loglan_core
-Download-URL: https://github.com/torrua/loglan_core/archive/0.4.6.tar.gz
-Author: torrua
-Author-email: torrua@gmail.com
+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: Homepage, https://github.com/torrua/loglan_core
+Project-URL: Repository, https://github.com/torrua/loglan_core
 Keywords: Loglan,Dictionary,Database,Model,LOD
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
@@ -26,7 +26,7 @@ Requires-Dist: sqlalchemy>=2.0.21
 ![Codecov](https://img.shields.io/codecov/c/github/torrua/loglan_core?logo=Codecov&logoColor=%23F01F7A&label=codecov)
 ![Scrutinizer code quality (GitHub/Bitbucket)](https://img.shields.io/scrutinizer/quality/g/torrua/loglan_core/main?logo=Scrutinizer%20CI&logoColor=%238A9296&label=Scrutinizer%20CC&link=https%3A%2F%2Fscrutinizer-ci.com%2Fg%2Ftorrua%2Floglan_core%2F%3Fbranch%3Dmain)
 ![Code Climate maintainability](https://img.shields.io/codeclimate/maintainability-percentage/torrua/loglan_core?logo=Code%20Climate)
-![pylint](https://img.shields.io/badge/PyLint-9.95-yellow?logo=python&logoColor=white)
+![pylint](https://img.shields.io/badge/PyLint-10.00-brightgreen?logo=python&logoColor=white)
 [![Pytest](https://github.com/torrua/loglan_core/actions/workflows/pytest.yml/badge.svg)](https://github.com/torrua/loglan_core/actions/workflows/pytest.yml)
 ![Bandit Status](https://img.shields.io/github/actions/workflow/status/torrua/loglan_core/bandit.yml?label=bandit)
 ![Black Status](https://img.shields.io/github/actions/workflow/status/torrua/loglan_core/black.yml?label=Black&labelColor=black)

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

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: Loglan-Core
-Version: 0.4.6
+Version: 0.4.7
 Summary: Loglan Dictionary Database Model for SQLAlchemy
-Home-page: https://github.com/torrua/loglan_core
-Download-URL: https://github.com/torrua/loglan_core/archive/0.4.6.tar.gz
-Author: torrua
-Author-email: torrua@gmail.com
+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: Homepage, https://github.com/torrua/loglan_core
+Project-URL: Repository, https://github.com/torrua/loglan_core
 Keywords: Loglan,Dictionary,Database,Model,LOD
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
@@ -26,7 +26,7 @@ Requires-Dist: sqlalchemy>=2.0.21
 ![Codecov](https://img.shields.io/codecov/c/github/torrua/loglan_core?logo=Codecov&logoColor=%23F01F7A&label=codecov)
 ![Scrutinizer code quality (GitHub/Bitbucket)](https://img.shields.io/scrutinizer/quality/g/torrua/loglan_core/main?logo=Scrutinizer%20CI&logoColor=%238A9296&label=Scrutinizer%20CC&link=https%3A%2F%2Fscrutinizer-ci.com%2Fg%2Ftorrua%2Floglan_core%2F%3Fbranch%3Dmain)
 ![Code Climate maintainability](https://img.shields.io/codeclimate/maintainability-percentage/torrua/loglan_core?logo=Code%20Climate)
-![pylint](https://img.shields.io/badge/PyLint-9.95-yellow?logo=python&logoColor=white)
+![pylint](https://img.shields.io/badge/PyLint-10.00-brightgreen?logo=python&logoColor=white)
 [![Pytest](https://github.com/torrua/loglan_core/actions/workflows/pytest.yml/badge.svg)](https://github.com/torrua/loglan_core/actions/workflows/pytest.yml)
 ![Bandit Status](https://img.shields.io/github/actions/workflow/status/torrua/loglan_core/bandit.yml?label=bandit)
 ![Black Status](https://img.shields.io/github/actions/workflow/status/torrua/loglan_core/black.yml?label=Black&labelColor=black)

{loglan_core-0.4.6 → loglan_core-0.4.7}/README.md

@@ -3,7 +3,7 @@
 ![Codecov](https://img.shields.io/codecov/c/github/torrua/loglan_core?logo=Codecov&logoColor=%23F01F7A&label=codecov)
 ![Scrutinizer code quality (GitHub/Bitbucket)](https://img.shields.io/scrutinizer/quality/g/torrua/loglan_core/main?logo=Scrutinizer%20CI&logoColor=%238A9296&label=Scrutinizer%20CC&link=https%3A%2F%2Fscrutinizer-ci.com%2Fg%2Ftorrua%2Floglan_core%2F%3Fbranch%3Dmain)
 ![Code Climate maintainability](https://img.shields.io/codeclimate/maintainability-percentage/torrua/loglan_core?logo=Code%20Climate)
-![pylint](https://img.shields.io/badge/PyLint-9.95-yellow?logo=python&logoColor=white)
+![pylint](https://img.shields.io/badge/PyLint-10.00-brightgreen?logo=python&logoColor=white)
 [![Pytest](https://github.com/torrua/loglan_core/actions/workflows/pytest.yml/badge.svg)](https://github.com/torrua/loglan_core/actions/workflows/pytest.yml)
 ![Bandit Status](https://img.shields.io/github/actions/workflow/status/torrua/loglan_core/bandit.yml?label=bandit)
 ![Black Status](https://img.shields.io/github/actions/workflow/status/torrua/loglan_core/black.yml?label=Black&labelColor=black)

{loglan_core-0.4.6 → loglan_core-0.4.7}/loglan_core/addons/definition_selector.py

@@ -101,6 +101,7 @@ class DefinitionSelector(BaseSelector):  # pylint: disable=too-many-ancestors
         self,
         key: BaseKey | str,
         language: str | None = None,
+        distinct: bool = False,
     ) -> Self:
         """
         This method filters the definitions by the provided key, language and case sensitivity.
@@ -109,6 +110,7 @@ class DefinitionSelector(BaseSelector):  # pylint: disable=too-many-ancestors
             key (BaseKey | str): The key to filter by. Can be an instance of BaseKey or a string.
             language (str | None): The language to filter by.
             If None, no language filtering is applied.
+            distinct (bool): If True, only distinct keys will be returned.
 
         Returns:
             Self: The filtered DefinitionSelector instance with distinct keys.
@@ -122,17 +124,18 @@ class DefinitionSelector(BaseSelector):  # pylint: disable=too-many-ancestors
             key.language if isinstance(key, BaseKey) else language
         )
 
-        if hasattr(self.model, "keys"):
-            self._statement = (
-                self._statement.join(self.model.keys)
-                .where(filter_key, filter_language)
-                .distinct()
-            )
-        else:
+        if not hasattr(self.model, "keys"):
             raise AttributeError(
                 f"{self.model.__name__} does not have a 'keys' attribute"
             )
 
+        self._statement = self._statement.join(self.model.keys).where(
+            filter_key, filter_language
+        )
+
+        if distinct:
+            self._statement = self._statement.distinct()
+
         return self
 
     def by_language(self, language: str | None = None) -> Self:

{loglan_core-0.4.6 → loglan_core-0.4.7}/loglan_core/addons/key_selector.py

@@ -131,12 +131,13 @@ class KeySelector(BaseSelector):  # pylint: disable=too-many-ancestors
         self._statement = self._statement.where(filter_key_by_language(language))
         return self
 
-    def by_word_id(self, word_id: int) -> KeySelector:
+    def by_word_id(self, word_id: int, distinct: bool = False) -> KeySelector:
         """
         Filters the keys by the given word ID.
 
         Args:
             word_id (int): The identifier of the word to filter by.
+            distinct (bool): If the query should be distinct. Defaults to False.
 
         Returns:
             KeySelector: The filtered KeySelector instance.
@@ -146,11 +147,14 @@ class KeySelector(BaseSelector):  # pylint: disable=too-many-ancestors
 
         """
         self._statement = (
-            self._statement.distinct()
-            .join(t_connect_keys)
+            self._statement.join(t_connect_keys)
             .join(BaseDefinition, BaseDefinition.id == t_connect_keys.c.DID)
             .join(BaseWord, BaseWord.id == BaseDefinition.word_id)
             .filter(BaseWord.id == word_id)
             .order_by(BaseKey.word.asc())
         )
+
+        if distinct:
+            self._statement = self._statement.distinct()
+
         return self

{loglan_core-0.4.6 → loglan_core-0.4.7}/loglan_core/definition.py

@@ -48,7 +48,7 @@ class BaseDefinition(BaseModel):
 
     __tablename__ = T_NAME_DEFINITIONS
 
-    def __init__(
+    def __init__(  # pylint: disable=too-many-positional-arguments
         self,
         word_id: Mapped[int],
         position: Mapped[int],

{loglan_core-0.4.6 → loglan_core-0.4.7}/loglan_core/event.py

@@ -43,7 +43,7 @@ class BaseEvent(BaseModel):
 
     __tablename__ = T_NAME_EVENTS
 
-    def __init__(
+    def __init__(  # pylint: disable=too-many-positional-arguments
         self,
         event_id: Mapped[int],
         name: Mapped[str_064],

{loglan_core-0.4.6 → loglan_core-0.4.7}/loglan_core/type.py

@@ -27,7 +27,7 @@ class BaseType(BaseModel):
 
     __tablename__ = T_NAME_TYPES
 
-    def __init__(
+    def __init__(  # pylint: disable=too-many-positional-arguments
         self,
         type_: Mapped[str_016],
         type_x: Mapped[str_016],

{loglan_core-0.4.6 → loglan_core-0.4.7}/loglan_core/word.py

@@ -34,7 +34,7 @@ class BaseWord(BaseModel):
 
     __tablename__ = T_NAME_WORDS
 
-    def __init__(
+    def __init__(  # pylint: disable=too-many-positional-arguments
         self,
         id_old: Mapped[int],
         name: Mapped[str_064],
@@ -138,6 +138,7 @@ class BaseWord(BaseModel):
 
     definitions: Mapped[list[BaseDefinition]] = relationship(
         back_populates="source_word",
+        cascade="all, delete-orphan",
     )
 
     # word's derivatives

loglan_core-0.4.7/pyproject.toml

@@ -0,0 +1,44 @@
+[build-system]
+requires = ['setuptools>=42']
+build-backend = 'setuptools.build_meta'
+
+[project]
+name = "Loglan-Core"
+version = "0.4.7"  # Placeholder, will be replaced by the script
+description = "Loglan Dictionary Database Model for SQLAlchemy"
+readme = "README.md"
+license = { text = "MIT" }
+authors = [
+    { name = "torrua", email = "torrua@gmail.com" }
+]
+keywords = ["Loglan", "Dictionary", "Database", "Model", "LOD"]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Intended Audience :: Developers",
+    "Intended Audience :: Science/Research",
+    "Topic :: Database",
+    "License :: OSI Approved :: MIT License",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+]
+requires-python = ">=3.10"
+
+dependencies = [
+    "sqlalchemy>=2.0.21",
+]
+
+[project.urls]
+"Download" = "https://github.com/torrua/loglan_core/archive/0.4.7.tar.gz"  # Placeholder, will be replaced by the script
+"Homepage" = "https://github.com/torrua/loglan_core"
+"Repository" = "https://github.com/torrua/loglan_core"
+
+[tool.setuptools.packages.find]
+include = ["loglan_core", "loglan_core.addons"]
+
+[tool.pylint]
+disable = ["R0902", "R0913", "R0801"]
+
+[tool.mypy]
+python_version = "3.10"
+strict = false

loglan_core-0.4.7/setup.py

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

loglan_core-0.4.6/pyproject.toml

@@ -1,10 +0,0 @@
-[build-system]
-requires = ['setuptools>=42']
-build-backend = 'setuptools.build_meta'
-
-[tool.pylint]
-disable = ["R0902", "R0913", "R0801"]
-
-[tool.mypy]
-python_version = "3.10"
-strict = false

loglan_core-0.4.6/setup.py

@@ -1,46 +0,0 @@
-# pylint: disable=C0114
-
-from io import open
-
-from setuptools import setup
-
-CURRENT_VERSION = "0.4.6"
-
-
-def read(filename):  # pylint: disable=C0116
-    with open(filename, encoding="utf-8") as file:
-        return file.read()
-
-
-setup(
-    name="Loglan-Core",
-    packages=["loglan_core", "loglan_core.addons"],
-    package_data={
-        "loglan_core": ["*"],
-    },
-    include_package_data=True,
-    version=CURRENT_VERSION,
-    license="MIT",
-    description="Loglan Dictionary Database Model for SQLAlchemy",
-    long_description=read("README.md"),
-    long_description_content_type="text/markdown",
-    author="torrua",
-    author_email="torrua@gmail.com",
-    url="https://github.com/torrua/loglan_core",
-    download_url=f"https://github.com/torrua/loglan_core/archive/{CURRENT_VERSION}.tar.gz",
-    keywords=["Loglan", "Dictionary", "Database", "Model", "LOD"],
-    install_requires=[
-        "sqlalchemy>=2.0.21",
-    ],
-    classifiers=[
-        "Development Status :: 5 - Production/Stable",  # "3 - Alpha", "4 - Beta" or "5 - Production/Stable"
-        "Intended Audience :: Developers",
-        "Intended Audience :: Science/Research",
-        "Topic :: Database",
-        "License :: OSI Approved :: MIT License",
-        "Programming Language :: Python :: 3.10",
-        "Programming Language :: Python :: 3.11",
-        "Programming Language :: Python :: 3.12",
-    ],
-    python_requires=">=3.10",
-)