datanommer.models 1.3.0__py3-none-any.whl → 1.4.0__py3-none-any.whl

datanommer/models/__init__.py

@@ -32,6 +32,7 @@ from sqlalchemy import (
     event,
     ForeignKey,
     func,
+    Index,
     Integer,
     not_,
     or_,
@@ -158,6 +159,7 @@ def add(message):
         timestamp=sent_at,
         msg=message.body,
         headers=headers,
+        agent_name=getattr(message, "agent_name", None),
         users=usernames,
         packages=packages,
     )
@@ -213,7 +215,15 @@ packages_assoc_table = Table(
 
 class Message(DeclarativeBase):
     __tablename__ = "messages"
-    __table_args__ = (UniqueConstraint("msg_id", "timestamp"),)
+    __table_args__ = (
+        UniqueConstraint("msg_id", "timestamp"),
+        Index(
+            "ix_messages_headers",
+            "headers",
+            postgresql_using="gin",
+            postgresql_ops={"headers": "jsonb_path_ops"},
+        ),
+    )
 
     id = Column(Integer, primary_key=True, autoincrement=True)
     msg_id = Column(Unicode, nullable=True, default=None, index=True)
@@ -223,7 +233,7 @@ class Message(DeclarativeBase):
     certificate = Column(UnicodeText)
     signature = Column(UnicodeText)
     category = Column(Unicode, nullable=False, index=True)
-    username = Column(Unicode)
+    agent_name = Column(Unicode, index=True)
     crypto = Column(UnicodeText)
     source_name = Column(Unicode, default="datanommer")
     source_version = Column(Unicode, default=lambda context: __version__)
@@ -326,7 +336,8 @@ class Message(DeclarativeBase):
             timestamp=self.timestamp,
             certificate=self.certificate,
             signature=self.signature,
-            username=self.username,
+            agent_name=self.agent_name,
+            username=self.agent_name,  # DEPRECATED
             crypto=self.crypto,
             msg=self.msg,
             headers=self.headers,
@@ -358,6 +369,16 @@ class Message(DeclarativeBase):
         )
         return self.as_dict(request)
 
+    @property
+    def username(self):
+        warn(
+            "The username attribute has been renamed to agent_name, and will be removed "
+            "in the next major version",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        return self.agent_name
+
     @classmethod
     def make_query(
         cls,
@@ -372,6 +393,8 @@ class Message(DeclarativeBase):
         not_categories=None,
         topics=None,
         not_topics=None,
+        agents=None,
+        not_agents=None,
         contains=None,
     ):
         """Flexible query interface for messages.
@@ -400,6 +423,7 @@ class Message(DeclarativeBase):
 
             (user == 'ralph') AND
             NOT (category == 'bodhi' OR category == 'wiki')
+
         """
 
         users = users or []
@@ -410,6 +434,8 @@ class Message(DeclarativeBase):
         not_cats = not_categories or []
         topics = topics or []
         not_topics = not_topics or []
+        agents = agents or []
+        not_agents = not_agents or []
         contains = contains or []
 
         Message = cls
@@ -441,6 +467,9 @@ class Message(DeclarativeBase):
         if topics:
             query = query.where(or_(*(Message.topic == topic for topic in topics)))
 
+        if agents:
+            query = query.where(or_(*(Message.agent_name == agent for agent in agents)))
+
         if contains:
             query = query.where(or_(*(Message.msg.like(f"%{contain}%") for contain in contains)))
 
@@ -459,6 +488,9 @@ class Message(DeclarativeBase):
         if not_topics:
             query = query.where(not_(or_(*(Message.topic == topic for topic in not_topics))))
 
+        if not_agents:
+            query = query.where(not_(or_(*(Message.agent_name == agent for agent in not_agents))))
+
         return query
 
     @classmethod
@@ -500,13 +532,8 @@ class Message(DeclarativeBase):
 
         ----
 
-        The ``jsons`` argument is a list of jsonpath filters, please refer to
-        `PostgreSQL's documentation
-        <https://www.postgresql.org/docs/current/functions-json.html#FUNCTIONS-SQLJSON-PATH>`_
-        on the matter to learn how to build the jsonpath expression.
-
-        The ``jsons_and`` argument is similar to the ``jsons`` argument, but all
-        the values must match for a message to be returned.
+        If the `defer` argument evaluates to True, the query won't actually
+        be executed, but a SQLAlchemy query object returned instead.
         """
         query = cls.make_query(**kwargs)
         # Finally, tag on our pagination arguments
@@ -538,7 +565,7 @@ class Message(DeclarativeBase):
     def get_first(cls, *, order="asc", **kwargs):
         """Get the first message matching the regular grep filters."""
         query = cls.make_query(**kwargs)
-        query = query.order_by(getattr(Message.timestamp, order)())
+        query = query.order_by(getattr(Message.timestamp, order)()).limit(1)
         return session.scalars(query).first()
 
 

datanommer/models/alembic/versions/429e6f2cba6f_message_agent_name.py

@@ -0,0 +1,24 @@
+"""Message.username → Message.agent_name
+
+Revision ID: 429e6f2cba6f
+Revises: 951c40020acc
+Create Date: 2024-06-07 09:12:33.393757
+
+"""
+
+from alembic import op
+
+
+# revision identifiers, used by Alembic.
+revision = "429e6f2cba6f"
+down_revision = "f6918385051f"
+
+
+def upgrade():
+    op.alter_column("messages", "username", new_column_name="agent_name")
+    op.create_index(op.f("ix_messages_agent_name"), "messages", ["agent_name"], unique=False)
+
+
+def downgrade():
+    op.drop_index(op.f("ix_messages_agent_name"), table_name="messages")
+    op.alter_column("messages", "agent_name", new_column_name="username")

datanommer/models/alembic/versions/f6918385051f_messages_headers_index.py

@@ -0,0 +1,29 @@
+"""Messages.headers index
+
+Revision ID: f6918385051f
+Revises: 951c40020acc
+Create Date: 2024-05-07 16:05:05.344863
+
+"""
+
+from alembic import op
+
+
+# revision identifiers, used by Alembic.
+revision = "f6918385051f"
+down_revision = "951c40020acc"
+
+
+def upgrade():
+    op.create_index(
+        "ix_messages_headers",
+        "messages",
+        ["headers"],
+        unique=False,
+        postgresql_using="gin",
+        postgresql_ops={"headers": "jsonb_path_ops"},
+    )
+
+
+def downgrade():
+    op.drop_index("ix_messages_headers", table_name="messages", postgresql_using="gin")

{datanommer_models-1.3.0.dist-info → datanommer_models-1.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datanommer.models
-Version: 1.3.0
+Version: 1.4.0
 Summary: SQLAlchemy models for datanommer
 Home-page: https://github.com/fedora-infra/datanommer
 License: GPL-3.0-or-later

datanommer_models-1.4.0.dist-info/RECORD

@@ -0,0 +1,12 @@
+datanommer/models/__init__.py,sha256=5By2KNqRy1d7abDFMT3DvhcQZ4UVrx92XokAYevjKnk,19322
+datanommer/models/alembic/env.py,sha256=WNTimgnH70CakhvuV5QCilCnOcjTy7kcx0nD7hryYx0,2793
+datanommer/models/alembic/script.py.mako,sha256=D8kFI44_9vBJZrAYSkZxDTX2-S5Y-oEetEd9BKlo9S8,412
+datanommer/models/alembic/versions/429e6f2cba6f_message_agent_name.py,sha256=JT_q5oweCN8soqMTul1vEspWvqx5TXOfG3ifB9DYmgs,612
+datanommer/models/alembic/versions/5db25abc63be_init.py,sha256=xMD7WGCOqeVNFroCZds_aS_jta2yTrAHc_XhtmZLZRs,249
+datanommer/models/alembic/versions/951c40020acc_unique.py,sha256=GwKDhppKW7y5BUV8BqILZCAiR7GsNyIvoTXUu2A1ZMI,843
+datanommer/models/alembic/versions/f6918385051f_messages_headers_index.py,sha256=vj-yzMOH3MNdQDufPLAxhix74fV_2tzBbEc6JNWt9Og,575
+datanommer/models/testing/__init__.py,sha256=wwAZ-s1U4M7nYNxHgJsn5ZIqLuHMzHrJwGJOwgHAFgc,1693
+datanommer_models-1.4.0.dist-info/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
+datanommer_models-1.4.0.dist-info/METADATA,sha256=F6nCFWELLinPdPJVmvxwGN4a9wgB7RodZAOlPlA0KLM,2561
+datanommer_models-1.4.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+datanommer_models-1.4.0.dist-info/RECORD,,

datanommer_models-1.3.0.dist-info/RECORD

@@ -1,10 +0,0 @@
-datanommer/models/__init__.py,sha256=j3ZIgc2XnXoHaTuC2edq9RoVEqx0g8dc9-3dKi3ctBU,18628
-datanommer/models/alembic/env.py,sha256=WNTimgnH70CakhvuV5QCilCnOcjTy7kcx0nD7hryYx0,2793
-datanommer/models/alembic/script.py.mako,sha256=D8kFI44_9vBJZrAYSkZxDTX2-S5Y-oEetEd9BKlo9S8,412
-datanommer/models/alembic/versions/5db25abc63be_init.py,sha256=xMD7WGCOqeVNFroCZds_aS_jta2yTrAHc_XhtmZLZRs,249
-datanommer/models/alembic/versions/951c40020acc_unique.py,sha256=GwKDhppKW7y5BUV8BqILZCAiR7GsNyIvoTXUu2A1ZMI,843
-datanommer/models/testing/__init__.py,sha256=wwAZ-s1U4M7nYNxHgJsn5ZIqLuHMzHrJwGJOwgHAFgc,1693
-datanommer_models-1.3.0.dist-info/LICENSE,sha256=jOtLnuWt7d5Hsx6XXB2QxzrSe2sWWh3NgMfFRetluQM,35147
-datanommer_models-1.3.0.dist-info/METADATA,sha256=wKhrCYMD6cECmPOoosFOEIZdtAezEhw1SxwDxlotE54,2561
-datanommer_models-1.3.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-datanommer_models-1.3.0.dist-info/RECORD,,