diff options
author | Nate Sesti <sestinj@gmail.com> | 2023-07-28 17:38:13 -0700 |
---|---|---|
committer | Nate Sesti <sestinj@gmail.com> | 2023-07-28 17:38:13 -0700 |
commit | 374bdd037792825bf984026da12d4100ffebcac2 (patch) | |
tree | deef90b94b5c9400a8c9778fbfeca8515624605a | |
parent | cb0c815ad799050ecc0abdf3d15981e9832b9829 (diff) | |
download | sncontinue-374bdd037792825bf984026da12d4100ffebcac2.tar.gz sncontinue-374bdd037792825bf984026da12d4100ffebcac2.tar.bz2 sncontinue-374bdd037792825bf984026da12d4100ffebcac2.zip |
fix: :bug: fix incorrect imports in default config file
-rw-r--r-- | continuedev/src/continuedev/core/sdk.py | 36 | ||||
-rw-r--r-- | continuedev/src/continuedev/libs/constants/default_config.py.txt | 10 | ||||
-rw-r--r-- | continuedev/src/continuedev/libs/util/telemetry.py | 1 | ||||
-rw-r--r-- | extension/package-lock.json | 4 | ||||
-rw-r--r-- | extension/package.json | 2 |
5 files changed, 28 insertions, 25 deletions
diff --git a/continuedev/src/continuedev/core/sdk.py b/continuedev/src/continuedev/core/sdk.py index 9ee9ea06..5bb88b92 100644 --- a/continuedev/src/continuedev/core/sdk.py +++ b/continuedev/src/continuedev/core/sdk.py @@ -1,4 +1,5 @@ from functools import cached_property +import traceback from typing import Coroutine, Dict, Union import os @@ -162,11 +163,15 @@ class ContinueSDK(AbstractContinueSDK): config = sdk._load_config_dot_py() sdk.config = config except Exception as e: - logger.debug(e) - sdk.config = ContinueConfig() + logger.error(f"Failed to load config.py: {e}") + + sdk.config = ContinueConfig( + ) if sdk._last_valid_config is None else sdk._last_valid_config + + formatted_err = '\n'.join(traceback.format_exception(e)) msg_step = MessageStep( - name="Invalid Continue Config File", message=e.__repr__()) - msg_step.description = e.__repr__() + name="Invalid Continue Config File", message=formatted_err) + msg_step.description = f"Falling back to default config settings.\n```\n{formatted_err}\n```" sdk.history.add_node(HistoryNode( step=msg_step, observation=None, @@ -174,6 +179,10 @@ class ContinueSDK(AbstractContinueSDK): active=False )) + # When the config is loaded, setup posthog logger + posthog_logger.setup( + sdk.ide.unique_id, sdk.config.allow_anonymous_telemetry) + sdk.models = await Models.create(sdk) return sdk @@ -261,21 +270,14 @@ class ContinueSDK(AbstractContinueSDK): def _load_config_dot_py(self) -> ContinueConfig: # Use importlib to load the config file config.py at the given path path = getConfigFilePath() - try: - import importlib.util - spec = importlib.util.spec_from_file_location("config", path) - config = importlib.util.module_from_spec(spec) - spec.loader.exec_module(config) - self._last_valid_config = config.config - # When the config is loaded, setup posthog logger - posthog_logger.setup( - self.ide.unique_id, config.config.allow_anonymous_telemetry) + import importlib.util + spec = importlib.util.spec_from_file_location("config", path) + config = importlib.util.module_from_spec(spec) + spec.loader.exec_module(config) + self._last_valid_config = config.config - return config.config - except Exception as e: - logger.debug(f"Error loading config.py: {e}") - return ContinueConfig() if self._last_valid_config is None else self._last_valid_config + return config.config def get_code_context(self, only_editing: bool = False) -> List[RangeInFileWithContents]: highlighted_ranges = self.__autopilot.context_manager.context_providers[ diff --git a/continuedev/src/continuedev/libs/constants/default_config.py.txt b/continuedev/src/continuedev/libs/constants/default_config.py.txt index f80a9ff0..2210667d 100644 --- a/continuedev/src/continuedev/libs/constants/default_config.py.txt +++ b/continuedev/src/continuedev/libs/constants/default_config.py.txt @@ -7,11 +7,11 @@ be sure to select the Python interpreter in ~/.continue/server/env. import subprocess -from continuedev.src.continuedev.core.main import Step -from continuedev.src.continuedev.core.sdk import ContinueSDK -from continuedev.src.continuedev.core.config import CustomCommand, SlashCommand, ContinueConfig -from continuedev.src.continuedev.plugins.context_providers.github import GitHubIssuesContextProvider -from continuedev.src.continuedev.plugins.context_providers.google import GoogleContextProvider +from continuedev.core.main import Step +from continuedev.core.sdk import ContinueSDK +from continuedev.core.config import CustomCommand, SlashCommand, ContinueConfig +from continuedev.plugins.context_providers.github import GitHubIssuesContextProvider +from continuedev.plugins.context_providers.google import GoogleContextProvider class CommitMessageStep(Step): diff --git a/continuedev/src/continuedev/libs/util/telemetry.py b/continuedev/src/continuedev/libs/util/telemetry.py index 7e538c59..85aeda5e 100644 --- a/continuedev/src/continuedev/libs/util/telemetry.py +++ b/continuedev/src/continuedev/libs/util/telemetry.py @@ -21,6 +21,7 @@ class PostHogLogger: self.posthog = Posthog(self.api_key, host='https://app.posthog.com') def setup(self, unique_id: str, allow_anonymous_telemetry: bool): + logger.debug(f"Setting unique_id as {unique_id}") self.unique_id = unique_id or "NO_UNIQUE_ID" self.allow_anonymous_telemetry = allow_anonymous_telemetry or True diff --git a/extension/package-lock.json b/extension/package-lock.json index 088e114a..5bef9f73 100644 --- a/extension/package-lock.json +++ b/extension/package-lock.json @@ -1,12 +1,12 @@ { "name": "continue", - "version": "0.0.220", + "version": "0.0.221", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "continue", - "version": "0.0.220", + "version": "0.0.221", "license": "Apache-2.0", "dependencies": { "@electron/rebuild": "^3.2.10", diff --git a/extension/package.json b/extension/package.json index 903cd6ec..124402b5 100644 --- a/extension/package.json +++ b/extension/package.json @@ -14,7 +14,7 @@ "displayName": "Continue", "pricing": "Free", "description": "The open-source coding autopilot", - "version": "0.0.220", + "version": "0.0.221", "publisher": "Continue", "engines": { "vscode": "^1.67.0" |