Merge branch 'google:main' into main

Author: kyolee415

demos/palm/web/quick-prompt/src/store.js

@@ -208,7 +208,7 @@ const useStore = create((set, get) => ({
 
         actions.playSound('sounds/forbidden-word.mp3')
 
-        // Sort matches by their indicies in the passed `text` so the words in `forbiddenPopup` appear in the correct order
+        // Sort matches by their indices in the passed `text` so the words in `forbiddenPopup` appear in the correct order
         matches.sort((a, b) => {
           const aIndex = text.indexOf(a)
           const bIndex = text.indexOf(b)

demos/palm/web/talking-character/src/apis/textToSpeech.ts

@@ -211,7 +211,7 @@ const useTextToSpeech =
 
       const convert =
           async (text: string) => {
-        // console.log('Lamda response: ', text);
+        // console.log('Lambda response: ', text);
         // Use default voice for demo
         const voice = getDefaultAvatarVoice();
         if (!text || !voice?.cloudTtsVoice && !voice?.winslow) {

demos/palm/web/talking-character/third_party/mediapipe/web/graph_runner/graph_runner.ts

@@ -484,7 +484,7 @@ export class GraphRunner {
    * format).
    *
    * Consumers must deserialize the binary representation themselves as this
-   * avoids addding a direct dependency on the Protobuf JSPB target in the graph
+   * avoids adding a direct dependency on the Protobuf JSPB target in the graph
    * library.
    */
   getCalculatorGraphConfig(

demos/palm/web/textfx/src/components/generic/outputCard/outputCard.tsx

@@ -462,7 +462,7 @@ const OutputCard = ({output}: {output: IMacroOutput}) => {
                   selected={viewAll}
                   onClick={e => {
                     if (cardHeight === 'auto') {
-                      // Change it back from auto befor animating
+                      // Change it back from auto before animating
                       setCardHeight(`${cardSizerRef.current?.offsetHeight}px`)
                     }
                     setViewAll(e)

demos/palm/web/textfx/src/components/generic/outputSection/outputSection.module.scss

@@ -140,7 +140,7 @@
 
   :global(.masonryGrid) {
     display: flex;
-    margin-left: -13px; // Gutter size offest
+    margin-left: -13px; // Gutter size offset
     width: auto;
   }
 

examples/gemini/node/flutter_theme_agent/src/theme.ts

@@ -75,7 +75,7 @@ available color properties on a ColorScheme instead of using deprecated properti
 like Color Swatch.
 
 ${COMMENT_LABEL}
-Construct a ThemeData object with a pastel pink color palette that is asthetically 
+Construct a ThemeData object with a pastel pink color palette that is aesthetically 
 pleasing and a the CardTheme that removes elevation and adds a 2px black border.
 ${CODE_LABEL}
 ThemeData(

examples/gemini/python/docs-agent/docs_agent/interfaces/chatbot/chatui.py

@@ -278,7 +278,7 @@ def debugs(filename):
     return bp
 
 
-# Go through the `seatch_result` object returned from the AQA model
+# Go through the `search_result` object returned from the AQA model
 # and extract context.
 def extract_context_from_search_result(search_result):
     context = ""
@@ -292,7 +292,7 @@ def extract_context_from_search_result(search_result):
 
 
 # Construct a set of prompts using the user question, send the prompts to
-# the lanaguage model, receive responses, and present them into a page.
+# the language model, receive responses, and present them into a page.
 # Use template to specify a custom template for the classic web UI
 def ask_model(question, agent, template: str = "chatui/index.html"):
     # Returns a built context, a total token count of the context and an array

examples/gemini/python/docs-agent/docs_agent/interfaces/cli/cli_helpme.py

@@ -327,7 +327,7 @@ def helpme(
         this_file = os.path.realpath(os.path.join(os.getcwd(), file))
         this_output = ""
 
-        # if the `--cont` flag is set, inlcude the previous exchanges as additional context.
+        # if the `--cont` flag is set, include the previous exchanges as additional context.
         context_file = None
         if cont:
             context_file = history_file
@@ -432,7 +432,7 @@ def helpme(
         if file_ext is None or file_ext == "":
             file_type = "All types"
 
-        # if the `--cont` flag is set, inlcude the previous exchanges as additional context.
+        # if the `--cont` flag is set, include the previous exchanges as additional context.
         context_file = None
         if cont:
             context_file = history_file
@@ -732,7 +732,7 @@ def helpme(
                     print(f"Failed to write the output to file: {out}")
 
     elif helpme_mode == "TERMINAL_OUTPUT":
-        # Terminal output mode, which reads the terminal ouput as context.
+        # Terminal output mode, which reads the terminal output as context.
         terminal_output = ""
         # Set the default filename created from the `script` command.
         file_path = "/tmp/docs_agent_console_input"

examples/gemini/python/docs-agent/pylintrc

@@ -277,7 +277,7 @@ single-line-if-stmt=yes
 max-module-lines=99999
 
 # String used as indentation unit.  The internal Google style guide mandates 2
-# spaces.  Google's externaly-published style guide says 4, consistent with
+# spaces.  Google's externally-published style guide says 4, consistent with
 # PEP 8.  Here, we use 2 spaces, for conformity with many open-sourced Google
 # projects (like TensorFlow).
 indent-string='    '