cite-agent 1.0.3__py3-none-any.whl → 1.0.4__py3-none-any.whl

cite_agent/__init__.py

@@ -7,7 +7,7 @@ prior stacks preserved only in Git history, kept out of the runtime footprint.
 
 from .enhanced_ai_agent import EnhancedNocturnalAgent, ChatRequest, ChatResponse
 
-__version__ = "1.0.3"
+__version__ = "1.0.4"
 __author__ = "Nocturnal Archive Team"
 __email__ = "contact@nocturnal.dev"
 

cite_agent/account_client.py

@@ -63,14 +63,28 @@ class AccountClient:
         )
         self.timeout = timeout
 
-    def provision(self, email: str, password: str) -> AccountCredentials:
+    def provision(self, email: str, password: str, is_new_user: bool = False) -> AccountCredentials:
+        """
+        Provision account credentials (login or register).
+
+        Args:
+            email: User email address
+            password: User password
+            is_new_user: True for registration, False for login
+
+        Returns:
+            AccountCredentials object
+
+        Raises:
+            AccountProvisioningError: If authentication fails
+        """
         if self.base_url:
-            payload = self._request_credentials(email, password)
+            payload = self._request_credentials(email, password, is_new_user=is_new_user)
             return AccountCredentials.from_payload(email=email, payload=payload)
         return self._generate_offline_credentials(email, password)
 
     # -- internal helpers -------------------------------------------------
-    def _request_credentials(self, email: str, password: str) -> Dict[str, Any]:
+    def _request_credentials(self, email: str, password: str, is_new_user: bool = False) -> Dict[str, Any]:
         try:  # pragma: no cover - requires network
             import requests  # type: ignore
         except Exception as exc:  # pragma: no cover - executed when requests missing
@@ -78,29 +92,42 @@ class AccountClient:
                 "The 'requests' package is required for control-plane authentication"
             ) from exc
 
-        # Try login first
-        login_endpoint = self.base_url.rstrip("/") + "/api/auth/login"
+        # Choose endpoint based on is_new_user flag
+        if is_new_user:
+            endpoint = self.base_url.rstrip("/") + "/api/auth/register"
+            operation = "registration"
+        else:
+            endpoint = self.base_url.rstrip("/") + "/api/auth/login"
+            operation = "login"
+
         body = {"email": email, "password": password}
 
         try:
-            response = requests.post(login_endpoint, json=body, timeout=self.timeout)
+            response = requests.post(endpoint, json=body, timeout=self.timeout)
         except Exception as exc:  # pragma: no cover - network failure
-            raise AccountProvisioningError("Failed to reach control plane") from exc
+            raise AccountProvisioningError(f"Failed to reach control plane for {operation}") from exc
 
-        # If login fails with 401 (user doesn't exist), try registration
-        if response.status_code == 401:
-            register_endpoint = self.base_url.rstrip("/") + "/api/auth/register"
-            try:
-                response = requests.post(register_endpoint, json=body, timeout=self.timeout)
-            except Exception as exc:
-                raise AccountProvisioningError("Failed to register account") from exc
-
-        # If still failing, raise error
+        # Handle errors
         if response.status_code >= 400:
             detail = self._extract_error_detail(response)
-            raise AccountProvisioningError(
-                f"Authentication failed (status {response.status_code}): {detail}"
-            )
+
+            # Provide helpful error messages
+            if response.status_code == 401 and not is_new_user:
+                raise AccountProvisioningError(
+                    f"Login failed: Invalid email or password. If you're a new user, please register first."
+                )
+            elif response.status_code == 409:
+                raise AccountProvisioningError(
+                    f"Registration failed: This email is already registered. Please log in instead."
+                )
+            elif response.status_code == 400 and "academic" in detail.lower():
+                raise AccountProvisioningError(
+                    f"Registration requires an academic email address (.edu, .ac.uk, etc.)"
+                )
+            else:
+                raise AccountProvisioningError(
+                    f"{operation.capitalize()} failed (status {response.status_code}): {detail}"
+                )
 
         try:
             payload = response.json()

cite_agent/cli.py

@@ -442,7 +442,7 @@ Examples:
     
     # Handle version
     if args.version:
-        print("Cite-Agent v1.0.3")
+        print("Cite-Agent v1.0.4")
         print("AI Research Assistant - Backend-Only Distribution")
         return
 

cite_agent/setup_config.py

@@ -63,6 +63,18 @@ class NocturnalConfig:
         print("You'll use your institution-issued account to sign in. No invite codes or manual API keys required.")
         print()
 
+        # Ask if new user or returning user
+        print("Are you a new user or returning user?")
+        print("  1. New user (register)")
+        print("  2. Returning user (login)")
+        choice = input("Enter choice (1 or 2): ").strip()
+
+        is_new_user = choice == "1"
+        action = "Registration" if is_new_user else "Login"
+
+        print(f"\n{action}")
+        print("-" * 40)
+
         email = self._prompt_academic_email()
         if not email:
             return False
@@ -71,14 +83,18 @@ class NocturnalConfig:
         if not password:
             return False
 
-        if not self._confirm_beta_terms():
+        if is_new_user and not self._confirm_beta_terms():
             print("❌ Terms must be accepted to continue")
             return False
 
         try:
-            credentials = self._provision_account(email, password)
+            credentials = self._provision_account(email, password, is_new_user=is_new_user)
+            if is_new_user:
+                print(f"\n✅ Account created successfully for {email}")
+            else:
+                print(f"\n✅ Logged in successfully as {email}")
         except AccountProvisioningError as exc:
-            print(f"❌ Could not verify your account: {exc}")
+            print(f"❌ {action} failed: {exc}")
             return False
 
         print("\n🛡️  Recap of beta limitations:")
@@ -163,9 +179,9 @@ class NocturnalConfig:
         print("❌ Could not confirm password after multiple attempts")
         return None
 
-    def _provision_account(self, email: str, password: str) -> AccountCredentials:
+    def _provision_account(self, email: str, password: str, is_new_user: bool = False) -> AccountCredentials:
         client = AccountClient()
-        return client.provision(email=email, password=password)
+        return client.provision(email=email, password=password, is_new_user=is_new_user)
 
     def _is_academic_email(self, email: str) -> bool:
         if "@" not in email:

{cite_agent-1.0.3.dist-info → cite_agent-1.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cite-agent
-Version: 1.0.3
+Version: 1.0.4
 Summary: AI Research Assistant - Backend-Only Distribution
 Home-page: https://github.com/Spectating101/cite-agent
 Author: Cite-Agent Team

{cite_agent-1.0.3.dist-info → cite_agent-1.0.4.dist-info}/RECORD

@@ -1,23 +1,23 @@
 cite_agent/__distribution__.py,sha256=U7-p-qBMX7WrQD6WWjRC5b-PswXnlrqAox7EYnLogqI,178
-cite_agent/__init__.py,sha256=bIPMfQXuaDOCAZE9pWvqpRbuBlgOvfh9uLQ3pakBMOY,1643
-cite_agent/account_client.py,sha256=yLuzhIJoIZuXHXGbaVMzDxRATQwcy-wiaLnUrDuwUhI,5725
+cite_agent/__init__.py,sha256=n12qGnmZ0th2OJTn5kBK-kzIEn_1EZgZ1qujT4-ZMeU,1643
+cite_agent/account_client.py,sha256=kvILYFKGm6ktCdi7iKSP5dkOp7iOAcBEQ7giHOh711w,6723
 cite_agent/agent_backend_only.py,sha256=Rmi3cUCcTMSHRxZu6MK2rZwme5SCfilxqn0BsoIds_U,5375
 cite_agent/ascii_plotting.py,sha256=lk8BaECs6fmjtp4iH12G09-frlRehAN7HLhHt2crers,8570
 cite_agent/auth.py,sha256=CYBNv8r1_wfdhsx-YcWOiXCiKvPBymaMca6w7JV__FQ,9809
 cite_agent/backend_only_client.py,sha256=WqLF8x7aXTro2Q3ehqKMsdCg53s6fNk9Hy86bGxqmmw,2561
-cite_agent/cli.py,sha256=NYg-gCdV8M6WhUN9Y6TawsjdITfo_7WPOa6ZIknN4dc,18564
+cite_agent/cli.py,sha256=T2zSv2ET3IKh1_ENfFIkW292KWC1lt-yUSdYn51Urw4,18564
 cite_agent/cli_enhanced.py,sha256=EAaSw9qtiYRWUXF6_05T19GCXlz9cCSz6n41ASnXIPc,7407
 cite_agent/dashboard.py,sha256=VGV5XQU1PnqvTsxfKMcue3j2ri_nvm9Be6O5aVays_w,10502
 cite_agent/enhanced_ai_agent.py,sha256=Rmi3cUCcTMSHRxZu6MK2rZwme5SCfilxqn0BsoIds_U,5375
 cite_agent/rate_limiter.py,sha256=-0fXx8Tl4zVB4O28n9ojU2weRo-FBF1cJo9Z5jC2LxQ,10908
-cite_agent/setup_config.py,sha256=kNZNr5cZmCXr43rGWNenNJXZ1Kfz7PrdLXpAqxM7WgM,16404
+cite_agent/setup_config.py,sha256=fUVBxJ0CK7e5cGG4jBDpHbB2seC1RqEteneq-WslAw8,17064
 cite_agent/telemetry.py,sha256=55kXdHvI24ZsEkbFtihcjIfJt2oiSXcEpLzTxQ3KCdQ,2916
 cite_agent/ui.py,sha256=r1OAeY3NSeqhAjJYmEBH9CaennBuibFAz1Mur6YF80E,6134
 cite_agent/updater.py,sha256=kL2GYL1AKoZ9JoTXxFT5_AkvYvObcCrO2sIVyBw9JgU,7057
 cite_agent/web_search.py,sha256=j-BRhT8EBC6BEPgACQPeVwB1SVGKDz4XLM7sowacvSc,6587
-cite_agent-1.0.3.dist-info/licenses/LICENSE,sha256=XJkyO4IymhSUniN1ENY6lLrL2729gn_rbRlFK6_Hi9M,1074
-cite_agent-1.0.3.dist-info/METADATA,sha256=Ajj8pUFoOsTBQuNMRB6dELRoGhFi90CYbPSq1wQuO0I,6856
-cite_agent-1.0.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cite_agent-1.0.3.dist-info/entry_points.txt,sha256=bJ0u28nFIxQKH1PWQ2ak4PV-FAjhoxTC7YADEdDenFw,83
-cite_agent-1.0.3.dist-info/top_level.txt,sha256=NNfD8pxDZzBK8tjDIpCs2BW9Va-OQ5qUFbEx0SgmyIE,11
-cite_agent-1.0.3.dist-info/RECORD,,
+cite_agent-1.0.4.dist-info/licenses/LICENSE,sha256=XJkyO4IymhSUniN1ENY6lLrL2729gn_rbRlFK6_Hi9M,1074
+cite_agent-1.0.4.dist-info/METADATA,sha256=QklMsGqAD-NCLM1S4LHzCUSaeH58ld-IXG06NO24Bsw,6856
+cite_agent-1.0.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cite_agent-1.0.4.dist-info/entry_points.txt,sha256=bJ0u28nFIxQKH1PWQ2ak4PV-FAjhoxTC7YADEdDenFw,83
+cite_agent-1.0.4.dist-info/top_level.txt,sha256=NNfD8pxDZzBK8tjDIpCs2BW9Va-OQ5qUFbEx0SgmyIE,11
+cite_agent-1.0.4.dist-info/RECORD,,