compair-core 0.4.0__tar.gz → 0.4.1__tar.gz

{compair_core-0.4.0 → compair_core-0.4.1}/PKG-INFO

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

{compair_core-0.4.0 → compair_core-0.4.1}/compair_core/compair/feedback.py

@@ -96,6 +96,33 @@ def _fallback_feedback(text: str, references: list[Any]) -> str:
     return f"Consider aligning with these reference passages: {joined}"
 
 
+
+def _local_reference_feedback(
+    reviewer: Reviewer,
+    references: list[Any],
+    user: User,
+) -> str | None:
+    if not references:
+        return None
+    summaries: list[str] = []
+    for ref in references[:3]:
+        doc = getattr(ref, "document", None)
+        title = getattr(doc, "title", None) or "a related document"
+        snippet = getattr(ref, "content", "") or getattr(ref, "text", "")
+        snippet = snippet.replace("\n", " ").strip()
+        if not snippet:
+            continue
+        summaries.append(f'"{title}" — {snippet[:200]}')
+    if not summaries:
+        return None
+    instruction = reviewer.length_map.get(user.preferred_feedback_length, "1–2 short sentences")
+    if len(summaries) == 1:
+        body = summaries[0]
+    else:
+        body = "; ".join(summaries)
+    return f"[local-feedback] {instruction}: Consider the guidance from {body}"
+
+
 def _openai_feedback(
     reviewer: Reviewer,
     doc: Document,
@@ -107,56 +134,92 @@ def _openai_feedback(
         return None
     instruction = reviewer.length_map.get(user.preferred_feedback_length, "1–2 short sentences")
     ref_text = "\n\n".join(_reference_snippets(references, limit=3))
-    messages = [
-        {
-            "role": "system",
-            "content": (
-                "You are Compair, an assistant that delivers concise, actionable feedback on a user's document. "
-                "Focus on clarity, cohesion, and usefulness."
-            ),
-        },
-        {
-            "role": "user",
-            "content": (
-                f"Document:\n{text}\n\nHelpful reference excerpts:\n{ref_text or 'None provided'}\n\n"
-                f"Respond with {instruction} that highlights the most valuable revision to make next."
-            ),
-        },
-    ]
+    system_prompt = (
+        "You are Compair, an assistant that delivers concise, actionable feedback on a user's document. "
+        "Focus on clarity, cohesion, and usefulness."
+    )
+    user_prompt = (
+        f"Document:\n{text}\n\nHelpful reference excerpts:\n{ref_text or 'None provided'}\n\n"
+        f"Respond with {instruction} that highlights the most valuable revision to make next."
+    )
+
+    def _extract_response_text(response: Any) -> str | None:
+        if response is None:
+            return None
+        text_out = getattr(response, "output_text", None)
+        if isinstance(text_out, str) and text_out.strip():
+            return text_out.strip()
+        outputs = getattr(response, "output", None) or getattr(response, "outputs", None)
+        pieces: list[str] = []
+        if outputs:
+            for item in outputs:
+                content_field = None
+                if isinstance(item, dict):
+                    content_field = item.get("content")
+                else:
+                    content_field = getattr(item, "content", None)
+                if not content_field:
+                    continue
+                for part in content_field:
+                    if isinstance(part, dict):
+                        val = part.get("text") or part.get("output_text")
+                        if val:
+                            pieces.append(str(val))
+                    elif part:
+                        pieces.append(str(part))
+        if pieces:
+            merged = "\n".join(pieces).strip()
+            return merged or None
+        return None
 
     try:
-        if reviewer._openai_client is not None and hasattr(reviewer._openai_client, "responses"):
-            response = reviewer._openai_client.responses.create(  # type: ignore[union-attr]
+        client = reviewer._openai_client
+        if client is None and hasattr(openai, "OpenAI"):
+            api_key = os.getenv("COMPAIR_OPENAI_API_KEY") or None
+            try:  # pragma: no cover - optional dependency differences
+                client = openai.OpenAI(api_key=api_key) if api_key else openai.OpenAI()
+            except TypeError:
+                client = openai.OpenAI()
+            reviewer._openai_client = client
+
+        content: str | None = None
+        if client is not None and hasattr(client, "responses"):
+            response = client.responses.create(
                 model=reviewer.openai_model,
-                input=messages,
+                instructions=system_prompt,
+                input=user_prompt,
                 max_output_tokens=256,
+                store=False,
             )
-            content = getattr(response, "output_text", None)
-            if not content and hasattr(response, "outputs"):
-                # Legacy compatibility: join content parts
-                parts = []
-                for item in getattr(response, "outputs", []):
-                    parts.extend(getattr(item, "content", []))
-                content = " ".join(getattr(part, "text", "") for part in parts)
+            content = _extract_response_text(response)
+        elif client is not None and hasattr(client, "chat") and hasattr(client.chat, "completions"):
+            response = client.chat.completions.create(
+                model=reviewer.openai_model,
+                messages=[{"role": "system", "content": system_prompt}, {"role": "user", "content": user_prompt}],
+                temperature=0.3,
+                max_tokens=256,
+            )
+            choices = getattr(response, "choices", None) or []
+            if choices:
+                message = getattr(choices[0], "message", None)
+                if message is not None:
+                    content = getattr(message, "content", None)
+                if not content:
+                    content = getattr(choices[0], "text", None)
+                if isinstance(content, str):
+                    content = content.strip()
         elif hasattr(openai, "ChatCompletion"):
             chat_response = openai.ChatCompletion.create(  # type: ignore[attr-defined]
                 model=reviewer.openai_model,
-                messages=messages,
+                messages=[{"role": "system", "content": system_prompt}, {"role": "user", "content": user_prompt}],
                 temperature=0.3,
                 max_tokens=256,
             )
-            content = (
-                chat_response["choices"][0]["message"]["content"].strip()  # type: ignore[index, assignment]
-            )
-        else:
-            content = None
+            content = chat_response["choices"][0]["message"]["content"].strip()  # type: ignore[index, assignment]
+        if content:
+            return content.strip()
     except Exception as exc:  # pragma: no cover - network/API failure
         log_event("openai_feedback_failed", error=str(exc))
-        content = None
-    if content:
-        content = content.strip()
-        if content:
-            return content
     return None
 
 
@@ -238,9 +301,13 @@ def get_feedback(
         if feedback:
             return feedback
 
-    if reviewer.provider == "local" and getattr(reviewer, "endpoint", None):
-        feedback = _local_feedback(reviewer, text, references, user)
+    if reviewer.provider == "local":
+        feedback = _local_reference_feedback(reviewer, references, user)
         if feedback:
             return feedback
+        if getattr(reviewer, "endpoint", None):
+            feedback = _local_feedback(reviewer, text, references, user)
+            if feedback:
+                return feedback
 
     return _fallback_feedback(text, references)

{compair_core-0.4.0 → compair_core-0.4.1}/compair_core.egg-info/PKG-INFO

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

{compair_core-0.4.0 → compair_core-0.4.1}/pyproject.toml

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