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

Rename api_server_url to run_url #15

Merged
merged 3 commits into from
Jul 9, 2024
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
2 changes: 1 addition & 1 deletion datalayer/handlers.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def get(self):
"extension": "datalayer",
"version": __version__,
"settings": dict(
api_server_url=settings.api_server_url,
run_url=settings.run_url,
launcher={
"category": settings.launcher.category,
"name": settings.launcher.name,
Expand Down
6 changes: 3 additions & 3 deletions datalayer/serverapplication.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ class DatalayerExtensionApp(ExtensionAppJinjaMixin, ExtensionApp):
static_paths = [DEFAULT_STATIC_FILES_PATH]
template_paths = [DEFAULT_TEMPLATE_FILES_PATH]

api_server_url = Unicode(
run_url = Unicode(
"https://oss.datalayer.run",
config=True,
help="""Hostname to connect to the Datalayer APIs.""",
help="""URL to connect to the Datalayer RUN APIs.""",
)

white_label = Bool(False, config=True, help="""Display white label content.""")
Expand Down Expand Up @@ -75,7 +75,7 @@ def _default_launcher(self):

def initialize_settings(self):
settings = dict(
api_server_url=self.api_server_url,
run_url=self.run_url,
launcher={
"category": self.launcher.category,
"name": self.launcher.name,
Expand Down
5 changes: 2 additions & 3 deletions datalayer/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
<title>Ξ Datalayer</title>
<script id="datalayer-config-data" type="application/json">
{
"jupyterServerHttpUrl": "",
"jupyterServerWsUrl": "",
"jupyterToken": "{{ token }}"
"jupyterServerUrl": "",
"jupyterServerToken": "{{ token }}"
}
</script>
<script id="jupyter-config-data" type="application/json">
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@datalayer/core",
"version": "1.0.4",
"version": "1.0.6",
"description": "Ξ Datalayer Core.",
"keywords": [
"datalayer",
Expand Down Expand Up @@ -65,7 +65,7 @@
"watch:src": "tsc -w"
},
"dependencies": {
"@datalayer/run": "^0.1.1"
"@datalayer/run": "^0.1.2"
},
"devDependencies": {
"@babel/core": "^7.21.0",
Expand Down
5 changes: 2 additions & 3 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
<title>Ξ Datalayer</title>
<script id="datalayer-config-data" type="application/json">
{
"jupyterServerHttpUrl": "http://localhost:8888",
"jupyterServerWsUrl": "ws://localhost:8888",
"jupyterToken": "60c1661cc408f978c309d04157af55c9588ff9557c9380e4fb50785750703da6"
"jupyterServerUrl": "http://localhost:8888",
"jupyterServerToken": "60c1661cc408f978c309d04157af55c9588ff9557c9380e4fb50785750703da6"
}
</script>
<script id="jupyter-config-data" type="application/json">
Expand Down
Loading