Loglan-Core 0.4.1__tar.gz → 0.4.3__tar.gz

{loglan_core-0.4.1 → loglan_core-0.4.3/Loglan_Core.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: Loglan-Core
-Version: 0.4.1
+Version: 0.4.3
 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.1.tar.gz
+Download-URL: https://github.com/torrua/loglan_core/archive/0.4.3.tar.gz
 Author: torrua
 Author-email: torrua@gmail.com
 License: MIT

{loglan_core-0.4.1/Loglan_Core.egg-info → loglan_core-0.4.3}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: Loglan-Core
-Version: 0.4.1
+Version: 0.4.3
 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.1.tar.gz
+Download-URL: https://github.com/torrua/loglan_core/archive/0.4.3.tar.gz
 Author: torrua
 Author-email: torrua@gmail.com
 License: MIT

{loglan_core-0.4.1 → loglan_core-0.4.3}/loglan_core/__init__.py

@@ -8,12 +8,15 @@ __author__ = "torrua"
 __copyright__ = "Copyright 2024, loglan_core project"
 __email__ = "torrua@gmail.com"
 
-from loglan_core.author import BaseAuthor as Author
 from loglan_core.connect_tables import (
     t_connect_authors,
     t_connect_words,
     t_connect_keys,
 )
+
+from loglan_core.base import BaseModel as Base
+
+from loglan_core.author import BaseAuthor as Author
 from loglan_core.definition import BaseDefinition as Definition
 from loglan_core.event import BaseEvent as Event
 from loglan_core.key import BaseKey as Key
@@ -23,5 +26,11 @@ from loglan_core.type import BaseType as Type
 from loglan_core.word import BaseWord as Word
 from loglan_core.word_spell import BaseWordSpell as WordSpell
 
-from loglan_core.base import BaseModel as Base
+from loglan_core.addons.base_selector import BaseSelector
+from loglan_core.addons.definition_selector import DefinitionSelector
+from loglan_core.addons.key_selector import KeySelector
 from loglan_core.addons.word_selector import WordSelector
+
+from loglan_core.addons.export_word_converter import ExportWordConverter
+from loglan_core.addons.exporter import Exporter
+from loglan_core.addons.word_linker import WordLinker

{loglan_core-0.4.1 → loglan_core-0.4.3}/loglan_core/addons/base_selector.py

@@ -6,8 +6,8 @@ from __future__ import annotations
 
 from typing import Type, Iterable, Any
 
-from sqlalchemy import true, select, Select
-from sqlalchemy.orm import Session, selectinload, InstrumentedAttribute
+from sqlalchemy import select, Select
+from sqlalchemy.orm import Session, InstrumentedAttribute, joinedload
 from typing_extensions import Self
 
 from loglan_core.base import BaseModel
@@ -164,25 +164,50 @@ class BaseSelector:  # pylint: disable=too-many-ancestors
         self._statement = self._statement.order_by(*columns)
         return self
 
+    def filter(self, *args) -> Self:
+        """Filter results based on arbitrary keyword arguments.
+
+        Args:
+            *args: Column-value pairs to filter by.
+
+        Returns:
+            Self: The current instance for method chaining.
+        """
+
+        self._statement = self._statement.filter(*args)
+
+        return self
+
     def filter_by(self, **kwargs) -> Self:
         """Filter results based on arbitrary keyword arguments.
 
         Args:
-            **kwargs: Column-value pairs to filter by.
+            *kwargs: Column-value pairs to filter by.
 
         Returns:
             Self: The current instance for method chaining.
         """
-        for key, value in kwargs.items():
-            condition = self._generate_column_condition(key, value)
-            self._statement = self._statement.where(condition)
 
+        self._statement = self._statement.filter_by(**kwargs)
+
+        return self
+
+    def where(self, *args) -> Self:
+        """Filter results based on arbitrary keyword arguments.
+
+        Args:
+            *args: Column-value pairs to filter by.
+
+        Returns:
+            Self: The current instance for method chaining.
+        """
+        self._statement = self._statement.where(*args)
         return self
 
     def _generate_column_condition(self, key: str | InstrumentedAttribute, value: Any):
         column = getattr(self.model, key, None) if isinstance(key, str) else key
         if column is None:
-            return true()
+            raise AttributeError(f"Model {self.model} has no attribute {key}")
 
         value = str(value).replace("*", "%")
         if self.case_sensitive:
@@ -235,7 +260,7 @@ class BaseSelector:  # pylint: disable=too-many-ancestors
             attr: getattr(self.model, attr) for attr in self.model.relationships()
         }
         relationships = {
-            selectinload(v)
+            joinedload(v)
             for k, v in available_relationships.items()
             if not selected or k in selected
         }

{loglan_core-0.4.1 → loglan_core-0.4.3}/loglan_core/definition.py

@@ -112,12 +112,11 @@ class BaseDefinition(BaseModel):
     @property
     def grammar(self) -> str:
         """
-        Combine definition's 'slots' and 'grammar_code' attributes
+        Combine definition's 'slots' and 'grammar_code' attributes.
 
         Returns:
-            String with grammar data like (3v) or (2n)
+            String with grammar data like (3v) or (2n), or an empty string if both are None.
         """
-        return (
-            f"({self.slots if self.slots else ''}"
-            f"{self.grammar_code if self.grammar_code else ''})"
-        )
+        sl_str = self.slots or ""
+        gr_str = self.grammar_code or ""
+        return f"({sl_str}{gr_str})" if sl_str or gr_str else ""

{loglan_core-0.4.1 → loglan_core-0.4.3}/setup.py

@@ -4,7 +4,7 @@ from io import open
 
 from setuptools import setup
 
-CURRENT_VERSION = "0.4.1"
+CURRENT_VERSION = "0.4.3"
 
 
 def read(filename):  # pylint: disable=C0116