summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDidierRLopes <dro.lopes@campus.fct.unl.pt>2023-06-09 01:51:32 -0700
committerDidierRLopes <dro.lopes@campus.fct.unl.pt>2023-06-09 01:51:32 -0700
commit91c3d5cb4f2816aedb6a97febb965a445282a76f (patch)
tree7d3d4534cae817e268fafafc2e4d2422c6681bea
parent12dc5980e9d520277618e508069ca03085ea5874 (diff)
more improvs
Diffstat
-rw-r--r--openbb_terminal/core/plots/backend.py4
-rw-r--r--openbb_terminal/core/routines/argv_input.html28
-rw-r--r--openbb_terminal/routine_functions.py108
-rw-r--r--test.html37
4 files changed, 117 insertions, 60 deletions
diff --git a/openbb_terminal/core/plots/backend.py b/openbb_terminal/core/plots/backend.py
index 01d01a2d30e..f4832f12211 100644
--- a/openbb_terminal/core/plots/backend.py
+++ b/openbb_terminal/core/plots/backend.py
@@ -421,8 +421,8 @@ class Backend(PyWry):
html=path.resolve(),
json_data=json.dumps({"params": params_list}),
**self.get_kwargs(title),
- width=900,
- height=800,
+ width=400,
+ height=100,
)
self.send_outgoing(outgoing)
diff --git a/openbb_terminal/core/routines/argv_input.html b/openbb_terminal/core/routines/argv_input.html
new file mode 100644
index 00000000000..6138c9b1d18
--- /dev/null
+++ b/openbb_terminal/core/routines/argv_input.html
@@ -0,0 +1,28 @@
+<html>
+<body>
+ <div id="argv"></div>
+ <script>
+ function sendData() {
+ let data = {};
+ let inputs = document.getElementById('argv').getElementsByTagName('input');
+ data[inputs[0].name] = inputs[0].value;
+ window.pywry.result(JSON.stringify(data));
+ }
+ if (window.json_data) {
+ let json_data = window.json_data;
+ if (typeof json_data === 'string') {
+ json_data = JSON.parse(json_data);
+ }
+
+ let argv = document.getElementById('argv').innerHTML;
+ json_data.params.forEach((parm) => {
+ argv += `<label for="${parm}">${parm}</label>`;
+ argv += `<input type"text" name="${parm}"></input>`;
+ });
+
+ argv += `<button onclick="sendData()">Submit</button>`;
+ document.getElementById('argv').innerHTML = argv;
+ }
+ </script>
+</body>
+</html>
diff --git a/openbb_terminal/routine_functions.py b/openbb_terminal/routine_functions.py
index b17900e7253..31e6eab24f7 100644
--- a/openbb_terminal/routine_functions.py
+++ b/openbb_terminal/routine_functions.py
@@ -6,6 +6,7 @@ from typing import Dict, List, Match, Optional, Tuple, Union
from dateutil.relativedelta import relativedelta
from openbb_terminal.rich_config import console
+from openbb_terminal.core.plots.backend import plots_backend
# pylint: disable=too-many-statements,eval-used,consider-iterating-dictionary
# pylint: disable=too-many-branches,too-many-return-statements
@@ -283,24 +284,23 @@ def parse_openbb_script(
# In production we want to ask for the variable
# if it wasn't given using PyWry
if in_production:
- from openbb_terminal.core.plots.backend import (
- plots_backend,
- )
-
plots_backend().start(True)
args = plots_backend().call_routine(
- f"Routine '{file_path}' requires variable '{VAR_NAME}'",
- [VAR_NAME],
- Path(__file__).parent.parent / "test.html",
+ f"Routine '{file_path}' requires variable '{VAR_NAME}[{VAR_SLICE}]'",
+ [f"{VAR_NAME}[{VAR_SLICE}]"],
+ Path(__file__).parent.parent / "openbb_terminal"
+ / "core" / "routines" / "argv_input.html",
)
- if args and VAR_NAME in args:
+ if args and f"{VAR_NAME}[{VAR_SLICE}]" in args:
+ # Update index 0 from $ARGV with user input
+ ROUTINE_VARS[VAR_NAME] = [args[f"{VAR_NAME}[{VAR_SLICE}]"]]
templine = templine.replace(
match[0],
- args[VAR_NAME],
+ args[f"{VAR_NAME}[{VAR_SLICE}]"],
)
else:
return (
- f"[red]Variable {VAR_NAME} not given "
+ f"[red]Variable {VAR_NAME}[{VAR_SLICE}] not given "
"for current routine script.[/red]",
"",
)
@@ -312,7 +312,7 @@ def parse_openbb_script(
"",
)
- # Only enters here when any other index from 0 is used
+ # Only enters here when any other index different from 0 is used
else:
if VAR_NAME in ROUTINE_VARS:
variable = eval(f'ROUTINE_VARS["{VAR_NAME}"]')
@@ -324,22 +324,57 @@ def parse_openbb_script(
# We use <= because we are using 0 index based lists
if length_variable <= int(VAR_SLICE):
+ # TODO: We want to trigger a pywry window to allow to add
+ # another element to argv from external
return (
f"[red]Variable {VAR_NAME} only has "
f"{length_variable} elements and there "
f"was an attempt to access it with index {VAR_SLICE}.[/red]",
"",
)
+ # TODO: We need to handle the case the initial fields are empty
+ # because we invoked $ARGV[n] with n>0 before creating n==0
+ # so we check that the fields are missing and we ask for them
templine = templine.replace(
match[0],
variable[int(VAR_SLICE)],
)
else:
- return (
- f"[red]Variable {VAR_NAME} not given "
- "for current routine script.[/red]",
- "",
- )
+ # In production we want to ask for the variable
+ # if it wasn't given using PyWry
+ if in_production:
+ plots_backend().start(True)
+ args = plots_backend().call_routine(
+ f"Routine '{file_path}' requires variable '{VAR_NAME}[{VAR_SLICE}]'",
+ [f"{VAR_NAME}[{VAR_SLICE}]"],
+ Path(__file__).parent.parent / "openbb_terminal"
+ / "core" / "routines" / "argv_input.html",
+ )
+ if args and f"{VAR_NAME}[{VAR_SLICE}]" in args:
+ # Update index different than 0 from $ARGV with user input
+ # Note that we only get here if the user invokes $ARGV[n]
+ # with n != 0 for the first time, thus it means that we are
+ # ok with setting the first elements as empty since they haven't
+ # been used yet
+ ROUTINE_VARS[VAR_NAME] = [""] * (int(VAR_SLICE)+1)
+ ROUTINE_VARS[VAR_NAME][VAR_SLICE] = [args[f"{VAR_NAME}[{VAR_SLICE}]"]]
+ templine = templine.replace(
+ match[0],
+ args[f"{VAR_NAME}[{VAR_SLICE}]"],
+ )
+ else:
+ return (
+ f"[red]Variable {VAR_NAME}[{VAR_SLICE}] not given "
+ "for current routine script.[/red]",
+ "",
+ )
+
+ else:
+ return (
+ f"[red]Variable {VAR_NAME} not given "
+ "for current routine script.[/red]",
+ "",
+ )
# Involves slicing which is a bit more tricky to use eval on
elif (
@@ -416,11 +451,42 @@ def parse_openbb_script(
match[0], potential_date_match
)
else:
- return (
- f"[red]Variable {VAR_NAME} not given for "
- "current routine script.[/red]",
- "",
- )
+ # If we are in production mode, we want to ask for the variable
+ # only in the case that this is $ARGV as this is an argument
+ # that we can select through pywry
+ if in_production and VAR_NAME == "$ARGV":
+ plots_backend().start(True)
+ args = plots_backend().call_routine(
+ f"Routine '{file_path}' requires variable '{VAR_NAME}'",
+ [VAR_NAME],
+ Path(__file__).parent.parent / "openbb_terminal"
+ / "core" / "routines" / "argv_input.html",
+ )
+ if args and f"{VAR_NAME}" in args:
+ # Update entire $ARGV with user input
+ # If it has a comma it means the ARGV has multiple values
+ # otherwise it is a single value
+ if "," in args[VAR_NAME]:
+ ROUTINE_VARS[VAR_NAME] = args[VAR_NAME].split(",")
+ else:
+ ROUTINE_VARS[VAR_NAME] = args[VAR_NAME]
+ templine = templine.replace(
+ match[0],
+ args[VAR_NAME],
+ )
+ else:
+ return (
+ f"[red]Variable {VAR_NAME}[{VAR_SLICE}] not given "
+ "for current routine script.[/red]",
+ "",
+ )
+
+ else:
+ return (
+ f"[red]Variable {VAR_NAME} not given for "
+ "current routine script.[/red]",
+ "",
+ )
lines_with_vars_replaced.append(templine)
diff --git a/test.html b/test.html
deleted file mode 100644
index 4fd4b7cecf4..00000000000
--- a/test.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<html>
-<body>
- <br>
- <br>
- <br>
- <br>
- <br>
- <br>
- <div id="sexy_time"></div>
-
- <script>
- function sendData() {
- let data = {};
- let inputs = document.getElementById('sexy_time').getElementsByTagName('input');
- for (let i = 0; i < inputs.length; i++) {
- data[inputs[i].name] = inputs[i].value;
- }
- window.pywry.result(JSON.stringify(data));
- }
- if (window.json_data) {
- let json_data = window.json_data;
- if (typeof json_data === 'string') {
- json_data = JSON.parse(json_data);
- }
- console.log(json_data);
- let sexy_time = document.getElementById('sexy_time').innerHTML;
- json_data.params.forEach((parm) => {
- sexy_time += `<label for="${parm}">${parm}</label>`;
- sexy_time += `<input type"text" name="${parm}"></input>`;
- });
-
- sexy_time += `<button onclick="sendData()">Submit</button>`;
- document.getElementById('sexy_time').innerHTML = sexy_time;
- }
- </script>
-</body>
-</html>
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-06 00:59:33 +0000