From eb86f6fc428fd6f21ebf8c629aca41c3ea6d8f45 Mon Sep 17 00:00:00 2001
From: Debanjum Singh Solanky <debanjum@gmail.com>
Date: Mon, 30 Sep 2024 03:01:40 -0700
Subject: [PATCH 1/4] Add __str__ func to LocationData class to dedupe location
 string gen

Previously the location string from location data was being generated
wherever it was being used.

By adding a __str__ representation to LocationData class, we can
dedupe and simplify the code to get the location string
---
 .../processor/conversation/anthropic/anthropic_chat.py |  5 ++---
 src/khoj/processor/conversation/google/gemini_chat.py  |  5 ++---
 src/khoj/processor/conversation/offline/chat_model.py  |  5 ++---
 src/khoj/processor/conversation/openai/gpt.py          |  5 ++---
 src/khoj/routers/helpers.py                            |  7 +++----
 src/khoj/utils/rawconfig.py                            | 10 ++++++++++
 6 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/khoj/processor/conversation/anthropic/anthropic_chat.py b/src/khoj/processor/conversation/anthropic/anthropic_chat.py
index 94d8df03..0309d29b 100644
--- a/src/khoj/processor/conversation/anthropic/anthropic_chat.py
+++ b/src/khoj/processor/conversation/anthropic/anthropic_chat.py
@@ -32,7 +32,7 @@ def extract_questions_anthropic(
     Infer search queries to retrieve relevant notes to answer user query
     """
     # Extract Past User Message and Inferred Questions from Conversation Log
-    location = f"{location_data.city}, {location_data.region}, {location_data.country}" if location_data else "Unknown"
+    location = f"{location_data}" if location_data else "Unknown"
     username = prompts.user_name.format(name=user.get_full_name()) if user and user.get_full_name() else ""
 
     # Extract Past User Message and Inferred Questions from Conversation Log
@@ -158,8 +158,7 @@ def converse_anthropic(
         )
 
     if location_data:
-        location = f"{location_data.city}, {location_data.region}, {location_data.country}"
-        location_prompt = prompts.user_location.format(location=location)
+        location_prompt = prompts.user_location.format(location=f"{location_data}")
         system_prompt = f"{system_prompt}\n{location_prompt}"
 
     if user_name:
diff --git a/src/khoj/processor/conversation/google/gemini_chat.py b/src/khoj/processor/conversation/google/gemini_chat.py
index 64fa5d66..a2ccc87b 100644
--- a/src/khoj/processor/conversation/google/gemini_chat.py
+++ b/src/khoj/processor/conversation/google/gemini_chat.py
@@ -33,7 +33,7 @@ def extract_questions_gemini(
     Infer search queries to retrieve relevant notes to answer user query
     """
     # Extract Past User Message and Inferred Questions from Conversation Log
-    location = f"{location_data.city}, {location_data.region}, {location_data.country}" if location_data else "Unknown"
+    location = f"{location_data}" if location_data else "Unknown"
     username = prompts.user_name.format(name=user.get_full_name()) if user and user.get_full_name() else ""
 
     # Extract Past User Message and Inferred Questions from Conversation Log
@@ -163,8 +163,7 @@ def converse_gemini(
         )
 
     if location_data:
-        location = f"{location_data.city}, {location_data.region}, {location_data.country}"
-        location_prompt = prompts.user_location.format(location=location)
+        location_prompt = prompts.user_location.format(location=f"{location_data}")
         system_prompt = f"{system_prompt}\n{location_prompt}"
 
     if user_name:
diff --git a/src/khoj/processor/conversation/offline/chat_model.py b/src/khoj/processor/conversation/offline/chat_model.py
index febe3786..a8229332 100644
--- a/src/khoj/processor/conversation/offline/chat_model.py
+++ b/src/khoj/processor/conversation/offline/chat_model.py
@@ -46,7 +46,7 @@ def extract_questions_offline(
     assert loaded_model is None or isinstance(loaded_model, Llama), "loaded_model must be of type Llama, if configured"
     offline_chat_model = loaded_model or download_model(model, max_tokens=max_prompt_size)
 
-    location = f"{location_data.city}, {location_data.region}, {location_data.country}" if location_data else "Unknown"
+    location = f"{location_data}" if location_data else "Unknown"
     username = prompts.user_name.format(name=user.get_full_name()) if user and user.get_full_name() else ""
 
     # Extract Past User Message and Inferred Questions from Conversation Log
@@ -171,8 +171,7 @@ def converse_offline(
     conversation_primer = prompts.query_prompt.format(query=user_query)
 
     if location_data:
-        location = f"{location_data.city}, {location_data.region}, {location_data.country}"
-        location_prompt = prompts.user_location.format(location=location)
+        location_prompt = prompts.user_location.format(location=f"{location_data}")
         system_prompt = f"{system_prompt}\n{location_prompt}"
 
     if user_name:
diff --git a/src/khoj/processor/conversation/openai/gpt.py b/src/khoj/processor/conversation/openai/gpt.py
index 90cd4df9..1361e1ae 100644
--- a/src/khoj/processor/conversation/openai/gpt.py
+++ b/src/khoj/processor/conversation/openai/gpt.py
@@ -36,7 +36,7 @@ def extract_questions(
     """
     Infer search queries to retrieve relevant notes to answer user query
     """
-    location = f"{location_data.city}, {location_data.region}, {location_data.country}" if location_data else "Unknown"
+    location = f"{location_data}" if location_data else "Unknown"
     username = prompts.user_name.format(name=user.get_full_name()) if user and user.get_full_name() else ""
 
     # Extract Past User Message and Inferred Questions from Conversation Log
@@ -159,8 +159,7 @@ def converse(
         )
 
     if location_data:
-        location = f"{location_data.city}, {location_data.region}, {location_data.country}"
-        location_prompt = prompts.user_location.format(location=location)
+        location_prompt = prompts.user_location.format(location=f"{location_data}")
         system_prompt = f"{system_prompt}\n{location_prompt}"
 
     if user_name:
diff --git a/src/khoj/routers/helpers.py b/src/khoj/routers/helpers.py
index 0f60b100..59d44925 100644
--- a/src/khoj/routers/helpers.py
+++ b/src/khoj/routers/helpers.py
@@ -369,7 +369,7 @@ async def infer_webpage_urls(
     """
     Infer webpage links from the given query
     """
-    location = f"{location_data.city}, {location_data.region}, {location_data.country}" if location_data else "Unknown"
+    location = f"{location_data}" if location_data else "Unknown"
     username = prompts.user_name.format(name=user.get_full_name()) if user.get_full_name() else ""
     chat_history = construct_chat_history(conversation_history)
 
@@ -405,7 +405,7 @@ async def generate_online_subqueries(
     """
     Generate subqueries from the given query
     """
-    location = f"{location_data.city}, {location_data.region}, {location_data.country}" if location_data else "Unknown"
+    location = f"{location_data}" if location_data else "Unknown"
     username = prompts.user_name.format(name=user.get_full_name()) if user.get_full_name() else ""
     chat_history = construct_chat_history(conversation_history)
 
@@ -535,8 +535,7 @@ async def generate_better_image_prompt(
     model_type = model_type or TextToImageModelConfig.ModelType.OPENAI
 
     if location_data:
-        location = f"{location_data.city}, {location_data.region}, {location_data.country}"
-        location_prompt = prompts.user_location.format(location=location)
+        location_prompt = prompts.user_location.format(location=f"{location_data}")
     else:
         location_prompt = "Unknown"
 
diff --git a/src/khoj/utils/rawconfig.py b/src/khoj/utils/rawconfig.py
index 79318b01..f0cd3962 100644
--- a/src/khoj/utils/rawconfig.py
+++ b/src/khoj/utils/rawconfig.py
@@ -26,6 +26,16 @@ class LocationData(BaseModel):
     region: Optional[str]
     country: Optional[str]
 
+    def __str__(self):
+        parts = []
+        if self.city:
+            parts.append(self.city)
+        if self.region:
+            parts.append(self.region)
+        if self.country:
+            parts.append(self.country)
+        return ", ".join(parts)
+
 
 class FileFilterRequest(BaseModel):
     filename: str

From 1fed842fcca221e02c03f411821d3d7f89491213 Mon Sep 17 00:00:00 2001
From: Debanjum Singh Solanky <debanjum@gmail.com>
Date: Mon, 30 Sep 2024 01:19:56 -0700
Subject: [PATCH 2/4] Localize online search results to user country when
 location available

Get country code to server chat api from i.p location check on clients.
Use country code to get country specific online search results via Serper.dev API
---
 src/interface/desktop/chat.html           |  3 +++
 src/interface/desktop/shortcut.html       |  6 ++++--
 src/interface/obsidian/src/chat_view.ts   |  3 +++
 src/interface/web/app/chat/page.tsx       |  3 ++-
 src/interface/web/app/common/utils.ts     |  1 +
 src/interface/web/app/share/chat/page.tsx |  1 +
 src/khoj/processor/tools/online_search.py | 10 +++++-----
 src/khoj/routers/api_chat.py              |  6 ++++--
 src/khoj/utils/rawconfig.py               |  1 +
 9 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/interface/desktop/chat.html b/src/interface/desktop/chat.html
index 3df00efc..cd47dae5 100644
--- a/src/interface/desktop/chat.html
+++ b/src/interface/desktop/chat.html
@@ -60,6 +60,7 @@
         let region = null;
         let city = null;
         let countryName = null;
+        let countryCode = null;
         let timezone = null;
         let chatMessageState = {
             newResponseTextEl: null,
@@ -76,6 +77,7 @@
                 region = data.region;
                 city = data.city;
                 countryName = data.country_name;
+                countryCode = data.country_code;
                 timezone = data.timezone;
             })
             .catch(err => {
@@ -157,6 +159,7 @@
                 ...(!!city && { city: city }),
                 ...(!!region && { region: region }),
                 ...(!!countryName && { country: countryName }),
+                ...(!!countryCode && { country_code: countryCode }),
                 ...(!!timezone && { timezone: timezone }),
             };
 
diff --git a/src/interface/desktop/shortcut.html b/src/interface/desktop/shortcut.html
index 86e5d906..4b07b8ea 100644
--- a/src/interface/desktop/shortcut.html
+++ b/src/interface/desktop/shortcut.html
@@ -308,18 +308,19 @@
     <script src="./utils.js"></script>
     <script src="./chatutils.js"></script>
     <script>
-
         let region = null;
         let city = null;
         let countryName = null;
+        let countryCode = null;
         let timezone = null;
 
         fetch("https://ipapi.co/json")
             .then(response => response.json())
             .then(data => {
-                region = data.region;
                 city = data.city;
+                region = data.region;
                 countryName = data.country_name;
+                countryCode = data.country_code;
                 timezone = data.timezone;
             })
             .catch(err => {
@@ -410,6 +411,7 @@
                 ...(!!city && { city: city }),
                 ...(!!region && { region: region }),
                 ...(!!countryName && { country: countryName }),
+                ...(!!countryCode && { country_code: countryCode }),
                 ...(!!timezone && { timezone: timezone }),
             };
 
diff --git a/src/interface/obsidian/src/chat_view.ts b/src/interface/obsidian/src/chat_view.ts
index 237fccf9..f27098ca 100644
--- a/src/interface/obsidian/src/chat_view.ts
+++ b/src/interface/obsidian/src/chat_view.ts
@@ -36,6 +36,7 @@ interface Location {
     region: string;
     city: string;
     countryName: string;
+    countryCode: string;
     timezone: string;
 }
 
@@ -70,6 +71,7 @@ export class KhojChatView extends KhojPaneView {
                     region: data.region,
                     city: data.city,
                     countryName: data.country_name,
+                    countryCode: data.country_code,
                     timezone: data.timezone,
                 };
             })
@@ -1060,6 +1062,7 @@ export class KhojChatView extends KhojPaneView {
                 city: this.location.city,
                 region: this.location.region,
                 country: this.location.countryName,
+                country_code: this.location.countryCode,
                 timezone: this.location.timezone,
             }),
         };
diff --git a/src/interface/web/app/chat/page.tsx b/src/interface/web/app/chat/page.tsx
index 0879956a..37a894e9 100644
--- a/src/interface/web/app/chat/page.tsx
+++ b/src/interface/web/app/chat/page.tsx
@@ -241,9 +241,10 @@ export default function Chat() {
             conversation_id: conversationId,
             stream: true,
             ...(locationData && {
+                city: locationData.city,
                 region: locationData.region,
                 country: locationData.country,
-                city: locationData.city,
+                country_code: locationData.countryCode,
                 timezone: locationData.timezone,
             }),
             ...(image64 && { image: image64 }),
diff --git a/src/interface/web/app/common/utils.ts b/src/interface/web/app/common/utils.ts
index c3395dbb..b5dbfec8 100644
--- a/src/interface/web/app/common/utils.ts
+++ b/src/interface/web/app/common/utils.ts
@@ -6,6 +6,7 @@ export interface LocationData {
     city: string;
     region: string;
     country: string;
+    countryCode: string;
     postal: string;
     latitude: number;
     longitude: number;
diff --git a/src/interface/web/app/share/chat/page.tsx b/src/interface/web/app/share/chat/page.tsx
index d9a945c5..116a7f7c 100644
--- a/src/interface/web/app/share/chat/page.tsx
+++ b/src/interface/web/app/share/chat/page.tsx
@@ -231,6 +231,7 @@ export default function SharedChat() {
                 region: locationData.region,
                 country: locationData.country,
                 city: locationData.city,
+                country_code: locationData.countryCode,
                 timezone: locationData.timezone,
             }),
             ...(image64 && { image: image64 }),
diff --git a/src/khoj/processor/tools/online_search.py b/src/khoj/processor/tools/online_search.py
index c7f7177f..3627c58e 100644
--- a/src/khoj/processor/tools/online_search.py
+++ b/src/khoj/processor/tools/online_search.py
@@ -7,7 +7,6 @@ from collections import defaultdict
 from typing import Callable, Dict, List, Optional, Tuple, Union
 
 import aiohttp
-import requests
 from bs4 import BeautifulSoup
 from markdownify import markdownify
 
@@ -80,7 +79,7 @@ async def search_online(
 
     with timer(f"Internet searches for {list(subqueries)} took", logger):
         search_func = search_with_google if SERPER_DEV_API_KEY else search_with_jina
-        search_tasks = [search_func(subquery) for subquery in subqueries]
+        search_tasks = [search_func(subquery, location) for subquery in subqueries]
         search_results = await asyncio.gather(*search_tasks)
         response_dict = {subquery: search_result for subquery, search_result in search_results}
 
@@ -115,8 +114,9 @@ async def search_online(
     yield response_dict
 
 
-async def search_with_google(query: str) -> Tuple[str, Dict[str, List[Dict]]]:
-    payload = json.dumps({"q": query})
+async def search_with_google(query: str, location: LocationData) -> Tuple[str, Dict[str, List[Dict]]]:
+    country_code = location.country_code.lower() if location and location.country_code else "us"
+    payload = json.dumps({"q": query, "gl": country_code})
     headers = {"X-API-KEY": SERPER_DEV_API_KEY, "Content-Type": "application/json"}
 
     async with aiohttp.ClientSession() as session:
@@ -220,7 +220,7 @@ async def read_webpage_with_jina(web_url: str) -> str:
             return response_json["data"]["content"]
 
 
-async def search_with_jina(query: str) -> Tuple[str, Dict[str, List[Dict]]]:
+async def search_with_jina(query: str, location: LocationData) -> Tuple[str, Dict[str, List[Dict]]]:
     encoded_query = urllib.parse.quote(query)
     jina_search_api_url = f"{JINA_SEARCH_API_URL}/{encoded_query}"
     headers = {"Accept": "application/json"}
diff --git a/src/khoj/routers/api_chat.py b/src/khoj/routers/api_chat.py
index a11ae54e..4ce50cf2 100644
--- a/src/khoj/routers/api_chat.py
+++ b/src/khoj/routers/api_chat.py
@@ -529,6 +529,7 @@ class ChatRequestBody(BaseModel):
     city: Optional[str] = None
     region: Optional[str] = None
     country: Optional[str] = None
+    country_code: Optional[str] = None
     timezone: Optional[str] = None
     image: Optional[str] = None
 
@@ -556,6 +557,7 @@ async def chat(
     city = body.city
     region = body.region
     country = body.country
+    country_code = body.country_code
     timezone = body.timezone
     image = body.image
 
@@ -653,8 +655,8 @@ async def chat(
 
         user_name = await aget_user_name(user)
         location = None
-        if city or region or country:
-            location = LocationData(city=city, region=region, country=country)
+        if city or region or country or country_code:
+            location = LocationData(city=city, region=region, country=country, country_code=country_code)
 
         if is_query_empty(q):
             async for result in send_llm_response("Please ask your query to get started."):
diff --git a/src/khoj/utils/rawconfig.py b/src/khoj/utils/rawconfig.py
index f0cd3962..15f5ea01 100644
--- a/src/khoj/utils/rawconfig.py
+++ b/src/khoj/utils/rawconfig.py
@@ -25,6 +25,7 @@ class LocationData(BaseModel):
     city: Optional[str]
     region: Optional[str]
     country: Optional[str]
+    country_code: Optional[str]
 
     def __str__(self):
         parts = []

From 344f3c60bad814070db8110b48a216555a64eda4 Mon Sep 17 00:00:00 2001
From: Debanjum Singh Solanky <debanjum@gmail.com>
Date: Mon, 30 Sep 2024 03:06:46 -0700
Subject: [PATCH 3/4] Infer country from timezone when only tz received by chat
 API

Timezone is easier to infer using clients system clock. This can be
used to infer user country name, country code, even if ip based
location cannot be inferred.

This makes using location data to contextualize Khoj's responses more
robust. For example, online search results are retrieved for user's
country, even if call to ipapi.co for ip based location fails
---
 src/khoj/routers/api_chat.py |  6 ++++--
 src/khoj/utils/helpers.py    | 23 +++++++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/khoj/routers/api_chat.py b/src/khoj/routers/api_chat.py
index 4ce50cf2..cb16a4ab 100644
--- a/src/khoj/routers/api_chat.py
+++ b/src/khoj/routers/api_chat.py
@@ -55,6 +55,8 @@ from khoj.utils.helpers import (
     ConversationCommand,
     command_descriptions,
     convert_image_to_webp,
+    get_country_code_from_timezone,
+    get_country_name_from_timezone,
     get_device,
     is_none_or_empty,
 )
@@ -556,8 +558,8 @@ async def chat(
     conversation_id = body.conversation_id
     city = body.city
     region = body.region
-    country = body.country
-    country_code = body.country_code
+    country = body.country or get_country_name_from_timezone(body.timezone)
+    country_code = body.country_code or get_country_code_from_timezone(body.timezone)
     timezone = body.timezone
     image = body.image
 
diff --git a/src/khoj/utils/helpers.py b/src/khoj/utils/helpers.py
index 1ebb1fdd..77395cdc 100644
--- a/src/khoj/utils/helpers.py
+++ b/src/khoj/utils/helpers.py
@@ -9,6 +9,7 @@ import random
 import uuid
 from collections import OrderedDict
 from enum import Enum
+from functools import lru_cache
 from importlib import import_module
 from importlib.metadata import version
 from itertools import islice
@@ -24,6 +25,7 @@ import torch
 from asgiref.sync import sync_to_async
 from magika import Magika
 from PIL import Image
+from pytz import country_names, country_timezones
 
 from khoj.utils import constants
 
@@ -431,3 +433,24 @@ def convert_image_to_webp(image_bytes):
         webp_image_bytes = webp_image_io.getvalue()
         webp_image_io.close()
         return webp_image_bytes
+
+
+@lru_cache
+def tz_to_cc_map() -> dict[str, str]:
+    """Create a mapping of timezone to country code"""
+    timezone_country = {}
+    for countrycode in country_timezones:
+        timezones = country_timezones[countrycode]
+        for timezone in timezones:
+            timezone_country[timezone] = countrycode
+    return timezone_country
+
+
+def get_country_code_from_timezone(tz: str) -> str:
+    """Get country code from timezone"""
+    return tz_to_cc_map().get(tz, "US")
+
+
+def get_country_name_from_timezone(tz: str) -> str:
+    """Get country name from timezone"""
+    return country_names.get(get_country_code_from_timezone(tz), "United States")

From 04aef362e24fd4a50f8c5673f2b24658381d9395 Mon Sep 17 00:00:00 2001
From: Debanjum Singh Solanky <debanjum@gmail.com>
Date: Mon, 30 Sep 2024 03:15:50 -0700
Subject: [PATCH 4/4] Default to using system clock to infer user timezone on
 js clients

Using system clock to infer user timezone on clients makes Khoj
more robust to provide location aware responses.

Previously only ip based location was used to infer timezone via API.
This didn't provide any decent fallback when calls to ipapi failed or
Khoj was being run in offline mode
---
 src/interface/desktop/chat.html            |  2 +-
 src/interface/desktop/shortcut.html        |  2 +-
 src/interface/obsidian/src/chat_view.ts    | 22 ++++++++++------------
 src/interface/web/app/automations/page.tsx |  6 ++++--
 src/interface/web/app/chat/page.tsx        |  4 +++-
 src/interface/web/app/common/utils.ts      | 16 +++++-----------
 src/interface/web/app/share/chat/page.tsx  |  4 +++-
 7 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/src/interface/desktop/chat.html b/src/interface/desktop/chat.html
index cd47dae5..a6ae9a15 100644
--- a/src/interface/desktop/chat.html
+++ b/src/interface/desktop/chat.html
@@ -61,7 +61,7 @@
         let city = null;
         let countryName = null;
         let countryCode = null;
-        let timezone = null;
+        let timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
         let chatMessageState = {
             newResponseTextEl: null,
             newResponseEl: null,
diff --git a/src/interface/desktop/shortcut.html b/src/interface/desktop/shortcut.html
index 4b07b8ea..9c760019 100644
--- a/src/interface/desktop/shortcut.html
+++ b/src/interface/desktop/shortcut.html
@@ -312,7 +312,7 @@
         let city = null;
         let countryName = null;
         let countryCode = null;
-        let timezone = null;
+        let timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
 
         fetch("https://ipapi.co/json")
             .then(response => response.json())
diff --git a/src/interface/obsidian/src/chat_view.ts b/src/interface/obsidian/src/chat_view.ts
index f27098ca..ed23bff0 100644
--- a/src/interface/obsidian/src/chat_view.ts
+++ b/src/interface/obsidian/src/chat_view.ts
@@ -33,10 +33,10 @@ interface ChatMessageState {
 }
 
 interface Location {
-    region: string;
-    city: string;
-    countryName: string;
-    countryCode: string;
+    region?: string;
+    city?: string;
+    countryName?: string;
+    countryCode?: string;
     timezone: string;
 }
 
@@ -44,7 +44,7 @@ export class KhojChatView extends KhojPaneView {
     result: string;
     setting: KhojSetting;
     waitingForLocation: boolean;
-    location: Location;
+    location: Location = { timezone: Intl.DateTimeFormat().resolvedOptions().timeZone };
     keyPressTimeout: NodeJS.Timeout | null = null;
 	userMessages: string[] = [];  // Store user sent messages for input history cycling
 	currentMessageIndex: number = -1;  // Track current message index in userMessages array
@@ -1058,13 +1058,11 @@ export class KhojChatView extends KhojPaneView {
             n: this.setting.resultsCount,
             stream: true,
             ...(!!conversationId && { conversation_id: conversationId }),
-            ...(!!this.location && {
-                city: this.location.city,
-                region: this.location.region,
-                country: this.location.countryName,
-                country_code: this.location.countryCode,
-                timezone: this.location.timezone,
-            }),
+            ...(!!this.location && this.location.city && { city: this.location.city }),
+            ...(!!this.location && this.location.region && { region: this.location.region }),
+            ...(!!this.location && this.location.countryName && { country: this.location.countryName }),
+            ...(!!this.location && this.location.countryCode && { country_code: this.location.countryCode }),
+            ...(!!this.location && this.location.timezone && { timezone: this.location.timezone }),
         };
 
         let newResponseEl = this.createKhojResponseDiv();
diff --git a/src/interface/web/app/automations/page.tsx b/src/interface/web/app/automations/page.tsx
index 06a828d8..f2d06c23 100644
--- a/src/interface/web/app/automations/page.tsx
+++ b/src/interface/web/app/automations/page.tsx
@@ -518,12 +518,14 @@ function EditCard(props: EditCardProps) {
             updateQueryUrl += `&subject=${encodeURIComponent(values.subject)}`;
         }
         updateQueryUrl += `&crontime=${encodeURIComponent(cronFrequency)}`;
-        if (props.locationData) {
+        if (props.locationData && props.locationData.city)
             updateQueryUrl += `&city=${encodeURIComponent(props.locationData.city)}`;
+        if (props.locationData && props.locationData.region)
             updateQueryUrl += `&region=${encodeURIComponent(props.locationData.region)}`;
+        if (props.locationData && props.locationData.country)
             updateQueryUrl += `&country=${encodeURIComponent(props.locationData.country)}`;
+        if (props.locationData && props.locationData.timezone)
             updateQueryUrl += `&timezone=${encodeURIComponent(props.locationData.timezone)}`;
-        }
 
         let method = props.createNew ? "POST" : "PUT";
 
diff --git a/src/interface/web/app/chat/page.tsx b/src/interface/web/app/chat/page.tsx
index 37a894e9..7d87fd81 100644
--- a/src/interface/web/app/chat/page.tsx
+++ b/src/interface/web/app/chat/page.tsx
@@ -136,7 +136,9 @@ export default function Chat() {
     const [uploadedFiles, setUploadedFiles] = useState<string[]>([]);
     const [image64, setImage64] = useState<string>("");
 
-    const locationData = useIPLocationData();
+    const locationData = useIPLocationData() || {
+        timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+    };
     const authenticatedData = useAuthenticatedData();
     const isMobileWidth = useIsMobileWidth();
 
diff --git a/src/interface/web/app/common/utils.ts b/src/interface/web/app/common/utils.ts
index b5dbfec8..1e7337b8 100644
--- a/src/interface/web/app/common/utils.ts
+++ b/src/interface/web/app/common/utils.ts
@@ -2,14 +2,10 @@ import { useEffect, useState } from "react";
 import useSWR from "swr";
 
 export interface LocationData {
-    ip: string;
-    city: string;
-    region: string;
-    country: string;
-    countryCode: string;
-    postal: string;
-    latitude: number;
-    longitude: number;
+    city?: string;
+    region?: string;
+    country?: string;
+    countryCode?: string;
     timezone: string;
 }
 
@@ -51,9 +47,7 @@ export function useIPLocationData() {
         { revalidateOnFocus: false },
     );
 
-    if (locationDataError) return null;
-    if (!locationData) return null;
-
+    if (locationDataError || !locationData) return;
     return locationData;
 }
 
diff --git a/src/interface/web/app/share/chat/page.tsx b/src/interface/web/app/share/chat/page.tsx
index 116a7f7c..9bc5f12d 100644
--- a/src/interface/web/app/share/chat/page.tsx
+++ b/src/interface/web/app/share/chat/page.tsx
@@ -111,7 +111,9 @@ export default function SharedChat() {
     const [paramSlug, setParamSlug] = useState<string | undefined>(undefined);
     const [image64, setImage64] = useState<string>("");
 
-    const locationData = useIPLocationData();
+    const locationData = useIPLocationData() || {
+        timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+    };
     const authenticatedData = useAuthenticatedData();
     const isMobileWidth = useIsMobileWidth();