Skip to content

[pull] main from ERPGulf:main #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Jul 17, 2026
Merged

[pull] main from ERPGulf:main #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b6a608
refactor: replace settingsUrl with get_settings_url in multiple files
Hyrin-mansoor Jul 17, 2026
cf4e0f8
Merge pull request #96 from ERPGulf/version-2
fkalpana Jul 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions changai/changai/api/v2/clients.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from google.genai import types
from google.oauth2 import service_account
from google.api_core import exceptions as google_exceptions
from changai.changai.api.v2.schema_utils import (ChangAIConfig, CHANGAI_SETTINGS, CHANGAI_GUIDE_LINK, ERPGULF_LINK, settingsUrl)
from changai.changai.api.v2.schema_utils import (ChangAIConfig, CHANGAI_SETTINGS, CHANGAI_GUIDE_LINK, ERPGULF_LINK, get_settings_url)
_GEMINI_CLIENT = None
_GEMINI_CONFIG = None
APPLICATION_JSON = "application/json"
Expand Down Expand Up @@ -67,22 +67,22 @@ def _throw_missing_vertex_field(project_id: str, location: str, credentials_json
frappe.throw(
_("Gemini Project ID is missing.<br><br>Please <b> <a href='{1}' target='_blank' rel='noopener noreferrer' style='color: #1e90ff;'>Go to Settings Page</a> </b> and enter your <b>Gemini Project ID</b>.<br>"
"Check Quick Start Guide 👇:<br><a href='{0}' target='_blank'>Click here</a><br>"
"<a href='{2}' target='_blank' rel='noopener noreferrer' style='color: #1e90ff;'>ERPGulf.com</a></b>.").format(CHANGAI_GUIDE_LINK,settingsUrl,ERPGULF_LINK),
"<a href='{2}' target='_blank' rel='noopener noreferrer' style='color: #1e90ff;'>ERPGulf.com</a></b>.").format(CHANGAI_GUIDE_LINK,get_settings_url(),ERPGULF_LINK),
title=_("Missing Gemini Project ID"),
)
if not location:
frappe.throw(
_("Gemini Location is missing.<br><br>Please <b><a href='{1}' target='_blank' rel='noopener noreferrer' style='color: #1e90ff;'>Go to Settings Page</a></b> and enter your <b>Gemini Location</b>.<br>"
"Check Quick Start Guide 👇:<br><a href='{0}' target='_blank'>Click here</a><br>"
"<a href='{2}' target='_blank' rel='noopener noreferrer' style='color: #1e90ff;'>ERPGulf.com</a></b>.").format(CHANGAI_GUIDE_LINK,settingsUrl,ERPGULF_LINK),
"<a href='{2}' target='_blank' rel='noopener noreferrer' style='color: #1e90ff;'>ERPGulf.com</a></b>.").format(CHANGAI_GUIDE_LINK,get_settings_url(),ERPGULF_LINK),
title=_("Missing Gemini Location"),
)
if not credentials_json:
frappe.throw(
_("Service Account Credentials are missing.<br><br>Please <b><a href='{1}' target='_blank' rel='noopener noreferrer' style='color: #1e90ff;'>Go to Settings Page</a></b> and enter your <b>Service Account Credential</b>.<br>"
"Check Quick Start Guide 👇:<br><a href='{0}' target='_blank'>Click here</a>"
"<a href='{2}' target='_blank' rel='noopener noreferrer' style='color: #1e90ff;'>ERPGulf.com</a></b>."
).format(CHANGAI_GUIDE_LINK,settingsUrl,ERPGULF_LINK),
).format(CHANGAI_GUIDE_LINK,get_settings_url(),ERPGULF_LINK),
title=_("Missing Service Account Credentials"),
)

Expand Down Expand Up @@ -110,7 +110,7 @@ def _get_api_key_client(config):
"<a href='{0}' target='_blank' rel='noopener noreferrer' style='color: #1e90ff;'>Click here</a><br>"
"<a href='{2}' target='_blank' rel='noopener noreferrer' style='color: #1e90ff;'>ERPGulf.com</a></b>."

).format(CHANGAI_GUIDE_LINK,settingsUrl,ERPGULF_LINK),
).format(CHANGAI_GUIDE_LINK,get_settings_url(),ERPGULF_LINK),
title=_("Gemini Authentication Not Configured"),
)

Expand Down
Binary file modified changai/changai/api/v2/fvs_stores/erpnext/emb_dir/field_docs.pkl
View file
Open in desktop
Binary file not shown.
Binary file modified changai/changai/api/v2/fvs_stores/erpnext/report_fvs/index.faiss
View file
Open in desktop
Binary file not shown.
Binary file modified changai/changai/api/v2/fvs_stores/erpnext/report_fvs/index.pkl
View file
Open in desktop
Binary file not shown.
Binary file modified changai/changai/api/v2/fvs_stores/erpnext/table_fvs/index.faiss
View file
Open in desktop
Binary file not shown.
Binary file modified changai/changai/api/v2/fvs_stores/erpnext/table_fvs/index.pkl
View file
Open in desktop
Binary file not shown.
8 changes: 4 additions & 4 deletions changai/changai/api/v2/retrieve.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
ChangAIConfig,
CHANGAI_GUIDE_LINK,
ERPGULF_LINK,
settingsUrl,
get_settings_url,
format_schema_context,
publish_pipeline_update,
_safe_join,
Expand Down Expand Up @@ -103,7 +103,7 @@ def download_model_from_ui():
frappe.throw(_("Model download failed: {0}\n Check Quick Start Guide Here 👇:\n{1} <br>"
"<a href='{1}' target='_blank' rel='noopener noreferrer' style='color: #1e90ff;'>Download Embedding Model</a></b>.<br>"
"<a href='{2}' target='_blank' rel='noopener noreferrer' style='color: #1e90ff;'>ERPGulf.com</a></b>."
).format(str(e),CHANGAI_GUIDE_LINK,settingsUrl,ERPGULF_LINK))
).format(str(e),CHANGAI_GUIDE_LINK,get_settings_url(),ERPGULF_LINK))



Expand Down Expand Up @@ -158,7 +158,7 @@ def get_embedding_engine():
"<a href='{0}' target='_blank' rel='noopener noreferrer' style='color: #1e90ff;'>Click here</a>"
"<a href='{2}' target='_blank' rel='noopener noreferrer' style='color: #1e90ff;'>ERPGulf.com</a></b>."

).format(CHANGAI_GUIDE_LINK,settingsUrl,ERPGULF_LINK),
).format(CHANGAI_GUIDE_LINK,get_settings_url(),ERPGULF_LINK),
title=_("Embedding Model Required")
)

Expand Down Expand Up @@ -245,7 +245,7 @@ def get_master_vs():

).format(
master_vs_path,
settingsUrl,
get_settings_url(),
CHANGAI_GUIDE_LINK,
ERPGULF_LINK
))
Expand Down
12 changes: 9 additions & 3 deletions changai/changai/api/v2/schema_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
_VALUE_TO_FIELD = {}
CHANGAI_GUIDE_LINK="https://app.erpgulf.com/en/articles/chang-ai-quick-start-guide"
ERPGULF_LINK = "https://app.erpgulf.com/en/products/chang-ai-an-ai-agent"
settingsUrl = frappe.utils.get_url(
"/app/changai-settings/ChangAI%20Settings"
)
# settingsUrl = frappe.utils.get_url(
# "/app/changai-settings/ChangAI%20Settings"
# )
CHANGAI_SETTINGS = "ChangAI Settings"
_ASSETS_DIR = Path(frappe.get_app_path("changai", "changai", "api", "v2", "assets")).resolve()
_PROMPTS_DIR = Path(frappe.get_app_path("changai", "changai", "prompts")).resolve()
Expand All @@ -30,7 +30,13 @@
JSON_EXT = ".json"
YAML_EXT = ".yaml"

_settings_url = None

def get_settings_url():
global _settings_url
if _settings_url is None:
_settings_url = frappe.utils.get_url("/app/changai-settings/ChangAI%20Settings")
return _settings_url

def get_report_filter_fields(report_name: str):
try:
Expand Down
6 changes: 3 additions & 3 deletions changai/changai/api/v2/text2sql_pipeline_v2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
hits_to_schema_context,
CHANGAI_GUIDE_LINK,
ERPGULF_LINK,
settingsUrl,
get_settings_url,
publish_pipeline_update,
ChangAIConfig
)
Expand Down Expand Up @@ -544,7 +544,7 @@ def check_update(res:dict):
"Check Quick Start Guide Here 👇:<br>"
"<a href='{1}' target='_blank' rel='noopener noreferrer' style='color: #1e90ff;'>Click here</a><br>"
"<a href='{2}' target='_blank' rel='noopener noreferrer' style='color:#1e90ff;'>ERPGulf.com</a>"
).format(settingsUrl, CHANGAI_GUIDE_LINK, ERPGULF_LINK))
).format(get_settings_url(), CHANGAI_GUIDE_LINK, ERPGULF_LINK))

if res.get("is_stale"):
frappe.throw(_(
Expand All @@ -556,7 +556,7 @@ def check_update(res:dict):
"Check Quick Start Guide Here 👇:<br>"
"<a href='{2}' target='_blank' rel='noopener noreferrer' style='color: #1e90ff;'>Click here</a><br>"
"<a href='{3}' target='_blank' rel='noopener noreferrer' style='color:#1e90ff;'>ERPGulf.com</a>"
).format(res.get("days"), settingsUrl, CHANGAI_GUIDE_LINK, ERPGULF_LINK))
).format(res.get("days"), get_settings_url(), CHANGAI_GUIDE_LINK, ERPGULF_LINK))

def generate_orm(state: SQLState) -> SQLState:
from changai.changai.api.v2.auto_gen_api import update_masterdata
Expand Down
Loading