compair-core 0.3.8__tar.gz → 0.3.10__tar.gz

{compair_core-0.3.8 → compair_core-0.3.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: compair-core
-Version: 0.3.8
+Version: 0.3.10
 Summary: Open-source foundation of the Compair collaboration platform.
 Author: RocketResearch, Inc.
 License: MIT
@@ -23,6 +23,7 @@ Requires-Dist: redis>=5.0
 Requires-Dist: psutil>=5.9
 Requires-Dist: python-Levenshtein>=0.23
 Requires-Dist: redmail>=0.6
+Requires-Dist: python-multipart>=0.0.20
 Provides-Extra: dev
 Requires-Dist: build>=1.0; extra == "dev"
 Requires-Dist: twine>=5.0; extra == "dev"

{compair_core-0.3.8 → compair_core-0.3.10}/compair_core/api.py

@@ -36,10 +36,13 @@ from .compair_email.templates import (
 )
 from .compair.tasks import process_document_task as process_document_celery, send_feature_announcement_task, send_deactivate_request_email, send_help_request_email
 
-import redis
+try:
+    import redis  # type: ignore
+except ImportError:  # pragma: no cover - optional dependency
+    redis = None
 
 redis_url = os.environ.get("REDIS_URL")
-redis_client = redis.Redis.from_url(redis_url)
+redis_client = redis.Redis.from_url(redis_url) if (redis and redis_url) else None
 #from compair.main import process_document
 
 router = APIRouter()
@@ -80,6 +83,7 @@ HAS_ACTIVITY = hasattr(models, "Activity")
 HAS_REFERRALS = hasattr(models.User, "referral_code")
 HAS_BILLING = hasattr(models.User, "stripe_customer_id")
 HAS_TRIALS = hasattr(models.User, "trial_expiration_date")
+HAS_REDIS = redis_client is not None
 
 
 def require_feature(flag: bool, feature: str) -> None:
@@ -3228,11 +3232,12 @@ def generate_download_token(
         else:
             raise HTTPException(status_code=403, detail="Not authorized to download this file.")
 
+    if not HAS_REDIS:
+        raise HTTPException(status_code=501, detail="Secure download links require Redis, which is unavailable in the core edition.")
+
     token = secrets.token_urlsafe(32)
     key = f"download_token:{token}"
     redis_client.setex(key, 300, document_id)
-    print('Setting redis kv')
-    print(key, document_id)
     return {"download_url": f"/documents/download/{token}"}
 
 
@@ -3241,10 +3246,12 @@ def download_document_with_token(
     token: str,
     storage: StorageProvider = Depends(get_storage),
 ):
+    if not HAS_REDIS:
+        raise HTTPException(status_code=501, detail="Secure download links require Redis, which is unavailable in the core edition.")
+
     key = f"download_token:{token}"
-    print(f'Retrieving redis kv with key {key}')
-    document_id = redis_client.get(key).decode('utf-8') if redis_client.get(key) else None
-    print(f'Value {document_id}')
+    value = redis_client.get(key) if redis_client else None
+    document_id = value.decode('utf-8') if value else None
     if not document_id:
         raise HTTPException(status_code=403, detail="Invalid or expired token")
     redis_client.delete(key)

{compair_core-0.3.8 → compair_core-0.3.10}/compair_core/compair/__init__.py

@@ -1,25 +1,20 @@
 from __future__ import annotations
 
-import importlib
-import logging
 import os
-import sys
-
 from sqlalchemy import Engine, create_engine
 from sqlalchemy.orm import sessionmaker
 
-from ..compair import embeddings, feedback, logger, main, models, tasks, utils
-from ..compair.default_groups import initialize_default_groups
+from . import embeddings, feedback, logger, main, models, tasks, utils
+from .default_groups import initialize_default_groups
 
 edition = os.getenv("COMPAIR_EDITION", "core").lower()
 
-_cloud_available = False
+initialize_database_override = None
+
 if edition == "cloud":
     try:  # Import cloud overrides if the private package is installed
-        from ..compair_cloud import (
+        from compair_cloud import (  # type: ignore
             bootstrap as cloud_bootstrap,
-            celery_app as cloud_celery_app,
-            default_groups as cloud_default_groups,
             embeddings as cloud_embeddings,
             feedback as cloud_feedback,
             logger as cloud_logger,
@@ -27,27 +22,18 @@ if edition == "cloud":
             models as cloud_models,
             tasks as cloud_tasks,
             utils as cloud_utils,
-        )  # type: ignore
+        )
 
-        _cloud_available = True
+        embeddings = cloud_embeddings
+        feedback = cloud_feedback
+        logger = cloud_logger
+        main = cloud_main
+        models = cloud_models
+        tasks = cloud_tasks
+        utils = cloud_utils
+        initialize_database_override = getattr(cloud_bootstrap, "initialize_database", None)
     except ImportError:
-        _cloud_available = False
-
-if _cloud_available:
-    from ..compair_cloud.default_groups import initialize_default_groups  # type: ignore
-    embeddings = cloud_embeddings
-    feedback = cloud_feedback
-    logger = cloud_logger
-    main = cloud_main
-    models = cloud_models
-    tasks = cloud_tasks
-    utils = cloud_utils
-    initialize_database_override = getattr(cloud_bootstrap, "initialize_database", None)
-else:
-    from . import embeddings, feedback, logger, main, models, tasks, utils
-    from .default_groups import initialize_default_groups
-    initialize_database_override = None
-
+        pass
 
 
 def _handle_engine() -> Engine:
@@ -74,15 +60,21 @@ def _handle_engine() -> Engine:
     return create_engine(f"sqlite:///{sqlite_path}", connect_args={"check_same_thread": False})
 
 
-engine = _handle_engine()
-
-
 def initialize_database() -> None:
     models.Base.metadata.create_all(engine)
     if initialize_database_override:
         initialize_database_override(engine)
 
 
-__all__ = ["embeddings", "feedback", "main", "models", "utils"]
-sys.modules.setdefault(__name__ + ".server", importlib.import_module("server"))
-sys.modules.setdefault(__name__ + ".compair_email", importlib.import_module("compair_email"))
+def _initialize_defaults() -> None:
+    with Session() as session:
+        initialize_default_groups(session)
+
+
+engine = _handle_engine()
+Session = sessionmaker(engine)
+embedder = embeddings.Embedder()
+reviewer = feedback.Reviewer()
+_initialize_defaults()
+
+__all__ = ["embeddings", "feedback", "main", "models", "utils", "Session"]

{compair_core-0.3.8 → compair_core-0.3.10}/compair_core/compair/utils.py

@@ -5,7 +5,7 @@ from datetime import datetime, timedelta, timezone
 
 from sqlalchemy.orm import Session
 
-from compair.models import Activity
+from .models import Activity
 
 
 def chunk_text(text: str) -> list[str]:

compair_core-0.3.10/compair_core/compair_email/templates_core.py

@@ -0,0 +1,32 @@
+"""Minimal email templates for the core edition."""
+
+ACCOUNT_VERIFY_TEMPLATE = """
+<p>Hi {{user_name}},</p>
+<p>Please verify your Compair account by clicking the link below:</p>
+<p><a href="{{verify_link}}">Verify my account</a></p>
+<p>Thanks!</p>
+""".strip()
+
+PASSWORD_RESET_TEMPLATE = """
+<p>We received a request to reset your password.</p>
+<p>Your password reset code is: <strong>{{reset_code}}</strong></p>
+""".strip()
+
+GROUP_INVITATION_TEMPLATE = """
+<p>{{inviter_name}} invited you to join the group {{group_name}}.</p>
+<p><a href="{{invitation_link}}">Accept invitation</a></p>
+""".strip()
+
+GROUP_JOIN_TEMPLATE = """
+<p>{{user_name}} has joined your group.</p>
+""".strip()
+
+INDIVIDUAL_INVITATION_TEMPLATE = """
+<p>{{inviter_name}} invited you to Compair.</p>
+<p><a href="{{referral_link}}">Join now</a></p>
+""".strip()
+
+REFERRAL_CREDIT_TEMPLATE = """
+<p>Hi {{user_name}},</p>
+<p>Great news! You now have {{referral_credits}} referral credits.</p>
+""".strip()

{compair_core-0.3.8 → compair_core-0.3.10}/compair_core/server/app.py

@@ -28,7 +28,7 @@ def create_app(settings: Settings | None = None) -> FastAPI:
 
     app = FastAPI(title="Compair API", version=resolved_settings.version)
 
-    from api import router as legacy_router
+    from ..api import router as legacy_router
 
     app.include_router(legacy_router)
     app.include_router(capabilities_router)

{compair_core-0.3.8 → compair_core-0.3.10}/compair_core/server/settings.py

@@ -18,7 +18,7 @@ class Settings(BaseSettings):
     premium_models: bool = False
 
     # Core/local storage defaults
-    local_upload_dir: str = "/data/uploads"
+    local_upload_dir: str = "~/.compair-core/data/uploads"
     local_upload_base_url: str = "/uploads"
 
     # Cloud storage (R2/S3-compatible)

{compair_core-0.3.8 → compair_core-0.3.10}/compair_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: compair-core
-Version: 0.3.8
+Version: 0.3.10
 Summary: Open-source foundation of the Compair collaboration platform.
 Author: RocketResearch, Inc.
 License: MIT
@@ -23,6 +23,7 @@ Requires-Dist: redis>=5.0
 Requires-Dist: psutil>=5.9
 Requires-Dist: python-Levenshtein>=0.23
 Requires-Dist: redmail>=0.6
+Requires-Dist: python-multipart>=0.0.20
 Provides-Extra: dev
 Requires-Dist: build>=1.0; extra == "dev"
 Requires-Dist: twine>=5.0; extra == "dev"

{compair_core-0.3.8 → compair_core-0.3.10}/compair_core.egg-info/requires.txt

@@ -11,6 +11,7 @@ redis>=5.0
 psutil>=5.9
 python-Levenshtein>=0.23
 redmail>=0.6
+python-multipart>=0.0.20
 
 [dev]
 build>=1.0

{compair_core-0.3.8 → compair_core-0.3.10}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "compair-core"
-version = "0.3.8"
+version = "0.3.10"
 description = "Open-source foundation of the Compair collaboration platform."
 readme = "README.md"
 license = { text = "MIT" }
@@ -26,6 +26,7 @@ dependencies = [
   "psutil>=5.9",
   "python-Levenshtein>=0.23",
   "redmail>=0.6",
+  "python-multipart>=0.0.20",
 ]
 
 [project.optional-dependencies]

compair_core-0.3.8/compair_core/compair_email/templates_core.py

@@ -1,13 +0,0 @@
-"""Minimal email templates for the core edition."""
-
-ACCOUNT_VERIFY_TEMPLATE = """
-<p>Hi {{user_name}},</p>
-<p>Please verify your Compair account by clicking the link below:</p>
-<p><a href="{{verify_link}}">Verify my account</a></p>
-<p>Thanks!</p>
-""".strip()
-
-PASSWORD_RESET_TEMPLATE = """
-<p>We received a request to reset your password.</p>
-<p>Your password reset code is: <strong>{{reset_code}}</strong></p>
-""".strip()