vss-cli 2025.8.0.dev1__tar.gz → 2025.9.0.dev2__tar.gz

{vss_cli-2025.8.0.dev1/vss_cli.egg-info → vss_cli-2025.9.0.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vss-cli
-Version: 2025.8.0.dev1
+Version: 2025.9.0.dev2
 Summary: ITS Private Cloud CLI
 Author-email: University of Toronto <vss-apps@eis.utoronto.ca>
 Maintainer-email: vss-py@eis.utoronto.ca

{vss_cli-2025.8.0.dev1 → vss_cli-2025.9.0.dev2}/vss_cli/config.py

@@ -1736,8 +1736,42 @@ class Configuration(VssManager):
         else:
             os.system('clear')
 
-    @staticmethod
+    def _get_client_ip(self) -> str:
+        """Get the client's IP address."""
+        import socket
+
+        try:
+            # Try to get the IP by connecting to a public DNS server
+            s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+            s.settimeout(1)
+            # Connect to Google's public DNS
+            s.connect(('8.8.8.8', 80))
+            ip = s.getsockname()[0]
+            s.close()
+            return ip
+        except Exception:
+            # Fallback to localhost if unable to determine
+            return '127.0.0.1'
+
+    def _generate_assistant_api_key(self) -> str:
+        """Generate a new API key for the assistant."""
+        ip_address = self._get_client_ip()
+        client_name = f'{self.user_agent}/{ip_address}'
+
+        auth_endpoint = f'{self.gpt_server}/api/generate-key'
+        payload = {'client_name': client_name}
+
+        with requests.post(auth_endpoint, json=payload) as response:
+            if response.status_code not in [200, 201]:
+                raise VssCliError(
+                    f'Failed to generate API key. '
+                    f'Status: {response.status_code}'
+                )
+            data = response.json()
+            return data.get('api_key')
+
     def get_new_chat_id(
+        self,
         chat_endpoint: str,
         persona_id: int,
         description: str,
@@ -1751,7 +1785,7 @@ class Configuration(VssManager):
             if response.status_code in [401, 403, 500, 502, 503, 504]:
                 raise VssCliError(
                     'Invalid response from the API. '
-                    'Have you provided VSS_GPT_TOKEN?'
+                    'Failed to create chat session.'
                 )
             rv = response.json()
             chat_id = rv['chat_session_id']
@@ -1762,25 +1796,16 @@ class Configuration(VssManager):
         message: str,
         spinner_cls: Optional[Spinner] = None,
         final_message: str = None,
-    ):
+    ) -> Tuple[str, str]:
         """Ask assistant."""
+        # Generate a new API key for this session
+        api_key = self._generate_assistant_api_key()
+
         headers = {
-            'Authorization': self.gpt_token,
+            'api-key': f'{api_key}',
             'Connection': 'keep-alive',
             'Content-Type': 'application/json',
         }
-        retrieval_options = {
-            "run_search": "auto",
-            "real_time": True,
-            "limit": 5,
-            "filters": {
-                "source_type": None,
-                "document_set": None,
-                "time_cutoff": None,
-                "tags": [],
-                "user_file_ids": None,
-            },
-        }
         top_documents = []
         chat_id = self.get_new_chat_id(
             chat_endpoint=f'{self.gpt_server}/api/chat/create-chat-session',
@@ -1790,17 +1815,9 @@ class Configuration(VssManager):
         )
         # chat payload
         payload = {
-            "alternate_assistant_id": 2,
             "chat_session_id": chat_id,
-            "prompt_id": self._gpt_persona,
-            "parent_message_id": None,
-            "regenerate": False,
-            "full_doc": False,
-            "search_doc_ids": [],
             "message": message,
-            "file_descriptors": [],
-            "retrieval_options": retrieval_options,
-            "use_agentic_search": False,
+            "parent_message_id": None,
         }
         _LOGGING.debug(f'User data payload {payload}')
         answer_text = ''
@@ -1812,27 +1829,117 @@ class Configuration(VssManager):
         ) as response:
             if spinner_cls is not None:
                 spinner_cls.stop()
+            reasoning_text = ''
+            message_content = ''
+            internal_search_queries = []
+            internal_search_docs = []
+            final_documents = []
+            citations = []
+            assistant_message_id = None
+
             for line in response.iter_lines():
+                _LOGGING.debug(f"{line=}")
                 if line:
                     data = json.loads(line)
-                    if 'top_documents' in data:
+
+                    # Handle initial message IDs
+                    if (
+                        'user_message_id' in data
+                        and 'reserved_assistant_message_id' in data
+                    ):
+                        assistant_message_id = data[
+                            'reserved_assistant_message_id'
+                        ]
+                        _LOGGING.debug(
+                            f"Message IDs - User: {data['user_message_id']},"
+                            f" Assistant: {assistant_message_id}"
+                        )
+                        continue
+
+                    # Handle indexed objects
+                    if 'ind' in data and 'obj' in data:
+                        obj = data['obj']
+                        obj_type = obj.get('type')
+
+                        # Handle reasoning streaming
+                        if obj_type == 'reasoning_start':
+                            _LOGGING.debug("Reasoning started")
+                        elif obj_type == 'reasoning_delta':
+                            reasoning_chunk = obj.get('reasoning', '')
+                            reasoning_text += reasoning_chunk
+                            # Optionally display reasoning to user
+                            # (you might want to hide this)
+                            self.smooth_print(reasoning_chunk)
+
+                        # Handle message content streaming
+                        elif obj_type == 'message_start':
+                            if 'final_documents' in obj:
+                                final_documents = obj['final_documents']
+                            _LOGGING.debug("Message started")
+                        elif obj_type == 'message_delta':
+                            content_chunk = obj.get('content', '')
+                            message_content += content_chunk
+                            answer_text += content_chunk
+                            self.smooth_print(content_chunk)
+
+                        # Handle internal search tool
+                        elif obj_type == 'internal_search_tool_start':
+                            _LOGGING.debug(
+                                f"Internal search started - Internet: "
+                                f"{obj.get('is_internet_search', False)}"
+                            )
+                        elif obj_type == 'internal_search_tool_delta':
+                            if 'queries' in obj and obj['queries']:
+                                internal_search_queries.extend(obj['queries'])
+                            if 'documents' in obj and obj['documents']:
+                                internal_search_docs.extend(obj['documents'])
+                                # Update top_documents for backward
+                                # compatibility
+                                top_documents = obj['documents']
+
+                        # Handle citations
+                        elif obj_type == 'citation_start':
+                            _LOGGING.debug("Citations started")
+                        elif obj_type == 'citation_delta':
+                            if 'citations' in obj:
+                                citations.extend(obj['citations'])
+
+                        # Handle section end and stop
+                        elif obj_type == 'section_end':
+                            _LOGGING.debug(
+                                f"Section ended for index {data['ind']}"
+                            )
+                        elif obj_type == 'stop':
+                            _LOGGING.debug(
+                                f"Stream stopped for index {data['ind']}"
+                            )
+
+                    # Handle legacy format (backward compatibility)
+                    elif 'top_documents' in data:
                         top_documents = data['top_documents']
-                    answer_piece = data.get('answer_piece')
-                    if answer_piece is not None:
-                        answer_text = answer_text + answer_piece
-                        self.smooth_print(answer_piece)
+                    elif 'answer_piece' in data:
+                        answer_piece = data['answer_piece']
+                        if answer_piece is not None:
+                            answer_text = answer_text + answer_piece
+                            self.smooth_print(answer_piece)
+        # Use final_documents if available, otherwise fall
+        # back to top_documents
+        docs_to_display = final_documents if final_documents else top_documents
+
         docs = []
         n = 1
-        for doc in top_documents:
-            docs.append(
-                f'[{n}] [{doc["semantic_identifier"]}]({doc["document_id"]})'
-            )
+        for doc in docs_to_display:
+            # Handle both document_id and link fields
+            doc_url = doc.get("link") or doc.get("document_id", "")
+            doc_title = doc.get("semantic_identifier", "Unknown Document")
+            docs.append(f'[{n}] [{doc_title}]({doc_url})')
             n += 1
         # make docs
-        docs_text = '\n'.join(docs)
+        docs_text = '\n'.join(docs[:5])
         answer_text = answer_text + '\n\n' + docs_text
         # clear console for formatting
-        self.clear_console()
+        if not self.debug:
+            self.clear_console()
         from rich.console import Console
         from rich.markdown import Markdown
 
@@ -1841,3 +1948,65 @@ class Configuration(VssManager):
         console.print(markdown)
         console.print()
         console.print(Markdown(f'**Note: {final_message}**'))
+
+        # Return the assistant message ID and API key
+        # for potential feedback
+        return assistant_message_id, api_key
+
+    def provide_assistant_feedback(
+        self,
+        chat_message_id: str,
+        api_key: str,
+        is_positive: bool,
+        feedback_text: Optional[str] = None,
+    ) -> bool:
+        """Provide feedback for an assistant response.
+
+        Args:
+            chat_message_id: The ID of the assistant message
+            to provide feedback for
+            api_key: The API key generated for this session
+            is_positive: True for thumbs up, False for thumbs down
+            feedback_text: Optional feedback text (defaults to
+            'Helpful' or 'Not helpful')
+
+        Returns:
+            bool: True if feedback was submitted successfully, False otherwise
+        """
+        if feedback_text is None:
+            feedback_text = 'Helpful' if is_positive else 'Not helpful'
+
+        headers = {
+            'api-key': f'{api_key}',
+            'Content-Type': 'application/json',
+        }
+
+        payload = {
+            "chat_message_id": chat_message_id,
+            "is_positive": is_positive,
+            "feedback_text": feedback_text,
+            "predefined_feedback": None,
+        }
+
+        feedback_endpoint = f'{self.gpt_server}/api/chat/create-chat-feedback'
+
+        try:
+            with requests.post(
+                feedback_endpoint, headers=headers, json=payload
+            ) as response:
+                if response.status_code in [200, 201]:
+                    _LOGGING.debug(
+                        f'Feedback submitted successfully '
+                        f'for message {chat_message_id}'
+                    )
+                    return True
+                else:
+                    _LOGGING.warning(
+                        f'Failed to submit feedback. '
+                        f'Status: {response.status_code}, '
+                        f'Response: {response.text}'
+                    )
+                    return False
+        except Exception as e:
+            _LOGGING.error(f'Error submitting feedback: {e}')
+            return False

{vss_cli-2025.8.0.dev1 → vss_cli-2025.9.0.dev2}/vss_cli/const.py

@@ -8,7 +8,7 @@ except ImportError:
 
 PACKAGE_NAME = "vss_cli"
 
-__version__ = "2025.8.0-dev1"
+__version__ = "2025.9.0-dev2"
 
 
 DEFAULT_TIMEOUT = 30
@@ -16,7 +16,7 @@ DEFAULT_ENDPOINT = "https://cloud-api.eis.utoronto.ca"
 DEFAULT_ENDPOINT_NAME = "cloud-api"
 DEFAULT_S3_SERVER = "https://vskey-stor.eis.utoronto.ca"
 DEFAULT_VPN_SERVER = "https://vskey-vn.eis.utoronto.ca"
-DEFAULT_GPT_SERVER = "https://gpt.eis.utoronto.ca"
+DEFAULT_GPT_SERVER = "https://gpt-wpy.eis.utoronto.ca"
 DEFAULT_GPT_PERSONA = 2
 DEFAULT_GPT_TOKEN = ''
 _LEGACY_CONFIG = ("~", ".vss-cli", "config.json")

{vss_cli-2025.8.0.dev1 → vss_cli-2025.9.0.dev2}/vss_cli/data/clib.yaml

@@ -1,5 +1,5 @@
 ####################################################
-#     VSS-CLI Spec from CLib 2025.8.0-dev1             #
+#     VSS-CLI Spec from CLib 2025.9.0-dev2             #
 ####################################################
 built: clib               # Required: Do not remove.
 machine:

{vss_cli-2025.8.0.dev1 → vss_cli-2025.9.0.dev2}/vss_cli/data/clone.yaml

@@ -1,5 +1,5 @@
 ####################################################
-#     VSS-CLI Spec from Clone 2025.8.0-dev1             #
+#     VSS-CLI Spec from Clone 2025.9.0-dev2             #
 ####################################################
 built: clone              # Required: Do not remove.
 machine:

{vss_cli-2025.8.0.dev1 → vss_cli-2025.9.0.dev2}/vss_cli/data/shell.yaml

@@ -1,5 +1,5 @@
 ####################################################
-#     VSS-CLI Spec shell VM 2025.8.0-dev1             #
+#     VSS-CLI Spec shell VM 2025.9.0-dev2             #
 ####################################################
 built: os_install         # Required: Do not remove.
 machine:

{vss_cli-2025.8.0.dev1 → vss_cli-2025.9.0.dev2}/vss_cli/data/template.yaml

@@ -1,5 +1,5 @@
 ####################################################
-#     VSS-CLI Spec from Template 2025.8.0-dev1        #
+#     VSS-CLI Spec from Template 2025.9.0-dev2        #
 ####################################################
 built: template           # Required: Do not remove.
 machine:

vss_cli-2025.9.0.dev2/vss_cli/plugins/assist.py

@@ -0,0 +1,156 @@
+"""AI assistant."""
+import logging
+import random
+import sys
+
+import click
+
+from vss_cli.cli import pass_context
+from vss_cli.config import Configuration
+from vss_cli.utils.emoji import EMOJI_UNICODE
+
+_LOGGING = logging.getLogger(__name__)
+
+ej_ai = EMOJI_UNICODE.get(':robot_face:')
+ej_rk = EMOJI_UNICODE.get(':rocket:')
+ej_thumbs_up = EMOJI_UNICODE.get(':thumbs_up:')
+ej_thumbs_down = EMOJI_UNICODE.get(':thumbs_down:')
+ej_checkmark = EMOJI_UNICODE.get(':white_heavy_check_mark:')
+ej_star = EMOJI_UNICODE.get(':star:')
+
+we_msg = f"""Hi, I’m UTORcloudy {ej_ai}, the ITS Private Cloud virtual agent.
+I can help with account, virtual machine management, billing questions
+and more. {ej_rk}
+"""
+
+suggestions = [
+    "How to deploy an Ubuntu virtual machine?",
+    "How do I get started?",
+    "What are the VSS Guidelines?",
+    "How can I reset my account password?",
+    "How to enable Ubuntu Pro on your VM?",
+    "How to activate Windows Server in the ITS Private Cloud?",
+    "Do you provide public IP addresses?",
+    "How Can I change CPU, Memory,Network, HDD specs after a VM is created?",
+    "How to request an SSL certificate?",
+    "What additional services are included in my ITS Private Cloud bill?",
+    "What factors determine the cost of my ITS Private Cloud usage?",
+    'How can I install sentinelOne on my VM?',
+]
+
+final_msg = """
+Responses are generated by artificial intelligence and may contain errors.
+Always check sources and refer to actual policies for reliable information."""
+
+
+@click.command('assist', short_help='VSS AI Assistant')
+@click.option(
+    '--no-load', is_flag=True, default=False, help='do not load config'
+)
+@click.option(
+    '--no-feedback', is_flag=True, default=False, help='skip feedback prompt'
+)
+@click.argument(
+    "message",
+    required=False,
+)
+@pass_context
+def cli(ctx: Configuration, no_load: bool, no_feedback: bool, message: str):
+    """Manage your VSS account."""
+    with ctx.spinner(disable=ctx.debug) as spinner_cls:
+        if no_load:
+            ctx.set_defaults()
+        else:
+            ctx.load_config(spinner_cls=spinner_cls)
+            _LOGGING.debug(
+                f'GPT settings: {ctx.gpt_persona=}, '
+                f'{ctx.gpt_token=}, {ctx.gpt_server}'
+            )
+        if not message:
+            spinner_cls.stop()
+            ctx.secho(we_msg)
+            default = random.choice(suggestions)
+            message = click.prompt(
+                "How may I assist you?",
+                type=str,
+                prompt_suffix=" ",
+                show_default=True,
+                default=f"{default}",
+            )
+            ctx.echo("")
+            spinner_cls.start()
+        # ask assistant
+        assistant_message_id, api_key = ctx.ask_assistant(
+            spinner_cls=spinner_cls, message=message, final_message=final_msg
+        )
+        # Only ask for feedback if enabled and we have a valid message ID
+        if not no_feedback and assistant_message_id and api_key:
+            # Compact feedback prompt
+            # Single line feedback options
+            ctx.echo("")
+            ctx.secho("Rate this response: ", fg='cyan', nl=False, bold=True)
+            ctx.secho(f"{ej_thumbs_up} Helpful (y) ", fg='green', nl=False)
+            ctx.secho(
+                f"{ej_thumbs_down} Not helpful (n) ", fg='yellow', nl=False
+            )
+            ctx.secho("Skip (s)", fg='bright_black')
+
+            # Get user input with compact prompt
+            feedback_choice = click.prompt(
+                "",
+                type=click.Choice(['y', 'n', 's'], case_sensitive=False),
+                default='s',
+                show_choices=False,
+                show_default=False,
+                prompt_suffix="Choice: ",
+            )
+
+            # Process feedback based on choice
+            if feedback_choice.lower() == 'y':
+                success = ctx.provide_assistant_feedback(
+                    chat_message_id=assistant_message_id,
+                    is_positive=True,
+                    api_key=api_key,
+                )
+                if success:
+                    ctx.secho(
+                        f"{ej_checkmark} Thanks for your feedback!", fg='green'
+                    )
+                else:
+                    _LOGGING.debug("Failed to submit positive feedback")
+
+            elif feedback_choice.lower() == 'n':
+                # Compact negative feedback prompt
+                additional_feedback = click.prompt(
+                    "Details (optional)",
+                    default="",
+                    show_default=False,
+                    prompt_suffix=": ",
+                )
+
+                feedback_text = (
+                    additional_feedback
+                    if additional_feedback
+                    else "Not helpful"
+                )
+                success = ctx.provide_assistant_feedback(
+                    chat_message_id=assistant_message_id,
+                    is_positive=False,
+                    api_key=api_key,
+                    feedback_text=feedback_text,
+                )
+                if success:
+                    ctx.secho(
+                        f"{ej_checkmark} Thanks! We'll improve.", fg='cyan'
+                    )
+                else:
+                    _LOGGING.debug("Failed to submit negative feedback")
+
+            else:
+                ctx.secho("Skipped.", fg='bright_black')
+        else:
+            _LOGGING.debug(
+                f"Cannot provide feedback: "
+                f"assistant_message_id={assistant_message_id}, "
+                f"api_key={'present' if api_key else 'missing'}"
+            )

{vss_cli-2025.8.0.dev1 → vss_cli-2025.9.0.dev2/vss_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vss-cli
-Version: 2025.8.0.dev1
+Version: 2025.9.0.dev2
 Summary: ITS Private Cloud CLI
 Author-email: University of Toronto <vss-apps@eis.utoronto.ca>
 Maintainer-email: vss-py@eis.utoronto.ca

{vss_cli-2025.8.0.dev1 → vss_cli-2025.9.0.dev2}/vss_cli.egg-info/top_level.txt

@@ -1,4 +1,5 @@
 HomebrewFormula
+_docs
 artwork
 dist
 docker

vss_cli-2025.8.0.dev1/vss_cli/plugins/assist.py

@@ -1,76 +0,0 @@
-"""AI assistant."""
-import logging
-import random
-
-import click
-
-from vss_cli.cli import pass_context
-from vss_cli.config import Configuration
-from vss_cli.utils.emoji import EMOJI_UNICODE
-
-_LOGGING = logging.getLogger(__name__)
-
-ej_ai = EMOJI_UNICODE.get(':robot_face:')
-ej_rk = EMOJI_UNICODE.get(':rocket:')
-
-we_msg = f"""Hi, I’m UTORcloudy {ej_ai}, the ITS Private Cloud virtual agent.
-I can help with account, virtual machine management, billing questions
-and more. {ej_rk}
-"""
-
-suggestions = [
-    "How to deploy an Ubuntu virtual machine?",
-    "How do I get started?",
-    "What are the VSS Guidelines?",
-    "How can I reset my account password?",
-    "How to enable Ubuntu Pro on your VM?",
-    "How to activate Windows Server in the ITS Private Cloud?",
-    "Do you provide public IP addresses?",
-    "How Can I change CPU, Memory,Network, HDD specs after a VM is created?",
-    "How to request an SSL certificate?",
-    "What additional services are included in my ITS Private Cloud bill?",
-    "What factors determine the cost of my ITS Private Cloud usage?",
-    'How can I install sentinelOne on my VM?',
-]
-
-final_msg = """
-Responses are generated by artificial intelligence and may contain errors.
-Always check sources and refer to actual policies for reliable information."""
-
-
-@click.command('assist', short_help='VSS AI Assistant')
-@click.option(
-    '--no-load', is_flag=True, default=False, help='do not load config'
-)
-@click.argument(
-    "message",
-    required=False,
-)
-@pass_context
-def cli(ctx: Configuration, no_load: bool, message: str):
-    """Manage your VSS account."""
-    with ctx.spinner(disable=ctx.debug) as spinner_cls:
-        if no_load:
-            ctx.set_defaults()
-        else:
-            ctx.load_config(spinner_cls=spinner_cls)
-            _LOGGING.debug(
-                f'GPT settings: {ctx.gpt_persona=}, '
-                f'{ctx.gpt_token=}, {ctx.gpt_server}'
-            )
-        if not message:
-            spinner_cls.stop()
-            ctx.secho(we_msg)
-            default = random.choice(suggestions)
-            message = click.prompt(
-                "How may I assist you?",
-                type=str,
-                prompt_suffix=" ",
-                show_default=True,
-                default=f"{default}",
-            )
-            ctx.echo("")
-            spinner_cls.start()
-        ctx.ask_assistant(
-            spinner_cls=spinner_cls, message=message, final_message=final_msg
-        )