Skip to content

Commit

Permalink
run in package and resolve conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
MightyGaga committed Oct 28, 2024
1 parent bfd1245 commit 9318a74
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion instantiation/controller/agent/agent.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from typing import Dict, List

from controller.prompter.agent_prompter import FilterPrompter, PrefillPrompter
from instantiation.controller.prompter.agent_prompter import FilterPrompter, PrefillPrompter

from ufo.agents.agent.basic import BasicAgent

Expand Down
2 changes: 1 addition & 1 deletion instantiation/controller/env/env_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import re
import time

from config.config import Config
from instantiation.config.config import Config
from fuzzywuzzy import fuzz
from pywinauto import Desktop

Expand Down
10 changes: 5 additions & 5 deletions instantiation/controller/instantiation_process.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from enum import Enum
from typing import Any, Dict

from config.config import Config
from instantiation.config.config import Config

from ufo.module.basic import BaseSession

Expand Down Expand Up @@ -108,10 +108,10 @@ def instantiate_single_file(self, task_object: TaskObject) -> None:
Execute the process for one task.
:param task_object: The TaskObject containing task details.
"""
from controller.env.env_manager import WindowsAppEnv
from controller.workflow.choose_template_flow import ChooseTemplateFlow
from controller.workflow.filter_flow import FilterFlow
from controller.workflow.prefill_flow import PrefillFlow
from instantiation.controller.env.env_manager import WindowsAppEnv
from instantiation.controller.workflow.choose_template_flow import ChooseTemplateFlow
from instantiation.controller.workflow.filter_flow import FilterFlow
from instantiation.controller.workflow.prefill_flow import PrefillFlow

# Initialize the app environment and the task file name.
app_object = task_object.app_object
Expand Down
2 changes: 1 addition & 1 deletion instantiation/controller/workflow/choose_template_flow.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from pathlib import Path
from typing import Dict

from config.config import Config
from instantiation.config.config import Config
from langchain.embeddings import CacheBackedEmbeddings
from langchain.storage import LocalFileStore
from langchain_community.embeddings import HuggingFaceEmbeddings
Expand Down
4 changes: 2 additions & 2 deletions instantiation/controller/workflow/filter_flow.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import time
from typing import Dict, Tuple

from config.config import Config
from controller.agent.agent import FilterAgent
from instantiation.config.config import Config
from instantiation.controller.agent.agent import FilterAgent

from ufo.module.basic import BaseSession

Expand Down
6 changes: 3 additions & 3 deletions instantiation/controller/workflow/prefill_flow.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
import time
from typing import Any, Dict, List, Tuple

from config.config import Config
from controller.agent.agent import PrefillAgent
from controller.env.env_manager import WindowsAppEnv
from instantiation.config.config import Config
from instantiation.controller.agent.agent import PrefillAgent
from instantiation.controller.env.env_manager import WindowsAppEnv

from ufo.agents.processors.app_agent_processor import AppAgentProcessor
from ufo.automator.ui_control.inspector import ControlInspectorFacade
Expand Down
2 changes: 1 addition & 1 deletion instantiation/instantiation.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def main() -> None:

task_dir_name = parse_arguments().task.lower()

from controller.instantiation_process import InstantiationProcess
from instantiation.controller.instantiation_process import InstantiationProcess
InstantiationProcess().instantiate_files(task_dir_name)


Expand Down
2 changes: 1 addition & 1 deletion ufo/agents/agent/basic.py
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ def process_resume(self) -> None:
self.processor.resume()


def process_asker(self, configs = configs) -> None:
def process_asker(self, ask_user: bool = True) -> None:
"""
Ask for the process.
:param ask_user: Whether to ask the user for the questions.
Expand Down

0 comments on commit 9318a74

Please # to comment.