diff options
author | Nate Sesti <sestinj@gmail.com> | 2023-07-23 13:20:33 -0700 |
---|---|---|
committer | Nate Sesti <sestinj@gmail.com> | 2023-07-23 13:20:33 -0700 |
commit | f7a72cbb9c5993788378c6dd1363116b8e145ad1 (patch) | |
tree | 11f5e87271407bc2847e917e61f1f3422a10d39a /continuedev | |
parent | 986e3c57a0e3a9c71e6bff5488d1bcda80cbf4c6 (diff) | |
download | sncontinue-f7a72cbb9c5993788378c6dd1363116b8e145ad1.tar.gz sncontinue-f7a72cbb9c5993788378c6dd1363116b8e145ad1.tar.bz2 sncontinue-f7a72cbb9c5993788378c6dd1363116b8e145ad1.zip |
refactoring
Diffstat (limited to 'continuedev')
-rw-r--r-- | continuedev/src/continuedev/core/autopilot.py | 2 | ||||
-rw-r--r-- | continuedev/src/continuedev/core/policy.py | 10 | ||||
-rw-r--r-- | continuedev/src/continuedev/core/sdk.py | 4 | ||||
-rw-r--r-- | continuedev/src/continuedev/libs/util/step_name_to_steps.py | 26 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/recipes/AddTransformRecipe/README.md (renamed from continuedev/src/continuedev/recipes/AddTransformRecipe/README.md) | 0 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/recipes/AddTransformRecipe/dlt_transform_docs.md (renamed from continuedev/src/continuedev/recipes/AddTransformRecipe/dlt_transform_docs.md) | 0 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/recipes/AddTransformRecipe/main.py (renamed from continuedev/src/continuedev/recipes/AddTransformRecipe/main.py) | 8 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/recipes/AddTransformRecipe/steps.py (renamed from continuedev/src/continuedev/recipes/AddTransformRecipe/steps.py) | 12 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/recipes/ContinueRecipeRecipe/README.md (renamed from continuedev/src/continuedev/recipes/ContinueRecipeRecipe/README.md) | 0 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/recipes/ContinueRecipeRecipe/main.py (renamed from continuedev/src/continuedev/recipes/ContinueRecipeRecipe/main.py) | 7 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/recipes/CreatePipelineRecipe/README.md (renamed from continuedev/src/continuedev/recipes/CreatePipelineRecipe/README.md) | 0 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/recipes/CreatePipelineRecipe/main.py (renamed from continuedev/src/continuedev/recipes/CreatePipelineRecipe/main.py) | 8 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/recipes/CreatePipelineRecipe/steps.py (renamed from continuedev/src/continuedev/recipes/CreatePipelineRecipe/steps.py) | 14 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/recipes/DDtoBQRecipe/README.md (renamed from continuedev/src/continuedev/recipes/DDtoBQRecipe/README.md) | 0 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/recipes/DDtoBQRecipe/dlt_duckdb_to_bigquery_docs.md (renamed from continuedev/src/continuedev/recipes/DDtoBQRecipe/dlt_duckdb_to_bigquery_docs.md) | 0 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/recipes/DDtoBQRecipe/main.py (renamed from continuedev/src/continuedev/recipes/DDtoBQRecipe/main.py) | 7 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/recipes/DDtoBQRecipe/steps.py (renamed from continuedev/src/continuedev/recipes/DDtoBQRecipe/steps.py) | 18 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/recipes/DeployPipelineAirflowRecipe/README.md (renamed from continuedev/src/continuedev/recipes/DeployPipelineAirflowRecipe/README.md) | 0 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/recipes/DeployPipelineAirflowRecipe/main.py (renamed from continuedev/src/continuedev/recipes/DeployPipelineAirflowRecipe/main.py) | 9 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/recipes/DeployPipelineAirflowRecipe/steps.py (renamed from continuedev/src/continuedev/recipes/DeployPipelineAirflowRecipe/steps.py) | 21 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/recipes/README.md (renamed from continuedev/src/continuedev/recipes/README.md) | 2 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/recipes/TemplateRecipe/README.md (renamed from continuedev/src/continuedev/recipes/TemplateRecipe/README.md) | 0 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/recipes/TemplateRecipe/main.py (renamed from continuedev/src/continuedev/recipes/TemplateRecipe/main.py) | 4 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/recipes/WritePytestsRecipe/README.md (renamed from continuedev/src/continuedev/recipes/WritePytestsRecipe/README.md) | 0 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/recipes/WritePytestsRecipe/main.py (renamed from continuedev/src/continuedev/recipes/WritePytestsRecipe/main.py) | 5 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/steps/README.md (renamed from continuedev/src/continuedev/steps/README.md) | 0 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/steps/__init__.py (renamed from continuedev/src/continuedev/steps/__init__.py) | 0 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/steps/chat.py (renamed from continuedev/src/continuedev/steps/chat.py) | 8 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/steps/chroma.py (renamed from continuedev/src/continuedev/steps/chroma.py) | 8 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/steps/clear_history.py (renamed from continuedev/src/continuedev/steps/clear_history.py) | 4 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/steps/comment_code.py (renamed from continuedev/src/continuedev/steps/comment_code.py) | 2 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/steps/core/core.py (renamed from continuedev/src/continuedev/steps/core/core.py) | 18 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/steps/custom_command.py (renamed from continuedev/src/continuedev/steps/custom_command.py) | 6 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/steps/draft/abstract_method.py (renamed from continuedev/src/continuedev/steps/draft/abstract_method.py) | 0 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/steps/draft/migration.py (renamed from continuedev/src/continuedev/steps/draft/migration.py) | 2 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/steps/draft/redux.py (renamed from continuedev/src/continuedev/steps/draft/redux.py) | 8 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/steps/draft/typeorm.py (renamed from continuedev/src/continuedev/steps/draft/typeorm.py) | 4 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/steps/feedback.py (renamed from continuedev/src/continuedev/steps/feedback.py) | 8 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/steps/find_and_replace.py (renamed from continuedev/src/continuedev/steps/find_and_replace.py) | 6 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/steps/help.py (renamed from continuedev/src/continuedev/steps/help.py) | 6 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/steps/input/nl_multiselect.py (renamed from continuedev/src/continuedev/steps/input/nl_multiselect.py) | 4 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/steps/main.py (renamed from continuedev/src/continuedev/steps/main.py) | 26 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/steps/on_traceback.py (renamed from continuedev/src/continuedev/steps/on_traceback.py) | 4 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/steps/open_config.py (renamed from continuedev/src/continuedev/steps/open_config.py) | 4 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/steps/react.py (renamed from continuedev/src/continuedev/steps/react.py) | 5 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/steps/search_directory.py (renamed from continuedev/src/continuedev/steps/search_directory.py) | 10 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/steps/steps_on_startup.py | 17 | ||||
-rw-r--r-- | continuedev/src/continuedev/plugins/steps/welcome.py (renamed from continuedev/src/continuedev/steps/welcome.py) | 7 | ||||
-rw-r--r-- | continuedev/src/continuedev/steps/steps_on_startup.py | 23 |
49 files changed, 154 insertions, 183 deletions
diff --git a/continuedev/src/continuedev/core/autopilot.py b/continuedev/src/continuedev/core/autopilot.py index afbfc7ed..ecc587ce 100644 --- a/continuedev/src/continuedev/core/autopilot.py +++ b/continuedev/src/continuedev/core/autopilot.py @@ -13,7 +13,7 @@ from ..server.ide_protocol import AbstractIdeProtocolServer from ..libs.util.queue import AsyncSubscriptionQueue from ..models.main import ContinueBaseModel from .main import Context, ContinueCustomException, HighlightedRangeContext, Policy, History, FullState, Step, HistoryNode -from ..steps.core.core import ReversibleStep, ManualEditStep, UserInputStep +from ..plugins.steps.core.core import ReversibleStep, ManualEditStep, UserInputStep from ..libs.util.telemetry import capture_event from .sdk import ContinueSDK from ..libs.util.step_name_to_steps import get_step_from_name diff --git a/continuedev/src/continuedev/core/policy.py b/continuedev/src/continuedev/core/policy.py index 05f03bdc..dfa0e7f9 100644 --- a/continuedev/src/continuedev/core/policy.py +++ b/continuedev/src/continuedev/core/policy.py @@ -1,15 +1,15 @@ from textwrap import dedent from typing import Union -from ..steps.chat import SimpleChatStep -from ..steps.welcome import WelcomeStep +from ..plugins.steps.chat import SimpleChatStep +from ..plugins.steps.welcome import WelcomeStep from .config import ContinueConfig -from ..steps.steps_on_startup import StepsOnStartupStep +from ..plugins.steps.steps_on_startup import StepsOnStartupStep from .main import Step, History, Policy from .observation import UserInputObservation -from ..steps.core.core import MessageStep +from ..plugins.steps.core.core import MessageStep from ..libs.util.step_name_to_steps import get_step_from_name -from ..steps.custom_command import CustomCommandStep +from ..plugins.steps.custom_command import CustomCommandStep def parse_slash_command(inp: str, config: ContinueConfig) -> Union[None, Step]: diff --git a/continuedev/src/continuedev/core/sdk.py b/continuedev/src/continuedev/core/sdk.py index 37a51efa..9d1025e3 100644 --- a/continuedev/src/continuedev/core/sdk.py +++ b/continuedev/src/continuedev/core/sdk.py @@ -3,7 +3,7 @@ from functools import cached_property from typing import Coroutine, Dict, Union import os -from ..steps.core.core import DefaultModelEditCodeStep +from ..plugins.steps.core.core import DefaultModelEditCodeStep from ..models.main import Range from .abstract_sdk import AbstractContinueSDK from .config import ContinueConfig, load_config, load_global_config, update_global_config @@ -16,7 +16,7 @@ from ..libs.llm.ggml import GGML from .observation import Observation from ..server.ide_protocol import AbstractIdeProtocolServer from .main import Context, ContinueCustomException, History, HistoryNode, Step, ChatMessage -from ..steps.core.core import * +from ..plugins.steps.core.core import * from ..libs.llm.proxy_server import ProxyServer diff --git a/continuedev/src/continuedev/libs/util/step_name_to_steps.py b/continuedev/src/continuedev/libs/util/step_name_to_steps.py index 49056c81..baa25da6 100644 --- a/continuedev/src/continuedev/libs/util/step_name_to_steps.py +++ b/continuedev/src/continuedev/libs/util/step_name_to_steps.py @@ -1,19 +1,19 @@ from typing import Dict from ...core.main import Step -from ...steps.core.core import UserInputStep -from ...steps.main import EditHighlightedCodeStep -from ...steps.chat import SimpleChatStep -from ...steps.comment_code import CommentCodeStep -from ...steps.feedback import FeedbackStep -from ...recipes.AddTransformRecipe.main import AddTransformRecipe -from ...recipes.CreatePipelineRecipe.main import CreatePipelineRecipe -from ...recipes.DDtoBQRecipe.main import DDtoBQRecipe -from ...recipes.DeployPipelineAirflowRecipe.main import DeployPipelineAirflowRecipe -from ...steps.on_traceback import DefaultOnTracebackStep -from ...steps.clear_history import ClearHistoryStep -from ...steps.open_config import OpenConfigStep -from ...steps.help import HelpStep +from ...plugins.steps.core.core import UserInputStep +from ...plugins.steps.main import EditHighlightedCodeStep +from ...plugins.steps.chat import SimpleChatStep +from ...plugins.steps.comment_code import CommentCodeStep +from ...plugins.steps.feedback import FeedbackStep +from ...plugins.recipes.AddTransformRecipe.main import AddTransformRecipe +from ...plugins.recipes.CreatePipelineRecipe.main import CreatePipelineRecipe +from ...plugins.recipes.DDtoBQRecipe.main import DDtoBQRecipe +from ...plugins.recipes.DeployPipelineAirflowRecipe.main import DeployPipelineAirflowRecipe +from ...plugins.steps.on_traceback import DefaultOnTracebackStep +from ...plugins.steps.clear_history import ClearHistoryStep +from ...plugins.steps.open_config import OpenConfigStep +from ...plugins.steps.help import HelpStep # This mapping is used to convert from string in ContinueConfig json to corresponding Step class. # Used for example in slash_commands and steps_on_startup diff --git a/continuedev/src/continuedev/recipes/AddTransformRecipe/README.md b/continuedev/src/continuedev/plugins/recipes/AddTransformRecipe/README.md index d735e0cd..d735e0cd 100644 --- a/continuedev/src/continuedev/recipes/AddTransformRecipe/README.md +++ b/continuedev/src/continuedev/plugins/recipes/AddTransformRecipe/README.md diff --git a/continuedev/src/continuedev/recipes/AddTransformRecipe/dlt_transform_docs.md b/continuedev/src/continuedev/plugins/recipes/AddTransformRecipe/dlt_transform_docs.md index 658b285f..658b285f 100644 --- a/continuedev/src/continuedev/recipes/AddTransformRecipe/dlt_transform_docs.md +++ b/continuedev/src/continuedev/plugins/recipes/AddTransformRecipe/dlt_transform_docs.md diff --git a/continuedev/src/continuedev/recipes/AddTransformRecipe/main.py b/continuedev/src/continuedev/plugins/recipes/AddTransformRecipe/main.py index fdd343f5..5d242f7c 100644 --- a/continuedev/src/continuedev/recipes/AddTransformRecipe/main.py +++ b/continuedev/src/continuedev/plugins/recipes/AddTransformRecipe/main.py @@ -1,9 +1,9 @@ from textwrap import dedent -from ...core.main import Step -from ...core.sdk import ContinueSDK -from ...steps.core.core import WaitForUserInputStep -from ...steps.core.core import MessageStep +from ....core.main import Step +from ....core.sdk import ContinueSDK +from ....plugins.steps.core.core import WaitForUserInputStep +from ....plugins.steps.core.core import MessageStep from .steps import SetUpChessPipelineStep, AddTransformStep diff --git a/continuedev/src/continuedev/recipes/AddTransformRecipe/steps.py b/continuedev/src/continuedev/plugins/recipes/AddTransformRecipe/steps.py index 9744146c..8c6446da 100644 --- a/continuedev/src/continuedev/recipes/AddTransformRecipe/steps.py +++ b/continuedev/src/continuedev/plugins/recipes/AddTransformRecipe/steps.py @@ -1,14 +1,10 @@ import os from textwrap import dedent -from ...models.main import Range -from ...models.filesystem import RangeInFile -from ...steps.core.core import MessageStep -from ...core.sdk import Models -from ...core.observation import DictObservation -from ...models.filesystem_edit import AddFile -from ...core.main import Step -from ...core.sdk import ContinueSDK +from ....plugins.steps.core.core import MessageStep +from ....core.sdk import Models +from ....core.main import Step +from ....core.sdk import ContinueSDK AI_ASSISTED_STRING = "(✨ AI-Assisted ✨)" diff --git a/continuedev/src/continuedev/recipes/ContinueRecipeRecipe/README.md b/continuedev/src/continuedev/plugins/recipes/ContinueRecipeRecipe/README.md index df66104f..df66104f 100644 --- a/continuedev/src/continuedev/recipes/ContinueRecipeRecipe/README.md +++ b/continuedev/src/continuedev/plugins/recipes/ContinueRecipeRecipe/README.md diff --git a/continuedev/src/continuedev/recipes/ContinueRecipeRecipe/main.py b/continuedev/src/continuedev/plugins/recipes/ContinueRecipeRecipe/main.py index 953fb0c2..c0f9e7e3 100644 --- a/continuedev/src/continuedev/recipes/ContinueRecipeRecipe/main.py +++ b/continuedev/src/continuedev/plugins/recipes/ContinueRecipeRecipe/main.py @@ -1,8 +1,7 @@ from textwrap import dedent -from ...models.filesystem import RangeInFile -from ...steps.main import EditHighlightedCodeStep -from ...core.main import Step -from ...core.sdk import ContinueSDK +from ....plugins.steps.main import EditHighlightedCodeStep +from ....core.main import Step +from ....core.sdk import ContinueSDK class ContinueStepStep(Step): diff --git a/continuedev/src/continuedev/recipes/CreatePipelineRecipe/README.md b/continuedev/src/continuedev/plugins/recipes/CreatePipelineRecipe/README.md index e69de29b..e69de29b 100644 --- a/continuedev/src/continuedev/recipes/CreatePipelineRecipe/README.md +++ b/continuedev/src/continuedev/plugins/recipes/CreatePipelineRecipe/README.md diff --git a/continuedev/src/continuedev/recipes/CreatePipelineRecipe/main.py b/continuedev/src/continuedev/plugins/recipes/CreatePipelineRecipe/main.py index 55ef107b..84363e02 100644 --- a/continuedev/src/continuedev/recipes/CreatePipelineRecipe/main.py +++ b/continuedev/src/continuedev/plugins/recipes/CreatePipelineRecipe/main.py @@ -1,9 +1,9 @@ from textwrap import dedent -from ...core.sdk import ContinueSDK -from ...core.main import Step -from ...steps.core.core import WaitForUserInputStep -from ...steps.core.core import MessageStep +from ....core.sdk import ContinueSDK +from ....core.main import Step +from ....plugins.steps.core.core import WaitForUserInputStep +from ....plugins.steps.core.core import MessageStep from .steps import SetupPipelineStep, ValidatePipelineStep, RunQueryStep diff --git a/continuedev/src/continuedev/recipes/CreatePipelineRecipe/steps.py b/continuedev/src/continuedev/plugins/recipes/CreatePipelineRecipe/steps.py index 60218ef9..433e309e 100644 --- a/continuedev/src/continuedev/recipes/CreatePipelineRecipe/steps.py +++ b/continuedev/src/continuedev/plugins/recipes/CreatePipelineRecipe/steps.py @@ -1,15 +1,13 @@ import os -import subprocess from textwrap import dedent import time -from ...models.main import Range -from ...models.filesystem import RangeInFile -from ...steps.core.core import MessageStep -from ...core.observation import DictObservation, InternalErrorObservation -from ...models.filesystem_edit import AddFile, FileEdit -from ...core.main import Step -from ...core.sdk import ContinueSDK, Models +from ....models.main import Range +from ....models.filesystem import RangeInFile +from ....plugins.steps.core.core import MessageStep +from ....models.filesystem_edit import AddFile, FileEdit +from ....core.main import Step +from ....core.sdk import ContinueSDK, Models AI_ASSISTED_STRING = "(✨ AI-Assisted ✨)" diff --git a/continuedev/src/continuedev/recipes/DDtoBQRecipe/README.md b/continuedev/src/continuedev/plugins/recipes/DDtoBQRecipe/README.md index c4981e56..c4981e56 100644 --- a/continuedev/src/continuedev/recipes/DDtoBQRecipe/README.md +++ b/continuedev/src/continuedev/plugins/recipes/DDtoBQRecipe/README.md diff --git a/continuedev/src/continuedev/recipes/DDtoBQRecipe/dlt_duckdb_to_bigquery_docs.md b/continuedev/src/continuedev/plugins/recipes/DDtoBQRecipe/dlt_duckdb_to_bigquery_docs.md index eb68e117..eb68e117 100644 --- a/continuedev/src/continuedev/recipes/DDtoBQRecipe/dlt_duckdb_to_bigquery_docs.md +++ b/continuedev/src/continuedev/plugins/recipes/DDtoBQRecipe/dlt_duckdb_to_bigquery_docs.md diff --git a/continuedev/src/continuedev/recipes/DDtoBQRecipe/main.py b/continuedev/src/continuedev/plugins/recipes/DDtoBQRecipe/main.py index 1ae84310..5b6aa8f0 100644 --- a/continuedev/src/continuedev/recipes/DDtoBQRecipe/main.py +++ b/continuedev/src/continuedev/plugins/recipes/DDtoBQRecipe/main.py @@ -1,9 +1,8 @@ from textwrap import dedent -from ...core.main import Step -from ...core.sdk import ContinueSDK -from ...steps.core.core import WaitForUserInputStep -from ...steps.core.core import MessageStep +from ....core.main import Step +from ....core.sdk import ContinueSDK +from ....plugins.steps.core.core import MessageStep from .steps import SetUpChessPipelineStep, SwitchDestinationStep, LoadDataStep # Based on the following guide: diff --git a/continuedev/src/continuedev/recipes/DDtoBQRecipe/steps.py b/continuedev/src/continuedev/plugins/recipes/DDtoBQRecipe/steps.py index df414e2e..767936b8 100644 --- a/continuedev/src/continuedev/recipes/DDtoBQRecipe/steps.py +++ b/continuedev/src/continuedev/plugins/recipes/DDtoBQRecipe/steps.py @@ -1,17 +1,11 @@ import os -import subprocess from textwrap import dedent -import time - -from ...steps.find_and_replace import FindAndReplaceStep -from ...models.main import Range -from ...models.filesystem import RangeInFile -from ...steps.core.core import MessageStep -from ...core.sdk import Models -from ...core.observation import DictObservation, InternalErrorObservation -from ...models.filesystem_edit import AddFile, FileEdit -from ...core.main import Step -from ...core.sdk import ContinueSDK + +from ....plugins.steps.find_and_replace import FindAndReplaceStep +from ....plugins.steps.core.core import MessageStep +from ....core.sdk import Models +from ....core.main import Step +from ....core.sdk import ContinueSDK AI_ASSISTED_STRING = "(✨ AI-Assisted ✨)" diff --git a/continuedev/src/continuedev/recipes/DeployPipelineAirflowRecipe/README.md b/continuedev/src/continuedev/plugins/recipes/DeployPipelineAirflowRecipe/README.md index e69de29b..e69de29b 100644 --- a/continuedev/src/continuedev/recipes/DeployPipelineAirflowRecipe/README.md +++ b/continuedev/src/continuedev/plugins/recipes/DeployPipelineAirflowRecipe/README.md diff --git a/continuedev/src/continuedev/recipes/DeployPipelineAirflowRecipe/main.py b/continuedev/src/continuedev/plugins/recipes/DeployPipelineAirflowRecipe/main.py index 2a3e3566..54cba45f 100644 --- a/continuedev/src/continuedev/recipes/DeployPipelineAirflowRecipe/main.py +++ b/continuedev/src/continuedev/plugins/recipes/DeployPipelineAirflowRecipe/main.py @@ -1,10 +1,9 @@ from textwrap import dedent -from ...steps.input.nl_multiselect import NLMultiselectStep -from ...core.main import Step -from ...core.sdk import ContinueSDK -from ...steps.core.core import WaitForUserInputStep -from ...steps.core.core import MessageStep +from ....plugins.steps.input.nl_multiselect import NLMultiselectStep +from ....core.main import Step +from ....core.sdk import ContinueSDK +from ....plugins.steps.core.core import MessageStep from .steps import SetupPipelineStep, DeployAirflowStep, RunPipelineStep diff --git a/continuedev/src/continuedev/recipes/DeployPipelineAirflowRecipe/steps.py b/continuedev/src/continuedev/plugins/recipes/DeployPipelineAirflowRecipe/steps.py index d9bdbc0a..83067d52 100644 --- a/continuedev/src/continuedev/recipes/DeployPipelineAirflowRecipe/steps.py +++ b/continuedev/src/continuedev/plugins/recipes/DeployPipelineAirflowRecipe/steps.py @@ -1,18 +1,11 @@ import os -import subprocess from textwrap import dedent -import time - -from ...steps.core.core import WaitForUserInputStep -from ...models.main import Range -from ...models.filesystem import RangeInFile -from ...steps.core.core import MessageStep -from ...core.sdk import Models -from ...core.observation import DictObservation, InternalErrorObservation -from ...models.filesystem_edit import AddFile, FileEdit -from ...core.main import Step -from ...core.sdk import ContinueSDK -from ...steps.find_and_replace import FindAndReplaceStep + +from ....plugins.steps.core.core import MessageStep +from ....core.sdk import Models +from ....core.main import Step +from ....core.sdk import ContinueSDK +from ....plugins.steps.find_and_replace import FindAndReplaceStep AI_ASSISTED_STRING = "(✨ AI-Assisted ✨)" @@ -93,5 +86,3 @@ class DeployAirflowStep(Step): # Tell the user to check the schedule and fill in owner, email, other default_args await sdk.run_step(MessageStep(message="Fill in the owner, email, and other default_args in the DAG file with your own personal information. Then the DAG will be ready to run!", name="Fill in default_args")) - - # Run the DAG locally ?? diff --git a/continuedev/src/continuedev/recipes/README.md b/continuedev/src/continuedev/plugins/recipes/README.md index d5a006fb..9860b0e2 100644 --- a/continuedev/src/continuedev/recipes/README.md +++ b/continuedev/src/continuedev/plugins/recipes/README.md @@ -1,5 +1,7 @@ # This is a collaborative collection of Continue recipes +A recipe is technically just a [Step](../steps/README.md), but is intended to be more complex, composed of multiple sub-steps. + Recipes here will automatically be made available in the [Continue VS Code extension](https://marketplace.visualstudio.com/items?itemName=Continue.continue). The `recipes` folder contains all recipes, each with the same structure. **If you wish to create your own recipe, please do the following:** diff --git a/continuedev/src/continuedev/recipes/TemplateRecipe/README.md b/continuedev/src/continuedev/plugins/recipes/TemplateRecipe/README.md index 91d1123b..91d1123b 100644 --- a/continuedev/src/continuedev/recipes/TemplateRecipe/README.md +++ b/continuedev/src/continuedev/plugins/recipes/TemplateRecipe/README.md diff --git a/continuedev/src/continuedev/recipes/TemplateRecipe/main.py b/continuedev/src/continuedev/plugins/recipes/TemplateRecipe/main.py index 16132cfd..197abe85 100644 --- a/continuedev/src/continuedev/recipes/TemplateRecipe/main.py +++ b/continuedev/src/continuedev/plugins/recipes/TemplateRecipe/main.py @@ -1,5 +1,7 @@ from typing import Coroutine -from continuedev.core import Step, ContinueSDK, Observation, Models +from ....core.main import Step, Observation +from ....core.sdk import ContinueSDK +from ....core.sdk import Models class TemplateRecipe(Step): diff --git a/continuedev/src/continuedev/recipes/WritePytestsRecipe/README.md b/continuedev/src/continuedev/plugins/recipes/WritePytestsRecipe/README.md index 5ce33ecb..5ce33ecb 100644 --- a/continuedev/src/continuedev/recipes/WritePytestsRecipe/README.md +++ b/continuedev/src/continuedev/plugins/recipes/WritePytestsRecipe/README.md diff --git a/continuedev/src/continuedev/recipes/WritePytestsRecipe/main.py b/continuedev/src/continuedev/plugins/recipes/WritePytestsRecipe/main.py index c7a65fa6..6ef5ffd6 100644 --- a/continuedev/src/continuedev/recipes/WritePytestsRecipe/main.py +++ b/continuedev/src/continuedev/plugins/recipes/WritePytestsRecipe/main.py @@ -1,7 +1,8 @@ from textwrap import dedent from typing import Union -from ...models.filesystem_edit import AddDirectory, AddFile -from ...core.main import Step, ContinueSDK +from ....models.filesystem_edit import AddDirectory, AddFile +from ....core.main import Step +from ....core.sdk import ContinueSDK import os diff --git a/continuedev/src/continuedev/steps/README.md b/continuedev/src/continuedev/plugins/steps/README.md index 12073835..12073835 100644 --- a/continuedev/src/continuedev/steps/README.md +++ b/continuedev/src/continuedev/plugins/steps/README.md diff --git a/continuedev/src/continuedev/steps/__init__.py b/continuedev/src/continuedev/plugins/steps/__init__.py index 8b137891..8b137891 100644 --- a/continuedev/src/continuedev/steps/__init__.py +++ b/continuedev/src/continuedev/plugins/steps/__init__.py diff --git a/continuedev/src/continuedev/steps/chat.py b/continuedev/src/continuedev/plugins/steps/chat.py index aade1ea1..2c662459 100644 --- a/continuedev/src/continuedev/steps/chat.py +++ b/continuedev/src/continuedev/plugins/steps/chat.py @@ -3,12 +3,12 @@ from typing import Any, Coroutine, List from pydantic import Field -from ..libs.util.strings import remove_quotes_and_escapes +from ...libs.util.strings import remove_quotes_and_escapes from .main import EditHighlightedCodeStep from .core.core import MessageStep -from ..core.main import FunctionCall, Models -from ..core.main import ChatMessage, Step, step_to_json_schema -from ..core.sdk import ContinueSDK +from ...core.main import FunctionCall, Models +from ...core.main import ChatMessage, Step, step_to_json_schema +from ...core.sdk import ContinueSDK import openai import os from dotenv import load_dotenv diff --git a/continuedev/src/continuedev/steps/chroma.py b/continuedev/src/continuedev/plugins/steps/chroma.py index 9d085981..dbe8363e 100644 --- a/continuedev/src/continuedev/steps/chroma.py +++ b/continuedev/src/continuedev/plugins/steps/chroma.py @@ -1,10 +1,10 @@ from textwrap import dedent from typing import Coroutine, Union -from ..core.observation import Observation, TextObservation -from ..core.main import Step -from ..core.sdk import ContinueSDK +from ...core.observation import Observation, TextObservation +from ...core.main import Step +from ...core.sdk import ContinueSDK from .core.core import EditFileStep -from ..libs.chroma.query import ChromaIndexManager +from ...libs.chroma.query import ChromaIndexManager from .core.core import EditFileStep diff --git a/continuedev/src/continuedev/steps/clear_history.py b/continuedev/src/continuedev/plugins/steps/clear_history.py index a875c6d3..8f21518b 100644 --- a/continuedev/src/continuedev/steps/clear_history.py +++ b/continuedev/src/continuedev/plugins/steps/clear_history.py @@ -1,5 +1,5 @@ -from ..core.main import Step -from ..core.sdk import ContinueSDK +from ...core.main import Step +from ...core.sdk import ContinueSDK class ClearHistoryStep(Step): diff --git a/continuedev/src/continuedev/steps/comment_code.py b/continuedev/src/continuedev/plugins/steps/comment_code.py index aa17e62c..3e34ab52 100644 --- a/continuedev/src/continuedev/steps/comment_code.py +++ b/continuedev/src/continuedev/plugins/steps/comment_code.py @@ -1,4 +1,4 @@ -from ..core.main import ContinueSDK, Models, Step +from ...core.main import ContinueSDK, Models, Step from .main import EditHighlightedCodeStep diff --git a/continuedev/src/continuedev/steps/core/core.py b/continuedev/src/continuedev/plugins/steps/core/core.py index 98600f8b..5a81e5ee 100644 --- a/continuedev/src/continuedev/steps/core/core.py +++ b/continuedev/src/continuedev/plugins/steps/core/core.py @@ -5,15 +5,15 @@ import difflib from textwrap import dedent from typing import Coroutine, List, Literal, Union -from ...libs.llm.ggml import GGML -from ...models.main import Range -from ...libs.llm.prompt_utils import MarkdownStyleEncoderDecoder -from ...models.filesystem_edit import EditDiff, FileEdit, FileEditWithFullContents, FileSystemEdit -from ...models.filesystem import FileSystem, RangeInFile, RangeInFileWithContents -from ...core.observation import Observation, TextObservation, TracebackObservation, UserInputObservation -from ...core.main import ChatMessage, ContinueCustomException, Step, SequentialStep -from ...libs.util.count_tokens import MAX_TOKENS_FOR_MODEL, DEFAULT_MAX_TOKENS -from ...libs.util.strings import dedent_and_get_common_whitespace, remove_quotes_and_escapes +from ....libs.llm.ggml import GGML +from ....models.main import Range +from ....libs.llm.prompt_utils import MarkdownStyleEncoderDecoder +from ....models.filesystem_edit import EditDiff, FileEdit, FileEditWithFullContents, FileSystemEdit +from ....models.filesystem import FileSystem, RangeInFile, RangeInFileWithContents +from ....core.observation import Observation, TextObservation, TracebackObservation, UserInputObservation +from ....core.main import ChatMessage, ContinueCustomException, Step, SequentialStep +from ....libs.util.count_tokens import MAX_TOKENS_FOR_MODEL, DEFAULT_MAX_TOKENS +from ....libs.util.strings import dedent_and_get_common_whitespace, remove_quotes_and_escapes import difflib diff --git a/continuedev/src/continuedev/steps/custom_command.py b/continuedev/src/continuedev/plugins/steps/custom_command.py index d96ac8e2..d5b6e48b 100644 --- a/continuedev/src/continuedev/steps/custom_command.py +++ b/continuedev/src/continuedev/plugins/steps/custom_command.py @@ -1,6 +1,6 @@ -from ..libs.util.templating import render_templated_string -from ..core.main import Step -from ..core.sdk import ContinueSDK +from ...libs.util.templating import render_templated_string +from ...core.main import Step +from ...core.sdk import ContinueSDK from ..steps.chat import SimpleChatStep diff --git a/continuedev/src/continuedev/steps/draft/abstract_method.py b/continuedev/src/continuedev/plugins/steps/draft/abstract_method.py index f3131c4b..f3131c4b 100644 --- a/continuedev/src/continuedev/steps/draft/abstract_method.py +++ b/continuedev/src/continuedev/plugins/steps/draft/abstract_method.py diff --git a/continuedev/src/continuedev/steps/draft/migration.py b/continuedev/src/continuedev/plugins/steps/draft/migration.py index f3b36b5e..a76d491b 100644 --- a/continuedev/src/continuedev/steps/draft/migration.py +++ b/continuedev/src/continuedev/plugins/steps/draft/migration.py @@ -1,7 +1,7 @@ # When an edit is made to an existing class or a new sqlalchemy class is created, # this should be kicked off. -from ...core.main import Step +from ....core.main import Step class MigrationStep(Step): diff --git a/continuedev/src/continuedev/steps/draft/redux.py b/continuedev/src/continuedev/plugins/steps/draft/redux.py index 17506316..30c8fdbb 100644 --- a/continuedev/src/continuedev/steps/draft/redux.py +++ b/continuedev/src/continuedev/plugins/steps/draft/redux.py @@ -1,5 +1,5 @@ -from ...core.main import Step -from ...core.sdk import ContinueSDK +from ....core.main import Step +from ....core.sdk import ContinueSDK from ..core.core import EditFileStep @@ -25,14 +25,14 @@ class EditReduxStateStep(Step): sdk.run_step(EditFileStep( filepath=selector_filename, prompt=f"Edit the selector to add a new property for {self.description}. The store looks like this: {store_file_contents}" - ) + )) # Reducer reducer_filename = "" sdk.run_step(EditFileStep( filepath=reducer_filename, prompt=f"Edit the reducer to add a new property for {self.description}. The store looks like this: {store_file_contents}" - + )) """ Starts with implementing selector 1. RootStore diff --git a/continuedev/src/continuedev/steps/draft/typeorm.py b/continuedev/src/continuedev/plugins/steps/draft/typeorm.py index 153c855f..d06a6fb4 100644 --- a/continuedev/src/continuedev/steps/draft/typeorm.py +++ b/continuedev/src/continuedev/plugins/steps/draft/typeorm.py @@ -1,6 +1,6 @@ from textwrap import dedent -from ...core.main import Step -from ...core.sdk import ContinueSDK +from ....core.main import Step +from ....core.sdk import ContinueSDK class CreateTableStep(Step): diff --git a/continuedev/src/continuedev/steps/feedback.py b/continuedev/src/continuedev/plugins/steps/feedback.py index 6f6a9b15..119e3112 100644 --- a/continuedev/src/continuedev/steps/feedback.py +++ b/continuedev/src/continuedev/plugins/steps/feedback.py @@ -1,8 +1,8 @@ from typing import Coroutine -from ..core.main import Models -from ..core.main import Step -from ..core.sdk import ContinueSDK -from ..libs.util.telemetry import capture_event +from ...core.main import Models +from ...core.main import Step +from ...core.sdk import ContinueSDK +from ...libs.util.telemetry import capture_event class FeedbackStep(Step): diff --git a/continuedev/src/continuedev/steps/find_and_replace.py b/continuedev/src/continuedev/plugins/steps/find_and_replace.py index 690872c0..a2c9c44e 100644 --- a/continuedev/src/continuedev/steps/find_and_replace.py +++ b/continuedev/src/continuedev/plugins/steps/find_and_replace.py @@ -1,6 +1,6 @@ -from ..models.filesystem_edit import FileEdit, Range -from ..core.main import Models, Step -from ..core.sdk import ContinueSDK +from ...models.filesystem_edit import FileEdit, Range +from ...core.main import Models, Step +from ...core.sdk import ContinueSDK class FindAndReplaceStep(Step): diff --git a/continuedev/src/continuedev/steps/help.py b/continuedev/src/continuedev/plugins/steps/help.py index ba1e6087..5111c7cf 100644 --- a/continuedev/src/continuedev/steps/help.py +++ b/continuedev/src/continuedev/plugins/steps/help.py @@ -1,7 +1,7 @@ from textwrap import dedent -from ..core.main import ChatMessage, Step -from ..core.sdk import ContinueSDK -from ..libs.util.telemetry import capture_event +from ...core.main import ChatMessage, Step +from ...core.sdk import ContinueSDK +from ...libs.util.telemetry import capture_event help = dedent("""\ Continue is an open-source coding autopilot. It is a VS Code extension that brings the power of ChatGPT to your IDE. diff --git a/continuedev/src/continuedev/steps/input/nl_multiselect.py b/continuedev/src/continuedev/plugins/steps/input/nl_multiselect.py index aee22866..b54d394a 100644 --- a/continuedev/src/continuedev/steps/input/nl_multiselect.py +++ b/continuedev/src/continuedev/plugins/steps/input/nl_multiselect.py @@ -1,7 +1,7 @@ from typing import List, Union from ..core.core import WaitForUserInputStep -from ...core.main import Step -from ...core.sdk import ContinueSDK +from ....core.main import Step +from ....core.sdk import ContinueSDK class NLMultiselectStep(Step): diff --git a/continuedev/src/continuedev/steps/main.py b/continuedev/src/continuedev/plugins/steps/main.py index ce7cbc60..30117c55 100644 --- a/continuedev/src/continuedev/steps/main.py +++ b/continuedev/src/continuedev/plugins/steps/main.py @@ -1,21 +1,18 @@ import os from typing import Coroutine, List, Union - +from textwrap import dedent from pydantic import BaseModel, Field -from ..libs.llm import LLM -from ..models.main import Traceback, Range -from ..models.filesystem_edit import EditDiff, FileEdit -from ..models.filesystem import RangeInFile, RangeInFileWithContents -from ..core.observation import Observation, TextObservation, TracebackObservation -from ..libs.llm.prompt_utils import MarkdownStyleEncoderDecoder -from textwrap import dedent -from ..core.main import ContinueCustomException, Step -from ..core.sdk import ContinueSDK, Models -from ..core.observation import Observation -import subprocess +from ...models.main import Traceback, Range +from ...models.filesystem_edit import EditDiff, FileEdit +from ...models.filesystem import RangeInFile, RangeInFileWithContents +from ...core.observation import Observation +from ...libs.llm.prompt_utils import MarkdownStyleEncoderDecoder +from ...core.main import ContinueCustomException, Step +from ...core.sdk import ContinueSDK, Models +from ...core.observation import Observation from .core.core import DefaultModelEditCodeStep -from ..libs.util.calculate_diff import calculate_diff2 +from ...libs.util.calculate_diff import calculate_diff2 class SetupContinueWorkspaceStep(Step): @@ -303,8 +300,7 @@ class SolveTracebackStep(Step): range_in_files.append( RangeInFile.from_entire_file(frame.filepath, content)) - await sdk.run_step(EditCodeStep( - range_in_files=range_in_files, prompt=prompt)) + await sdk.run_step(DefaultModelEditCodeStep(range_in_files=range_in_files, user_input=prompt)) return None diff --git a/continuedev/src/continuedev/steps/on_traceback.py b/continuedev/src/continuedev/plugins/steps/on_traceback.py index efb4c703..e99f212d 100644 --- a/continuedev/src/continuedev/steps/on_traceback.py +++ b/continuedev/src/continuedev/plugins/steps/on_traceback.py @@ -1,8 +1,8 @@ import os from .core.core import UserInputStep -from ..core.main import ChatMessage, Step -from ..core.sdk import ContinueSDK +from ...core.main import ChatMessage, Step +from ...core.sdk import ContinueSDK from .chat import SimpleChatStep diff --git a/continuedev/src/continuedev/steps/open_config.py b/continuedev/src/continuedev/plugins/steps/open_config.py index af55a95a..d950c26f 100644 --- a/continuedev/src/continuedev/steps/open_config.py +++ b/continuedev/src/continuedev/plugins/steps/open_config.py @@ -1,6 +1,6 @@ from textwrap import dedent -from ..core.main import Step -from ..core.sdk import ContinueSDK +from ...core.main import Step +from ...core.sdk import ContinueSDK import os diff --git a/continuedev/src/continuedev/steps/react.py b/continuedev/src/continuedev/plugins/steps/react.py index cddb8b42..8b2e7c2e 100644 --- a/continuedev/src/continuedev/steps/react.py +++ b/continuedev/src/continuedev/plugins/steps/react.py @@ -1,8 +1,7 @@ from textwrap import dedent from typing import List, Union, Tuple -from ..core.main import Step -from ..core.sdk import ContinueSDK -from .core.core import MessageStep +from ...core.main import Step +from ...core.sdk import ContinueSDK class NLDecisionStep(Step): diff --git a/continuedev/src/continuedev/steps/search_directory.py b/continuedev/src/continuedev/plugins/steps/search_directory.py index bfb97630..7d02d6fa 100644 --- a/continuedev/src/continuedev/steps/search_directory.py +++ b/continuedev/src/continuedev/plugins/steps/search_directory.py @@ -2,11 +2,11 @@ import asyncio from textwrap import dedent from typing import List, Union -from ..models.filesystem import RangeInFile -from ..models.main import Range -from ..core.main import Step -from ..core.sdk import ContinueSDK -from ..libs.util.create_async_task import create_async_task +from ...models.filesystem import RangeInFile +from ...models.main import Range +from ...core.main import Step +from ...core.sdk import ContinueSDK +from ...libs.util.create_async_task import create_async_task import os import re diff --git a/continuedev/src/continuedev/plugins/steps/steps_on_startup.py b/continuedev/src/continuedev/plugins/steps/steps_on_startup.py new file mode 100644 index 00000000..19d62d30 --- /dev/null +++ b/continuedev/src/continuedev/plugins/steps/steps_on_startup.py @@ -0,0 +1,17 @@ +from ...core.main import Step +from ...core.sdk import Models, ContinueSDK +from ...libs.util.step_name_to_steps import get_step_from_name + + +class StepsOnStartupStep(Step): + hide: bool = True + + async def describe(self, models: Models): + return "Running steps on startup" + + async def run(self, sdk: ContinueSDK): + steps_on_startup = sdk.config.steps_on_startup + + for step_name, step_params in steps_on_startup.items(): + step = get_step_from_name(step_name, step_params) + await sdk.run_step(step) diff --git a/continuedev/src/continuedev/steps/welcome.py b/continuedev/src/continuedev/plugins/steps/welcome.py index 2dece649..df3e9a8a 100644 --- a/continuedev/src/continuedev/steps/welcome.py +++ b/continuedev/src/continuedev/plugins/steps/welcome.py @@ -1,9 +1,10 @@ from textwrap import dedent -from ..models.filesystem_edit import AddFile -from ..core.main import Step -from ..core.sdk import ContinueSDK, Models import os +from ...models.filesystem_edit import AddFile +from ...core.main import Step +from ...core.sdk import ContinueSDK, Models + class WelcomeStep(Step): name: str = "Welcome to Continue!" diff --git a/continuedev/src/continuedev/steps/steps_on_startup.py b/continuedev/src/continuedev/steps/steps_on_startup.py deleted file mode 100644 index 365cbe1a..00000000 --- a/continuedev/src/continuedev/steps/steps_on_startup.py +++ /dev/null @@ -1,23 +0,0 @@ -from ..core.main import Step -from ..core.sdk import Models, ContinueSDK -from .main import UserInputStep -from ..recipes.CreatePipelineRecipe.main import CreatePipelineRecipe -from ..recipes.DDtoBQRecipe.main import DDtoBQRecipe -from ..recipes.DeployPipelineAirflowRecipe.main import DeployPipelineAirflowRecipe -from ..recipes.DDtoBQRecipe.main import DDtoBQRecipe -from ..recipes.AddTransformRecipe.main import AddTransformRecipe -from ..libs.util.step_name_to_steps import get_step_from_name - - -class StepsOnStartupStep(Step): - hide: bool = True - - async def describe(self, models: Models): - return "Running steps on startup" - - async def run(self, sdk: ContinueSDK): - steps_on_startup = sdk.config.steps_on_startup - - for step_name, step_params in steps_on_startup.items(): - step = get_step_from_name(step_name, step_params) - await sdk.run_step(step) |