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

hotfix/ no username on reset #5161

Merged
merged 8 commits into from
Jun 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/windows10_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ concurrency:
jobs:
Windows-Build:
name: Windows10 Build ENV
runs-on: windows-2019
runs-on: windows-latest
# Configuring -------------
steps:
- name: Setup Windows Git Configuration # This is under the assumption that git is already installed on the system
Expand All @@ -30,13 +30,13 @@ jobs:
- name: Set up Python & Create OpenBB Environment
uses: actions/setup-python@v4
with:
python-version: '3.9'
python-version: '3.10'

- name: Create and start virtual environment
run: |
python -m venv venv --upgrade-deps
source venv/Scripts/activate
python -m pip install setuptools==64.0.2 wheel
python -m pip install setuptools==65.4.1 wheel
python -m pip install -r requirements-full.txt
python -m pip uninstall papermill -y
python -m pip install git+https://github.com/nteract/papermill.git@main
Expand Down
8 changes: 4 additions & 4 deletions build/nsis/setup.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@
!define NAME "OpenBB Terminal"
!define COMPANY "OpenBB"
!define APPFILE "OpenBBTerminal.exe"
!define VERSION "3.0.1"
!define VERSION "3.1.0"
!define SLUG "${NAME} v${VERSION}"

;--------------------------------
; Info for Installer.exe
VIProductVersion 3.0.1.0
VIProductVersion 3.1.0.0
VIAddVersionKey ProductName "OpenBB Terminal"
VIAddVersionKey Comments "An installer for OpenBB Terminal. For additional details, visit OpenBB.co"
VIAddVersionKey CompanyName OpenBB.co
VIAddVersionKey FileDescription "OpenBB Terminal Program"
VIAddVersionKey FileVersion 3.0.1.0
VIAddVersionKey ProductVersion 3.0.1.0
VIAddVersionKey FileVersion 3.1.0.0
VIAddVersionKey ProductVersion 3.1.0.0
VIAddVersionKey InternalName "OpenBB Terminal"

;--------------------------------
Expand Down
4 changes: 2 additions & 2 deletions build/pyinstaller/version.rc
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ VSVersionInfo(
[StringStruct('Comments', 'The OpenBB Terminal. For additional details, visit OpenBB.co'),
StringStruct('CompanyName', 'OpenBB'),
StringStruct('FileDescription', 'OpenBB Terminal Program'),
StringStruct('FileVersion', '3.0.1.0'),
StringStruct('FileVersion', '3.1.0.0'),
StringStruct('InternalName', 'OpenBB Terminal'),
StringStruct('ProductName', 'OpenBB Terminal'),
StringStruct('ProductVersion', '3.0.1.0')])
StringStruct('ProductVersion', '3.1.0.0')])
]),
VarFileInfo([VarStruct('Translation', [1033, 1200])])
]
Expand Down
1 change: 1 addition & 0 deletions openbb_terminal/core/session/sdk_session.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ def whoami():
local_user = is_local()
if not local_user:
console_print(f"[info]email:[/info] {current_user.profile.email}")
console_print(f"[info]username:[/info] {current_user.profile.username}")
console_print(f"[info]uuid:[/info] {current_user.profile.uuid}")
else:
print_guest_block_msg()
2 changes: 1 addition & 1 deletion openbb_terminal/helper_funcs.py
Original file line number Diff line number Diff line change
Expand Up @@ -2265,7 +2265,7 @@ def query_LLM_remote(query_text: str):

data = {"prompt": query_text, "accessToken": get_current_user().profile.token}

ask_obbrequest_data = request(url, method="POST", json=data, timeout=10).json()
ask_obbrequest_data = request(url, method="POST", json=data, timeout=15).json()

if "error" in ask_obbrequest_data:
console.print(f"[red]{ask_obbrequest_data['error']}[/red]")
Expand Down
3 changes: 3 additions & 0 deletions openbb_terminal/reports/reports_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,10 @@ def ipykernel_launcher(module_file: str, module_hist_file: str):
module_hist_file: str
History manager file.
"""
# pylint: disable=import-outside-toplevel
import matplotlib # noqa

matplotlib.use("agg")
IPKernelApp.launch_instance(
argv=[
"-f",
Expand Down
4 changes: 3 additions & 1 deletion openbb_terminal/reports/widget_helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,9 @@ def header(
</style>
"""
try:
plotly_script += f"""<script>{PLOTLYJS_PATH.read_text()}</script>"""
plotly_script += (
f"""<script>{PLOTLYJS_PATH.read_text(encoding="utf-8")}</script>"""
)
except Exception:
plotly_script += (
"<script src='https://cdn.plot.ly/plotly-2.24.2.min.js'></script>"
Expand Down
2 changes: 1 addition & 1 deletion openbb_terminal/terminal_controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -1083,7 +1083,7 @@ def main(
"""
if kwargs["module"] == "ipykernel_launcher":
bootup()
ipykernel_launcher(kwargs["module_file"], kwargs["module_hist_file"])
return ipykernel_launcher(kwargs["module_file"], kwargs["module_hist_file"])

if debug:
set_system_variable("DEBUG_MODE", True)
Expand Down
6 changes: 4 additions & 2 deletions openbb_terminal/terminal_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

# IMPORTATION STANDARD
from contextlib import contextmanager
from typing import Dict, List, Optional
from typing import Any, Dict, List, Optional

import matplotlib.pyplot as plt

Expand Down Expand Up @@ -373,10 +373,12 @@ def reset(queue: Optional[List[str]] = None):
try:
# save the current user
user_profile = get_current_user().profile
session: Dict[str, str] = {
session: Dict[str, Any] = {
"access_token": user_profile.token,
"token_type": user_profile.token_type,
"uuid": user_profile.uuid,
"username": user_profile.username,
"remember": user_profile.remember,
}

# remove the hub routines
Expand Down
2 changes: 1 addition & 1 deletion poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.