From d2435c2e00abef0654771e004985ace4a1810eb2 Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Tue, 13 Aug 2024 10:02:54 -0700 Subject: [PATCH] copy --- aider/args.py | 6 ++-- aider/website/assets/sample-analytics.jsonl | 31 +++++++++++++++++++++ aider/website/assets/sample.aider.conf.yml | 8 +++--- aider/website/assets/sample.env | 8 +++--- aider/website/docs/config/aider_conf.md | 8 +++--- aider/website/docs/config/dotenv.md | 8 +++--- aider/website/docs/config/options.md | 6 ++-- aider/website/docs/more/analytics.md | 8 ++++-- 8 files changed, 58 insertions(+), 25 deletions(-) diff --git a/aider/args.py b/aider/args.py index a04e020e7..b70fa04c8 100644 --- a/aider/args.py +++ b/aider/args.py @@ -436,12 +436,12 @@ def get_parser(default_config_files, git_root): ) ########## - group = parser.add_argument_group("Analytics Settings") + group = parser.add_argument_group("Analytics") group.add_argument( "--analytics", action=argparse.BooleanOptionalAction, default=False, - help="Enable/disable analytics tracking (default: True)", + help="Enable/disable analytics for one session (default: False)", ) group.add_argument( "--analytics-log", @@ -451,7 +451,7 @@ def get_parser(default_config_files, git_root): group.add_argument( "--analytics-disable", action="store_true", - help="Disable analytics tracking and mark as disabled in mixpanel.json", + help="Disable analytics forever", default=False, ) diff --git a/aider/website/assets/sample-analytics.jsonl b/aider/website/assets/sample-analytics.jsonl index 4bfea9119..270b7e749 100644 --- a/aider/website/assets/sample-analytics.jsonl +++ b/aider/website/assets/sample-analytics.jsonl @@ -10,3 +10,34 @@ {"event": "message_send", "properties": {"main_model": "claude-3-5-sonnet-20240620", "prompt_tokens": 15025, "completion_tokens": 462, "total_tokens": 15487, "cost": 0.052005, "total_cost": 0.052005, "python_version": "3.12.4", "os_platform": "Darwin", "os_release": "23.6.0", "machine": "x86_64", "aider_version": "0.49.2-dev"}, "user_id": "52b5cc12-f16d-45f3-b30c-95ab4ae904ee", "time": 1723560308} {"event": "message_send", "properties": {"main_model": "claude-3-5-sonnet-20240620", "prompt_tokens": 16242, "completion_tokens": 269, "total_tokens": 16511, "cost": 0.052761, "total_cost": 0.104766, "python_version": "3.12.4", "os_platform": "Darwin", "os_release": "23.6.0", "machine": "x86_64", "aider_version": "0.49.2-dev"}, "user_id": "52b5cc12-f16d-45f3-b30c-95ab4ae904ee", "time": 1723560334} {"event": "command_exit", "properties": {"python_version": "3.12.4", "os_platform": "Darwin", "os_release": "23.6.0", "machine": "x86_64", "aider_version": "0.49.2-dev"}, "user_id": "52b5cc12-f16d-45f3-b30c-95ab4ae904ee", "time": 1723560339} +{"event": "launched", "properties": {"python_version": "3.12.4", "os_platform": "Darwin", "os_release": "23.6.0", "machine": "x86_64", "aider_version": "0.49.2-dev"}, "user_id": "52b5cc12-f16d-45f3-b30c-95ab4ae904ee", "time": 1723560733} +{"event": "cli session", "properties": {"main_model": "gpt-4o-mini", "python_version": "3.12.4", "os_platform": "Darwin", "os_release": "23.6.0", "machine": "x86_64", "aider_version": "0.49.2-dev"}, "user_id": "52b5cc12-f16d-45f3-b30c-95ab4ae904ee", "time": 1723560733} +{"event": "message_send", "properties": {"main_model": "gpt-4o-mini", "prompt_tokens": 638, "completion_tokens": 25, "total_tokens": 663, "cost": 0.0001107, "total_cost": 0.0001107, "python_version": "3.12.4", "os_platform": "Darwin", "os_release": "23.6.0", "machine": "x86_64", "aider_version": "0.49.2-dev"}, "user_id": "52b5cc12-f16d-45f3-b30c-95ab4ae904ee", "time": 1723560737} +{"event": "command_exit", "properties": {"python_version": "3.12.4", "os_platform": "Darwin", "os_release": "23.6.0", "machine": "x86_64", "aider_version": "0.49.2-dev"}, "user_id": "52b5cc12-f16d-45f3-b30c-95ab4ae904ee", "time": 1723560765} +{"event": "launched", "properties": {"python_version": "3.12.4", "os_platform": "Darwin", "os_release": "23.6.0", "machine": "x86_64", "aider_version": "0.49.2-dev"}, "user_id": null, "time": 1723560805} +{"event": "cli session", "properties": {"main_model": "gpt-4o-mini", "python_version": "3.12.4", "os_platform": "Darwin", "os_release": "23.6.0", "machine": "x86_64", "aider_version": "0.49.2-dev"}, "user_id": null, "time": 1723560805} +{"event": "message_send", "properties": {"main_model": "gpt-4o-mini", "prompt_tokens": 638, "completion_tokens": 25, "total_tokens": 663, "cost": 0.0001107, "total_cost": 0.0001107, "python_version": "3.12.4", "os_platform": "Darwin", "os_release": "23.6.0", "machine": "x86_64", "aider_version": "0.49.2-dev"}, "user_id": null, "time": 1723560812} +{"event": "launched", "properties": {"python_version": "3.12.4", "os_platform": "Darwin", "os_release": "23.6.0", "machine": "x86_64", "aider_version": "0.49.2-dev"}, "user_id": "8f9e4550-33c4-4417-b152-e35ace897f13", "time": 1723560903} +{"event": "cli session", "properties": {"main_model": "gpt-4o-mini", "python_version": "3.12.4", "os_platform": "Darwin", "os_release": "23.6.0", "machine": "x86_64", "aider_version": "0.49.2-dev"}, "user_id": "8f9e4550-33c4-4417-b152-e35ace897f13", "time": 1723560903} +{"event": "launched", "properties": {"python_version": "3.12.4", "os_platform": "Darwin", "os_release": "23.6.0", "machine": "x86_64", "aider_version": "0.49.2-dev"}, "user_id": "bc3e1ea0-29a7-43ef-85fd-94694f8acebb", "time": 1723560920} +{"event": "cli session", "properties": {"main_model": "gpt-4o-mini", "python_version": "3.12.4", "os_platform": "Darwin", "os_release": "23.6.0", "machine": "x86_64", "aider_version": "0.49.2-dev"}, "user_id": "bc3e1ea0-29a7-43ef-85fd-94694f8acebb", "time": 1723560920} +{"event": "launched", "properties": {"python_version": "3.12.4", "os_platform": "Darwin", "os_release": "23.6.0", "machine": "x86_64", "aider_version": "0.49.2-dev"}, "user_id": null, "time": 1723560994} +{"event": "cli session", "properties": {"main_model": "gpt-4o-mini", "python_version": "3.12.4", "os_platform": "Darwin", "os_release": "23.6.0", "machine": "x86_64", "aider_version": "0.49.2-dev"}, "user_id": null, "time": 1723560994} +{"event": "launched", "properties": {"python_version": "3.12.4", "os_platform": "Darwin", "os_release": "23.6.0", "machine": "x86_64", "aider_version": "0.49.2-dev"}, "user_id": null, "time": 1723561016} +{"event": "cli session", "properties": {"main_model": "gpt-4o-mini", "python_version": "3.12.4", "os_platform": "Darwin", "os_release": "23.6.0", "machine": "x86_64", "aider_version": "0.49.2-dev"}, "user_id": null, "time": 1723561017} +{"event": "launched", "properties": {"python_version": "3.12.4", "os_platform": "Darwin", "os_release": "23.6.0", "machine": "x86_64", "aider_version": "0.49.2-dev"}, "user_id": null, "time": 1723561046} +{"event": "cli session", "properties": {"main_model": "gpt-4o-mini", "python_version": "3.12.4", "os_platform": "Darwin", "os_release": "23.6.0", "machine": "x86_64", "aider_version": "0.49.2-dev"}, "user_id": null, "time": 1723561046} +{"event": "launched", "properties": {"python_version": "3.12.4", "os_platform": "Darwin", "os_release": "23.6.0", "machine": "x86_64", "aider_version": "0.49.2-dev"}, "user_id": null, "time": 1723561049} +{"event": "cli session", "properties": {"main_model": "gpt-4o-mini", "python_version": "3.12.4", "os_platform": "Darwin", "os_release": "23.6.0", "machine": "x86_64", "aider_version": "0.49.2-dev"}, "user_id": null, "time": 1723561049} +{"event": "launched", "properties": {"python_version": "3.12.4", "os_platform": "Darwin", "os_release": "23.6.0", "machine": "x86_64", "aider_version": "0.49.2-dev"}, "user_id": "6547b0bb-4248-4d40-8269-dc59e9624e0f", "time": 1723561234} +{"event": "cli session", "properties": {"main_model": "gpt-4o-mini", "python_version": "3.12.4", "os_platform": "Darwin", "os_release": "23.6.0", "machine": "x86_64", "aider_version": "0.49.2-dev"}, "user_id": "6547b0bb-4248-4d40-8269-dc59e9624e0f", "time": 1723561235} +{"event": "message_send", "properties": {"main_model": "gpt-4o-mini", "prompt_tokens": 638, "completion_tokens": 25, "total_tokens": 663, "cost": 0.0001107, "total_cost": 0.0001107, "python_version": "3.12.4", "os_platform": "Darwin", "os_release": "23.6.0", "machine": "x86_64", "aider_version": "0.49.2-dev"}, "user_id": "6547b0bb-4248-4d40-8269-dc59e9624e0f", "time": 1723561241} +{"event": "launched", "properties": {"python_version": "3.12.4", "os_platform": "Darwin", "os_release": "23.6.0", "machine": "x86_64", "aider_version": "0.49.2-dev"}, "user_id": null, "time": 1723561304} +{"event": "cli session", "properties": {"main_model": "gpt-4o-mini", "python_version": "3.12.4", "os_platform": "Darwin", "os_release": "23.6.0", "machine": "x86_64", "aider_version": "0.49.2-dev"}, "user_id": null, "time": 1723561304} +{"event": "message_send", "properties": {"main_model": "gpt-4o-mini", "prompt_tokens": 638, "completion_tokens": 25, "total_tokens": 663, "cost": 0.0001107, "total_cost": 0.0001107, "python_version": "3.12.4", "os_platform": "Darwin", "os_release": "23.6.0", "machine": "x86_64", "aider_version": "0.49.2-dev"}, "user_id": null, "time": 1723561307} +{"event": "command_exit", "properties": {"python_version": "3.12.4", "os_platform": "Darwin", "os_release": "23.6.0", "machine": "x86_64", "aider_version": "0.49.2-dev"}, "user_id": null, "time": 1723561665} +{"event": "launched", "properties": {"python_version": "3.12.4", "os_platform": "Darwin", "os_release": "23.6.0", "machine": "x86_64", "aider_version": "0.49.2-dev"}, "user_id": null, "time": 1723561679} +{"event": "launched", "properties": {"python_version": "3.12.4", "os_platform": "Darwin", "os_release": "23.6.0", "machine": "x86_64", "aider_version": "0.49.2-dev"}, "user_id": null, "time": 1723561841} +{"event": "cli session", "properties": {"main_model": "claude-3-5-sonnet-20240620", "python_version": "3.12.4", "os_platform": "Darwin", "os_release": "23.6.0", "machine": "x86_64", "aider_version": "0.49.2-dev"}, "user_id": null, "time": 1723561841} +{"event": "message_send", "properties": {"main_model": "claude-3-5-sonnet-20240620", "prompt_tokens": 12148, "completion_tokens": 269, "total_tokens": 12417, "cost": 0.040479, "total_cost": 0.040479, "python_version": "3.12.4", "os_platform": "Darwin", "os_release": "23.6.0", "machine": "x86_64", "aider_version": "0.49.2-dev"}, "user_id": null, "time": 1723561858} +{"event": "command_undo", "properties": {"python_version": "3.12.4", "os_platform": "Darwin", "os_release": "23.6.0", "machine": "x86_64", "aider_version": "0.49.2-dev"}, "user_id": null, "time": 1723561925} diff --git a/aider/website/assets/sample.aider.conf.yml b/aider/website/assets/sample.aider.conf.yml index 5fccf5b2e..e53626a98 100644 --- a/aider/website/assets/sample.aider.conf.yml +++ b/aider/website/assets/sample.aider.conf.yml @@ -209,16 +209,16 @@ ## Run tests and fix problems found #test: false -##################### -# Analytics Settings: +############ +# Analytics: -## Enable/disable analytics tracking (default: True) +## Enable/disable analytics for one session (default: False) #analytics: false ## Specify a file to log analytics events #analytics-log: -## Disable analytics tracking and mark as disabled in mixpanel.json +## Disable analytics forever #analytics-disable: false ################# diff --git a/aider/website/assets/sample.env b/aider/website/assets/sample.env index dbaa8ceb8..6e841b6d0 100644 --- a/aider/website/assets/sample.env +++ b/aider/website/assets/sample.env @@ -213,16 +213,16 @@ ## Run tests and fix problems found #AIDER_TEST=false -##################### -# Analytics Settings: +############ +# Analytics: -## Enable/disable analytics tracking (default: True) +## Enable/disable analytics for one session (default: False) #AIDER_ANALYTICS=false ## Specify a file to log analytics events #AIDER_ANALYTICS_LOG= -## Disable analytics tracking and mark as disabled in mixpanel.json +## Disable analytics forever #AIDER_ANALYTICS_DISABLE=false ################# diff --git a/aider/website/docs/config/aider_conf.md b/aider/website/docs/config/aider_conf.md index 35c641f2e..b598baadd 100644 --- a/aider/website/docs/config/aider_conf.md +++ b/aider/website/docs/config/aider_conf.md @@ -248,16 +248,16 @@ cog.outl("```") ## Run tests and fix problems found #test: false -##################### -# Analytics Settings: +############ +# Analytics: -## Enable/disable analytics tracking (default: True) +## Enable/disable analytics for one session (default: False) #analytics: false ## Specify a file to log analytics events #analytics-log: -## Disable analytics tracking and mark as disabled in mixpanel.json +## Disable analytics forever #analytics-disable: false ################# diff --git a/aider/website/docs/config/dotenv.md b/aider/website/docs/config/dotenv.md index 80eef340c..3d1cccf4f 100644 --- a/aider/website/docs/config/dotenv.md +++ b/aider/website/docs/config/dotenv.md @@ -255,16 +255,16 @@ cog.outl("```") ## Run tests and fix problems found #AIDER_TEST=false -##################### -# Analytics Settings: +############ +# Analytics: -## Enable/disable analytics tracking (default: True) +## Enable/disable analytics for one session (default: False) #AIDER_ANALYTICS=false ## Specify a file to log analytics events #AIDER_ANALYTICS_LOG= -## Disable analytics tracking and mark as disabled in mixpanel.json +## Disable analytics forever #AIDER_ANALYTICS_DISABLE=false ################# diff --git a/aider/website/docs/config/options.md b/aider/website/docs/config/options.md index 93a827dc4..c56546ef3 100644 --- a/aider/website/docs/config/options.md +++ b/aider/website/docs/config/options.md @@ -411,10 +411,10 @@ Run tests and fix problems found Default: False Environment variable: `AIDER_TEST` -## Analytics Settings: +## Analytics: ### `--analytics` -Enable/disable analytics tracking (default: True) +Enable/disable analytics for one session (default: False) Default: False Environment variable: `AIDER_ANALYTICS` Aliases: @@ -426,7 +426,7 @@ Specify a file to log analytics events Environment variable: `AIDER_ANALYTICS_LOG` ### `--analytics-disable` -Disable analytics tracking and mark as disabled in mixpanel.json +Disable analytics forever Default: False Environment variable: `AIDER_ANALYTICS_DISABLE` diff --git a/aider/website/docs/more/analytics.md b/aider/website/docs/more/analytics.md index 5eedc4226..1c65adbf3 100644 --- a/aider/website/docs/more/analytics.md +++ b/aider/website/docs/more/analytics.md @@ -32,7 +32,7 @@ in upcoming releases. To get a better sense of what type of data is collected, you can review some [sample analytics logs](https://github.com/paul-gauthier/aider/blob/main/aider/website/assets/sample-analytics.jsonl). These are the last 1,000 analytics events from the author's -personal use of aider. +personal use of aider, updated regularly. ## Enabling & disabling analytics @@ -56,7 +56,7 @@ aider --no-analytics ## Logging and inspecting analytics -You can get a full log of all the data that aider is collecting, +You can get a full log of the analytics that aider is collecting, in case you would like to audit or inspect this data. ``` @@ -87,7 +87,9 @@ Aider is committed to complying with applicable data protection and privacy laws 3. Data Retention: Anonymous usage data is retained for a period of 5 years, after which it is automatically deleted. -4. User Rights: As we do not collect personal data, individual data subject rights (such as access, rectification, erasure) are not applicable. However, users have the right to opt-out of data collection entirely (see "Disabling analytics" section). +4. User Rights: As we do not collect personal data, individual data subject rights (such as access, rectification, erasure) are not applicable. However, users have the right to opt-out of data collection entirely. See +[Enabling & disabling analytics](#enabling--disabling-analytics) +above. 5. Data Protection: We implement appropriate technical and organizational measures to ensure a level of security appropriate to the risk.