Misc julien tweaks (#525)

* Fix formatting (whitespace)

* typo

* i think we can remove this now

.env

@@ -76,7 +76,6 @@ TASK_MODEL='' # name of the model used for tasks such as summarizing title, crea
 PUBLIC_ORIGIN=#https://huggingface.co
 PUBLIC_SHARE_PREFIX=#https://hf.co/chat
 PUBLIC_GOOGLE_ANALYTICS_ID=#G-XXXXXXXX / Leave empty to disable
-PUBLIC_DEPRECATED_GOOGLE_ANALYTICS_ID=#UA-XXXXXXXX-X / Leave empty to disable
 PUBLIC_ANNOUNCEMENT_BANNERS=`[
     {
     "title": "Llama v2 is live on HuggingChat! 🦙",

.env.template

@@ -1,7 +1,7 @@
 # template used in production for HuggingChat.
 
 MODELS=`[
-      {
+    {
       "name": "meta-llama/Llama-2-70b-chat-hf",
       "description": "The latest and biggest model from Meta, fine-tuned for chat.",
       "websiteUrl": "https://ai.meta.com/llama/",
@@ -31,8 +31,8 @@ MODELS=`[
         "truncate": 1000,
         "max_new_tokens": 1024
       }
-        },
-        {
+    },
+    {
       "name": "codellama/CodeLlama-34b-Instruct-hf",
       "displayName": "codellama/CodeLlama-34b-Instruct-hf",
       "description": "Code Llama, a state of the art code model from Meta.",
@@ -110,18 +110,18 @@ MODELS=`[
         "stop": ["</s>"]
       },
       "promptExamples": [
-      {
-          "title": "Write an email from bullet list",
-        "prompt": "As a restaurant owner, write a professional email to the supplier to get these products every week: \n\n- Wine (x10)\n- Eggs (x24)\n- Bread (x12)"
-      }, {
-        "title": "Code a snake game",
-        "prompt": "Code a basic snake game in python, give explanations for each step."
-      }, {
-        "title": "Assist in a task",
-        "prompt": "How do I make a delicious lemon cheesecake?"
-      }
-    ]
-  }
+        {
+            "title": "Write an email from bullet list",
+          "prompt": "As a restaurant owner, write a professional email to the supplier to get these products every week: \n\n- Wine (x10)\n- Eggs (x24)\n- Bread (x12)"
+        }, {
+          "title": "Code a snake game",
+          "prompt": "Code a basic snake game in python, give explanations for each step."
+        }, {
+          "title": "Assist in a task",
+          "prompt": "How do I make a delicious lemon cheesecake?"
+        }
+      ]
+    }
 ]`
 
 OLD_MODELS=`[{"name":"bigcode/starcoder"}, {"name":"OpenAssistant/oasst-sft-6-llama-30b-xor"}, {"name":"HuggingFaceH4/zephyr-7b-alpha"}]`
@@ -145,7 +145,6 @@ RATE_LIMIT=16
 MESSAGES_BEFORE_LOGIN=1# how many messages a user can send in a conversation before having to login. set to 0 to force login right away
 
 PUBLIC_GOOGLE_ANALYTICS_ID=G-8Q63TH4CSL
-PUBLIC_DEPRECATED_GOOGLE_ANALYTICS_ID=UA-83738774-2
 
 # Not part of the .env but set as other variables in the space
 # ADDRESS_HEADER=X-Forwarded-For

scripts/updateProdEnv.ts

@@ -18,7 +18,7 @@ SERPER_API_KEY=${SERPER_API_KEY}
 HF_ACCESS_TOKEN=${HF_ACCESS_TOKEN}
 `;
 
-// Make an HTTP POST request to add the space secre
+// Make an HTTP POST request to add the space secrets
 fetch(`https://huggingface.co/api/spaces/huggingchat/chat-ui/secrets`, {
 	method: "POST",
 	body: JSON.stringify({

src/app.html

@@ -17,7 +17,6 @@
 
 			// For some reason, Sveltekit doesn't let us load env variables from .env here, so we load it from hooks.server.ts
 			window.gaId = "%gaId%";
-			window.gaIdDeprecated = "%gaIdDeprecated%";
 		</script>
 		%sveltekit.head%
 	</head>
@@ -44,32 +43,5 @@
 				/// TODO: ask the user for their consent and update this with gtag('consent', 'update')
 			}
 		</script>
-
-		<!-- Google Analytics v3 (deprecated on 1 July 2023) -->
-		<script>
-			if (window.gaIdDeprecated) {
-				(function (i, s, o, g, r, a, m) {
-					i["GoogleAnalyticsObject"] = r;
-					(i[r] =
-						i[r] ||
-						function () {
-							(i[r].q = i[r].q || []).push(arguments);
-						}),
-						(i[r].l = 1 * new Date());
-					(a = s.createElement(o)), (m = s.getElementsByTagName(o)[0]);
-					a.async = 1;
-					a.src = g;
-					m.parentNode.insertBefore(a, m);
-				})(
-					window,
-					document,
-					"script",
-					"https://www.google-analytics.com/analytics.js",
-					"ganalytics"
-				);
-				ganalytics("create", window.gaIdDeprecated, "auto");
-				ganalytics("send", "pageview");
-			}
-		</script>
 	</body>
 </html>

src/hooks.server.ts

@@ -2,7 +2,6 @@ import { COOKIE_NAME, MESSAGES_BEFORE_LOGIN } from "$env/static/private";
 import type { Handle } from "@sveltejs/kit";
 import {
 	PUBLIC_GOOGLE_ANALYTICS_ID,
-	PUBLIC_DEPRECATED_GOOGLE_ANALYTICS_ID,
 	PUBLIC_ORIGIN,
 	PUBLIC_APP_DISCLAIMER,
 } from "$env/static/public";
@@ -98,14 +97,12 @@ export const handle: Handle = async ({ event, resolve }) => {
 	const response = await resolve(event, {
 		transformPageChunk: (chunk) => {
 			// For some reason, Sveltekit doesn't let us load env variables from .env in the app.html template
-			if (replaced || !chunk.html.includes("%gaId%") || !chunk.html.includes("%gaIdDeprecated%")) {
+			if (replaced || !chunk.html.includes("%gaId%")) {
 				return chunk.html;
 			}
 			replaced = true;
 
-			return chunk.html
-				.replace("%gaId%", PUBLIC_GOOGLE_ANALYTICS_ID)
-				.replace("%gaIdDeprecated%", PUBLIC_DEPRECATED_GOOGLE_ANALYTICS_ID);
+			return chunk.html.replace("%gaId%", PUBLIC_GOOGLE_ANALYTICS_ID);
 		},
 	});