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.

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

Cli update #1666

Open
wants to merge 10 commits into
base: dev
Choose a base branch
from
Open

Cli update #1666

wants to merge 10 commits into from

Conversation

optk2k
Copy link
Contributor

@optk2k optk2k commented Oct 26, 2023

  • processing exit from repl with ctrl-c and ctrl-d
  • processing typing whitespace

issue #1667

.gitignore Show resolved Hide resolved
@@ -28,8 +28,13 @@
log = getLogger(__name__)


def build_model(config: Union[str, Path, dict], mode: str = 'infer',
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revert unnecessary style changes here and below. If using black (I guess), we should use it on whole code base.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

UPD: make black line lenght 120, and commit black config

if len(model.out_params) > 1:
pred = zip(*pred)

print('>>', *pred)
print("==> ", *pred)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why? I would understand >>> like in python, but where from ==>?

deeppavlov/core/commands/infer.py Outdated Show resolved Hide resolved
def interact_model(config: Union[str, Path, dict]) -> None:
"""Start interaction with the model described in corresponding configuration file."""
model = build_model(config)

print("\nExit repl - type q and press enter, or press ctrl-c, or ctrl-d.")

def input_data(prompt: str) -> tuple[str]:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TypeError: 'type' object is not subscriptable in Python <=3.8. Replace with typing.Tuple, add test of interact mode to tests/test_quick_start.py for one single model.

def interact_model(config: Union[str, Path, dict]) -> None:
"""Start interaction with the model described in corresponding configuration file."""
model = build_model(config)

print("\nExit repl - type q and press enter, or press ctrl-c, or ctrl-d.")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
print("\nExit repl - type q and press enter, or press ctrl-c, or ctrl-d.")
print("\nExit repl - type q and press Enter, or press Ctrl-C, or Ctrl-D.")

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Replace repl with something more understandable for regular user. What other app usually write?

model.append(component, c_in, c_out, in_y, main)

return model


def end_repl_mode(function: Callable[..., Any]) -> Callable[..., Any]:
"""Decorator for processing ctrl-c, ctrl-d pressing."""
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"""Decorator for processing ctrl-c, ctrl-d pressing."""
"""Decorator for processing Ctrl-C, Ctrl-D pressing."""

Comment on lines 106 to 109
if data == "":
continue
if data.isspace():
continue
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove continue. We should allow user to remain some arguments blank.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After removing continue, code from input_data could be moved from separated function back

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants