Skip to content
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

feat:add apollo configuration to load env file #11210

Merged
merged 16 commits into from
Dec 9, 2024
Merged

feat:add apollo configuration to load env file #11210

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d3b5c66
feat:add apollo configuration to load env file
Nov 29, 2024
0faeb24
fix:ruff check error
Dec 2, 2024
41d7d54
fix:not overwrite env file
Dec 3, 2024
7736d45
fix:reformed style
Dec 4, 2024
89a2823
fix:remove
Dec 5, 2024
e4463d4
fix:apollo-config empty string changed to None
Dec 5, 2024
e4bcb9a
fix:add apollo-config Optional
Dec 5, 2024
a6c6f63
fix: wrong inherits
laipz8200 Dec 8, 2024
dd81ab5
refactor: remove ConfigurationCenterConfig from middleware
laipz8200 Dec 8, 2024
982d057
refactor: add RemoteConfigSource
laipz8200 Dec 8, 2024
6a57e9b
refactor: better way to load configs from remote sources
laipz8200 Dec 8, 2024
dc5daba
refactor: follow pydantic, rename `remote_config_source` to `remote_s…
laipz8200 Dec 8, 2024
78b8c58
fix: rename the key name in RemoteSettingsSourceFactory
laipz8200 Dec 8, 2024
920fa36
fix:ApolloClient type checking error
Dec 9, 2024
75e3e22
fix:remote_settings_sources/__init__.py style check error
Dec 9, 2024
a9823db
feat(apollo_client): put cache file under `~/.dify`
laipz8200 Dec 9, 2024
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
Prev Previous commit
Next Next commit
fix:ruff check error
  • Loading branch information
huanshare committed Dec 2, 2024
commit 0faeb24aea5401a3cd9cb9c39bc27fa6a43178cc
20 changes: 14 additions & 6 deletions api/extensions/configuration/apollo/apollo_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,16 @@
from pathlib import Path

from extensions.configuration.apollo.python_3x import http_request, makedirs_wrapper
from extensions.configuration.apollo.util import init_ip, CONFIGURATIONS, get_value_from_dict, \
no_key_cache_key, NOTIFICATION_ID, NAMESPACE_NAME, url_encode_wrapper, signature
from extensions.configuration.apollo.util import (
CONFIGURATIONS,
NAMESPACE_NAME,
NOTIFICATION_ID,
get_value_from_dict,
init_ip,
no_key_cache_key,
signature,
url_encode_wrapper,
)

logger = logging.getLogger(__name__)

Expand Down Expand Up @@ -66,7 +74,7 @@ def get_json_from_net(self, namespace='application'):
else:
return None
except Exception as e:
logger.error(str(e))
logger.exception("an error occurred in get_json_from_net")
return None

def get_value(self, key, default_val=None, namespace='application'):
Expand Down Expand Up @@ -100,8 +108,8 @@ def get_value(self, key, default_val=None, namespace='application'):
self._set_local_cache_none(namespace, key)
return default_val
except Exception as e:
logger.error("get_value has error, [key is %s], [namespace is %s], [error is %s], ",
key, namespace, e)
logger.exception("get_value has error, [key is %s], [namespace is %s]",
key, namespace)
return default_val

# Set the key of a namespace to none, and do not set default val
Expand Down Expand Up @@ -267,7 +275,7 @@ def _do_heart_beat(self, namespace):
else:
return None
except Exception as e:
logger.error(str(e))
logger.exception("an error occurred in _do_heart_beat")
return None

def get_all_dicts(self, namespace):
Expand Down
2 changes: 1 addition & 1 deletion api/extensions/configuration/apollo_configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def load_config_to_env_file(self):
# Retrieve the existing environment variables from the .env file
existing_vars = {}
if os.path.exists(env_path):
with open(env_path, 'r') as f:
with open(env_path) as f:
for line in f:
key, value = line.strip().split('=', 1)
existing_vars[key.strip()] = value.strip()
Expand Down