compair-core 0.3.4__tar.gz → 0.3.6__tar.gz

{compair_core-0.3.4/compair_core.egg-info → compair_core-0.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: compair-core
-Version: 0.3.4
+Version: 0.3.6
 Summary: Open-source foundation of the Compair collaboration platform.
 Author: RocketResearch, Inc.
 License: MIT

{compair_core-0.3.4 → compair_core-0.3.6}/compair/models.py

@@ -38,7 +38,7 @@ class BaseObject(Base):
 
 class User(Base):
     __tablename__ = "user"
-    __table_args__ = {"schema": "public"}
+    
 
     user_id: Mapped[str] = mapped_column(String(36), primary_key=True, init=False, default=lambda: str(uuid4()))
     username: Mapped[str] = mapped_column(String(128))
@@ -73,6 +73,12 @@ class User(Base):
         passive_deletes=True,
     )
 
+    activities = relationship(
+        "Activity",
+        back_populates="user",
+        cascade="all, delete-orphan"
+    )
+
     def __init__(
         self,
         username: str,
@@ -108,17 +114,17 @@ class User(Base):
 
 class Session(Base):
     __tablename__ = "session"
-    __table_args__ = {"schema": "public"}
+    
 
     id: Mapped[str] = mapped_column(String(128), primary_key=True, init=True)
-    user_id: Mapped[str] = mapped_column(ForeignKey("public.user.user_id", ondelete="CASCADE"), index=True)
+    user_id: Mapped[str] = mapped_column(ForeignKey("user.user_id", ondelete="CASCADE"), index=True)
     datetime_created: Mapped[datetime]
     datetime_valid_until: Mapped[datetime]
 
 
 class Group(BaseObject):
     __tablename__ = "group"
-    __table_args__ = {"schema": "public"}
+    
 
     group_id: Mapped[str] = mapped_column(String(36), primary_key=True, init=False, default=lambda: str(uuid4()))
     name: Mapped[str] = mapped_column(String(256))
@@ -133,6 +139,12 @@ class Group(BaseObject):
     documents = relationship("Document", secondary="document_to_group", back_populates="groups")
     notes = relationship("Note", secondary="note_to_group", back_populates="groups")
 
+    activities = relationship(
+        "Activity",
+        back_populates="group",
+        cascade="all, delete-orphan"
+    )
+
     __mapper_args__ = {"primary_key": [group_id]}
 
     @property
@@ -150,10 +162,10 @@ class Group(BaseObject):
 
 class Administrator(Base):
     __tablename__ = "administrator"
-    __table_args__ = {"schema": "public"}
+    
 
     admin_id: Mapped[str] = mapped_column(String(36), primary_key=True, init=False, default=lambda: str(uuid4()))
-    user_id: Mapped[str] = mapped_column(ForeignKey("public.user.user_id", ondelete="CASCADE"), index=True)
+    user_id: Mapped[str] = mapped_column(ForeignKey("user.user_id", ondelete="CASCADE"), index=True)
 
     user = relationship("User")
     groups = relationship("Group", secondary="admin_to_group", back_populates="admins")
@@ -161,11 +173,11 @@ class Administrator(Base):
 
 class JoinRequest(Base):
     __tablename__ = "join_request"
-    __table_args__ = {"schema": "public"}
+    
 
     request_id: Mapped[int] = mapped_column(Identity(), primary_key=True, autoincrement=True, init=False)
-    user_id: Mapped[str] = mapped_column(ForeignKey("public.user.user_id", ondelete="CASCADE"))
-    group_id: Mapped[str] = mapped_column(ForeignKey("public.group.group_id", ondelete="CASCADE"))
+    user_id: Mapped[str] = mapped_column(ForeignKey("user.user_id", ondelete="CASCADE"))
+    group_id: Mapped[str] = mapped_column(ForeignKey("group.group_id", ondelete="CASCADE"))
     datetime_requested: Mapped[datetime] = mapped_column(default=datetime.now(timezone.utc), init=False)
 
     user = relationship("User")
@@ -174,11 +186,11 @@ class JoinRequest(Base):
 
 class GroupInvitation(Base):
     __tablename__ = "group_invitation"
-    __table_args__ = {"schema": "public"}
+    
 
     invitation_id: Mapped[int] = mapped_column(Integer, Identity(), primary_key=True, autoincrement=True, init=False)
-    group_id: Mapped[str] = mapped_column(ForeignKey("public.group.group_id", ondelete="CASCADE"))
-    inviter_id: Mapped[str] = mapped_column(ForeignKey("public.user.user_id", ondelete="CASCADE"))
+    group_id: Mapped[str] = mapped_column(ForeignKey("group.group_id", ondelete="CASCADE"))
+    inviter_id: Mapped[str] = mapped_column(ForeignKey("user.user_id", ondelete="CASCADE"))
     token: Mapped[str] = mapped_column(String(64), unique=True, nullable=False)
     email: Mapped[str | None] = mapped_column(String(256), nullable=True)
     datetime_expiration: Mapped[datetime]
@@ -191,10 +203,10 @@ class GroupInvitation(Base):
 
 class Document(BaseObject):
     __tablename__ = "document"
-    __table_args__ = {"schema": "public"}
+    
 
     document_id: Mapped[str] = mapped_column(String(36), primary_key=True, init=False, default=lambda: str(uuid4()))
-    user_id: Mapped[str] = mapped_column(ForeignKey("public.user.user_id", ondelete="CASCADE"), index=True)
+    user_id: Mapped[str] = mapped_column(ForeignKey("user.user_id", ondelete="CASCADE"), index=True)
     author_id: Mapped[str]
     title: Mapped[str]
     content: Mapped[str] = mapped_column(Text)
@@ -230,12 +242,12 @@ class Document(BaseObject):
 
 class Note(Base):
     __tablename__ = "note"
-    __table_args__ = {"schema": "public"}
+    
 
     note_id: Mapped[str] = mapped_column(String(36), primary_key=True, init=False, default=lambda: str(uuid4()))
-    document_id: Mapped[str] = mapped_column(ForeignKey("public.document.document_id", ondelete="CASCADE"), index=True)
-    author_id: Mapped[str] = mapped_column(ForeignKey("public.user.user_id", ondelete="CASCADE"), index=True)
-    group_id: Mapped[str | None] = mapped_column(ForeignKey("public.group.group_id", ondelete="CASCADE"), index=True, nullable=True)
+    document_id: Mapped[str] = mapped_column(ForeignKey("document.document_id", ondelete="CASCADE"), index=True)
+    author_id: Mapped[str] = mapped_column(ForeignKey("user.user_id", ondelete="CASCADE"), index=True)
+    group_id: Mapped[str | None] = mapped_column(ForeignKey("group.group_id", ondelete="CASCADE"), index=True, nullable=True)
     content: Mapped[str] = mapped_column(Text)
     datetime_created: Mapped[datetime] = mapped_column(default=datetime.now(timezone.utc))
     embedding = mapped_column(Vector(1536))
@@ -259,13 +271,13 @@ class Note(Base):
 
 class Chunk(Base):
     __tablename__ = "chunk"
-    __table_args__ = {"schema": "public"}
+    
 
     chunk_id: Mapped[str] = mapped_column(String(36), primary_key=True, init=False, default=lambda: str(uuid4()))
     hash: Mapped[str] = mapped_column(String(32))
     content: Mapped[str] = mapped_column(Text)
-    document_id: Mapped[str | None] = mapped_column(ForeignKey("public.document.document_id", ondelete="CASCADE"), index=True, nullable=True)
-    note_id: Mapped[str | None] = mapped_column(ForeignKey("public.note.note_id", ondelete="CASCADE"), index=True, nullable=True)
+    document_id: Mapped[str | None] = mapped_column(ForeignKey("document.document_id", ondelete="CASCADE"), index=True, nullable=True)
+    note_id: Mapped[str | None] = mapped_column(ForeignKey("note.note_id", ondelete="CASCADE"), index=True, nullable=True)
     chunk_type: Mapped[str] = mapped_column(String(16), default="document")
     embedding = mapped_column(Vector(1536))
 
@@ -287,12 +299,12 @@ class Chunk(Base):
 
 class Reference(Base):
     __tablename__ = "reference"
-    __table_args__ = {"schema": "public"}
+    
 
     reference_id: Mapped[str] = mapped_column(String(36), primary_key=True, init=False, default=lambda: str(uuid4()))
-    source_chunk_id: Mapped[str] = mapped_column(ForeignKey("public.chunk.chunk_id", ondelete="CASCADE"), index=True)
-    reference_document_id: Mapped[str | None] = mapped_column(ForeignKey("public.document.document_id", ondelete="CASCADE"), index=True, nullable=True)
-    reference_note_id: Mapped[str | None] = mapped_column(ForeignKey("public.note.note_id", ondelete="CASCADE"), index=True, nullable=True)
+    source_chunk_id: Mapped[str] = mapped_column(ForeignKey("chunk.chunk_id", ondelete="CASCADE"), index=True)
+    reference_document_id: Mapped[str | None] = mapped_column(ForeignKey("document.document_id", ondelete="CASCADE"), index=True, nullable=True)
+    reference_note_id: Mapped[str | None] = mapped_column(ForeignKey("note.note_id", ondelete="CASCADE"), index=True, nullable=True)
     reference_type: Mapped[str] = mapped_column(String(16), default="document")
 
     chunk = relationship("Chunk", back_populates="references")
@@ -302,10 +314,10 @@ class Reference(Base):
 
 class Feedback(Base):
     __tablename__ = "feedback"
-    __table_args__ = {"schema": "public"}
+
 
     feedback_id: Mapped[str] = mapped_column(String(36), primary_key=True, init=False, default=lambda: str(uuid4()))
-    source_chunk_id: Mapped[str] = mapped_column(ForeignKey("public.chunk.chunk_id", ondelete="CASCADE"), index=True)
+    source_chunk_id: Mapped[str] = mapped_column(ForeignKey("chunk.chunk_id", ondelete="CASCADE"), index=True)
     feedback: Mapped[str] = mapped_column(Text)
     model: Mapped[str] = mapped_column(Text)
     timestamp: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=datetime.now(timezone.utc))
@@ -315,34 +327,50 @@ class Feedback(Base):
     chunk = relationship("Chunk", back_populates="feedbacks")
 
 
+class Activity(Base):
+    __tablename__ = "activity"
+
+    activity_id: Mapped[int] = mapped_column(Identity(), primary_key=True, init=False, autoincrement=True)
+    user_id: Mapped[str] = mapped_column(ForeignKey("user.user_id", ondelete="CASCADE"), nullable=False)
+    group_id: Mapped[str] = mapped_column(ForeignKey("group.group_id", ondelete="CASCADE"), nullable=False)
+    action: Mapped[str] = mapped_column(String(32))
+    object_id: Mapped[str] = mapped_column(String(36))
+    object_name: Mapped[str] = mapped_column(Text)
+    object_type: Mapped[str] = mapped_column(String(32))
+    timestamp: Mapped[datetime] = mapped_column(default=datetime.now(timezone.utc))
+
+    user = relationship("User", back_populates="activities", lazy="joined")
+    group = relationship("Group", back_populates="activities")
+
+
 user_to_group_table = Table(
     "user_to_group",
     Base.metadata,
-    Column("user_id", ForeignKey("public.user.user_id", ondelete="CASCADE"), primary_key=True),
-    Column("group_id", ForeignKey("public.group.group_id", ondelete="CASCADE"), primary_key=True),
+    Column("user_id", ForeignKey("user.user_id", ondelete="CASCADE"), primary_key=True),
+    Column("group_id", ForeignKey("group.group_id", ondelete="CASCADE"), primary_key=True),
 )
 
 
 admin_to_group_table = Table(
     "admin_to_group",
     Base.metadata,
-    Column("admin_id", ForeignKey("public.administrator.admin_id", ondelete="CASCADE"), primary_key=True),
-    Column("group_id", ForeignKey("public.group.group_id", ondelete="CASCADE"), primary_key=True),
+    Column("admin_id", ForeignKey("administrator.admin_id", ondelete="CASCADE"), primary_key=True),
+    Column("group_id", ForeignKey("group.group_id", ondelete="CASCADE"), primary_key=True),
 )
 
 
 document_to_group_table = Table(
     "document_to_group",
     Base.metadata,
-    Column("document_id", ForeignKey("public.document.document_id", ondelete="CASCADE"), primary_key=True),
-    Column("group_id", ForeignKey("public.group.group_id", ondelete="CASCADE"), primary_key=True),
+    Column("document_id", ForeignKey("document.document_id", ondelete="CASCADE"), primary_key=True),
+    Column("group_id", ForeignKey("group.group_id", ondelete="CASCADE"), primary_key=True),
 )
 
 note_to_group_table = Table(
     "note_to_group",
     Base.metadata,
-    Column("note_id", ForeignKey("public.note.note_id", ondelete="CASCADE"), primary_key=True),
-    Column("group_id", ForeignKey("public.group.group_id", ondelete="CASCADE"), primary_key=True),
+    Column("note_id", ForeignKey("note.note_id", ondelete="CASCADE"), primary_key=True),
+    Column("group_id", ForeignKey("group.group_id", ondelete="CASCADE"), primary_key=True),
 )
 
 

compair_core-0.3.6/compair/utils.py

@@ -0,0 +1,42 @@
+from __future__ import annotations
+
+import secrets
+from datetime import datetime, timedelta, timezone
+
+from sqlalchemy.orm import Session
+
+from compair.models import Activity
+
+
+def chunk_text(text: str) -> list[str]:
+    chunks = text.split("\n\n")
+    chunks = [c.strip() for c in chunks]
+    return [c for c in chunks if c]
+
+
+def generate_verification_token() -> tuple[str, datetime]:
+    token = secrets.token_urlsafe(32)
+    expiration = datetime.now(timezone.utc) + timedelta(hours=24)
+    return token, expiration
+
+
+def log_activity(
+    session: Session,
+    user_id: str,
+    group_id: str,
+    action: str,
+    object_id: str,
+    object_name: str,
+    object_type: str,
+) -> None:
+    activity = Activity(
+        user_id=user_id,
+        group_id=group_id,
+        action=action,
+        object_id=object_id,
+        object_name=object_name,
+        object_type=object_type,
+        timestamp=datetime.now(timezone.utc),
+    )
+    session.add(activity)
+    session.commit()

{compair_core-0.3.4 → compair_core-0.3.6/compair_core.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: compair-core
-Version: 0.3.4
+Version: 0.3.6
 Summary: Open-source foundation of the Compair collaboration platform.
 Author: RocketResearch, Inc.
 License: MIT

{compair_core-0.3.4 → compair_core-0.3.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "compair-core"
-version = "0.3.4"
+version = "0.3.6"
 description = "Open-source foundation of the Compair collaboration platform."
 readme = "README.md"
 license = { text = "MIT" }

compair_core-0.3.4/compair/utils.py

@@ -1,61 +0,0 @@
-from __future__ import annotations
-
-import secrets
-from datetime import datetime, timedelta, timezone
-from typing import Any
-
-from sqlalchemy.orm import Session
-
-try:
-    from compair_cloud.utils import log_activity as cloud_log_activity  # type: ignore
-except (ImportError, ModuleNotFoundError):
-    cloud_log_activity = None
-
-
-def chunk_text(text: str) -> list[str]:
-    chunks = text.split("\n\n")
-    chunks = [c.strip() for c in chunks]
-    return [c for c in chunks if c]
-
-
-def generate_verification_token() -> tuple[str, datetime]:
-    token = secrets.token_urlsafe(32)
-    expiration = datetime.now(timezone.utc) + timedelta(hours=24)
-    return token, expiration
-
-
-def log_activity(
-    session: Session,
-    user_id: str,
-    group_id: str,
-    action: str,
-    object_id: str,
-    object_name: str,
-    object_type: str,
-) -> None:
-    if cloud_log_activity:
-        cloud_log_activity(
-            session=session,
-            user_id=user_id,
-            group_id=group_id,
-            action=action,
-            object_id=object_id,
-            object_name=object_name,
-            object_type=object_type,
-        )
-
-
-def aggregate_usage_by_user() -> dict[str, Any]:
-    if cloud_log_activity:
-        from compair_cloud.utils import aggregate_usage_by_user as cloud_usage  # type: ignore
-
-        return cloud_usage()
-    return {}
-
-
-def aggregate_service_resources() -> dict[str, Any]:
-    if cloud_log_activity:
-        from compair_cloud.utils import aggregate_service_resources as cloud_resources  # type: ignore
-
-        return cloud_resources()
-    return {}