Merge pull request #1159 from LucienShui/fix/profile_disable_telemetry_not_working

Fix/profile disable_telemetry not working

Author: KillianLucas

docs/telemetry/telemetry.mdx

@@ -12,11 +12,11 @@ If you prefer to opt out of telemetry, you can do this in two ways.
 
 ### Python
 
-Set `anonymized_telemetry` to `false` on the `interpreter` object:
+Set `disable_telemetry` to `true` on the `interpreter` object:
 
 ```python
 from interpreter import interpreter
-interpreter.anonymized_telemetry = False
+interpreter.disable_telemetry = True
 ```
 
 ### Terminal
@@ -29,20 +29,20 @@ interpreter --disable_telemetry
 
 ### Configuration File
 
-Set `anonymized_telemetry` to `false`. This will persist to future terminal sessions:
+Set `disable_telemetry` to `true`. This will persist to future terminal sessions:
 
 ```yaml
-anonymized_telemetry: false
+disable_telemetry: true
 ```
 
 ### Environment Variables
 
-Set `ANONYMIZED_TELEMETRY` to `False` in your shell or server environment.
+Set `DISABLE_TELEMETRY` to `true` in your shell or server environment.
 
 If you are running Open Interpreter on your local computer with `docker-compose` you can set this value in an `.env` file placed in the same directory as the `docker-compose.yml` file:
 
 ```
-ANONYMIZED_TELEMETRY=False
+DISABLE_TELEMETRY=true
 ```
 
 # What do you track?

interpreter/core/core.py

@@ -57,7 +57,7 @@ def __init__(
             "let me know what you'd like to do next.",
             "please provide more information.",
         ],
-        anonymous_telemetry=os.getenv("ANONYMIZED_TELEMETRY", "True") == "True",
+        disable_telemetry=os.getenv("DISABLE_TELEMETRY", "false").lower() == "true",
         in_terminal_interface=False,
         conversation_history=True,
         conversation_filename=None,
@@ -87,7 +87,7 @@ def __init__(
         self.max_output = max_output
         self.safe_mode = safe_mode
         self.shrink_images = shrink_images
-        self.anonymous_telemetry = anonymous_telemetry
+        self.disable_telemetry = disable_telemetry
         self.in_terminal_interface = in_terminal_interface
         self.multi_line = multi_line
 
@@ -132,10 +132,14 @@ def wait(self):
         # Return new messages
         return self.messages[self.last_messages_count :]
 
+    @property
+    def anonymous_telemetry(self) -> bool:
+        return not self.disable_telemetry and not self.offline
+
     def chat(self, message=None, display=True, stream=False, blocking=True):
         try:
             self.responding = True
-            if self.anonymous_telemetry and not self.offline:
+            if self.anonymous_telemetry:
                 message_type = type(
                     message
                 ).__name__  # Only send message type, no content
@@ -168,7 +172,7 @@ def chat(self, message=None, display=True, stream=False, blocking=True):
 
         except Exception as e:
             self.responding = False
-            if self.anonymous_telemetry and not self.offline:
+            if self.anonymous_telemetry:
                 message_type = type(message).__name__
                 send_telemetry(
                     "errored",

interpreter/core/utils/telemetry.py

@@ -1,7 +1,10 @@
 """
 Sends anonymous telemetry to posthog. This helps us know how people are using OI / what needs our focus.
 
-Disable this by running `interpreter --disable_telemetry` or `interpreter.anonymized_telemetry = False` or setting the `ANONYMIZED_TELEMETRY` os var to `false`.
+Disable anonymous telemetry by execute one of below:
+1. Running `interpreter --disable_telemetry` in command line.
+2. Executing `interpreter.disable_telemetry = True` in Python.
+3. Setting the `DISABLE_TELEMETRY` os var to `true`.
 
 based on ChromaDB's telemetry: https://github.com/chroma-core/chroma/tree/main/chromadb/telemetry/product
 """

interpreter/terminal_interface/start_terminal_interface.py

@@ -144,9 +144,8 @@ def start_terminal_interface(interpreter):
             "nickname": "dt",
             "help_text": "disables sending of basic anonymous usage stats",
             "type": bool,
-            "default": True,
-            "action": "store_false",
-            "attribute": {"object": interpreter, "attr_name": "anonymous_telemetry"},
+            "default": False,
+            "attribute": {"object": interpreter, "attr_name": "disable_telemetry"},
         },
         {
             "name": "offline",
@@ -260,7 +259,10 @@ def start_terminal_interface(interpreter):
     for arg in arguments:
         action = arg.get("action", "store_true")
         nickname = arg.get("nickname")
-        default = arg.get("default")
+
+        name_or_flags = [f'--{arg["name"]}']
+        if nickname:
+            name_or_flags.append(f"-{nickname}")
 
         # Construct argument name flags
         flags = (
@@ -306,7 +308,7 @@ def start_terminal_interface(interpreter):
         open_storage_dir("models")
         return
 
-    if args.reset_profile != "NOT_PROVIDED":
+    if args.reset_profile is not None and args.reset_profile != "NOT_PROVIDED":
         reset_profile(
             args.reset_profile
         )  # This will be None if they just ran `--reset_profile`
@@ -342,7 +344,7 @@ def start_terminal_interface(interpreter):
 
     ### Apply profile
 
-    interpreter = profile(interpreter, args.profile)
+    interpreter = profile(interpreter, args.profile or get_argument_dictionary(arguments, "profile")["default"])
 
     ### Set attributes on interpreter, because the arguments passed in via the CLI should override profile
 
@@ -417,9 +419,7 @@ def start_terminal_interface(interpreter):
 def set_attributes(args, arguments):
     for argument_name, argument_value in vars(args).items():
         if argument_value is not None:
-            argument_dictionary = [a for a in arguments if a["name"] == argument_name]
-            if len(argument_dictionary) > 0:
-                argument_dictionary = argument_dictionary[0]
+            if argument_dictionary := get_argument_dictionary(arguments, argument_name):
                 if "attribute" in argument_dictionary:
                     attr_dict = argument_dictionary["attribute"]
                     setattr(attr_dict["object"], attr_dict["attr_name"], argument_value)
@@ -430,6 +430,12 @@ def set_attributes(args, arguments):
                         )
 
 
+def get_argument_dictionary(arguments: list[dict], key: str) -> dict:
+    if len(argument_dictionary_list := list(filter(lambda x: x["name"] == key, arguments))) > 0:
+        return argument_dictionary_list[0]
+    return {}
+
+
 def main():
     interpreter = OpenInterpreter(import_computer_api=True)
     try: