Skip to content

Commit 6dd839e

Browse files
authored
Remove websocket chat extension (#100)
* Remove the websocket extension (jupyterlab-ws-chat) * Fix install scripts * Fix tests * Update documentation * Fix dev-install script
1 parent a664804 commit 6dd839e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+26
-6283
lines changed

.github/workflows/build.yml

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,10 @@ jobs:
6060
./scripts/dev_install.sh
6161
pytest -vv -r ap --cov
6262
63-
build_extensions:
63+
build_extension:
6464
runs-on: ubuntu-latest
6565
needs: build_jupyter-chat
66-
strategy:
67-
matrix:
68-
extension: [collaborative, ws]
69-
name: Build ${{ matrix.extension }} chat extension
66+
name: Build chat extension
7067

7168
steps:
7269
- name: Checkout
@@ -81,29 +78,26 @@ jobs:
8178
- name: Package the extensions
8279
run: |
8380
jlpm install
84-
jlpm build:${{ matrix.extension }}
81+
jlpm build
8582
8683
- name: Package extension
8784
run: |
8885
set -eux
89-
pip install build python/jupyterlab-${{ matrix.extension }}-chat
90-
python -m build python/jupyterlab-${{ matrix.extension }}-chat
91-
pip uninstall -y "jupyterlab_${{ matrix.extension }}_chat" jupyterlab
86+
pip install build python/jupyterlab-collaborative-chat
87+
python -m build python/jupyterlab-collaborative-chat
88+
pip uninstall -y "jupyterlab_collaborative_chat" jupyterlab
9289
9390
- name: Upload package
9491
uses: actions/upload-artifact@v3
9592
with:
96-
name: jupyterlab_${{ matrix.extension }}_chat-artifacts
97-
path: python/jupyterlab-${{ matrix.extension }}-chat/dist/jupyterlab_${{ matrix.extension }}_chat*
93+
name: jupyterlab_collaborative_chat-artifacts
94+
path: python/jupyterlab-collaborative-chat/dist/jupyterlab_collaborative_chat*
9895
if-no-files-found: error
9996

10097
integration-tests:
101-
name: ${{ matrix.extension }} integration tests
102-
needs: build_extensions
98+
name: Integration tests
99+
needs: build_extension
103100
runs-on: ubuntu-latest
104-
strategy:
105-
matrix:
106-
extension: [collaborative, ws]
107101

108102
env:
109103
PLAYWRIGHT_BROWSERS_PATH: ${{ github.workspace }}/pw-browsers
@@ -118,15 +112,15 @@ jobs:
118112
- name: Download extension package
119113
uses: actions/download-artifact@v3
120114
with:
121-
name: jupyterlab_${{ matrix.extension }}_chat-artifacts
115+
name: jupyterlab_collaborative_chat-artifacts
122116

123117
- name: Install the extension
124118
run: |
125119
set -eux
126-
python -m pip install "jupyterlab>=4.0.0,<5" jupyterlab_${{ matrix.extension }}_chat*.whl
120+
python -m pip install "jupyterlab>=4.0.0,<5" jupyterlab_collaborative_chat*.whl
127121
128122
- name: Install dependencies
129-
working-directory: python/jupyterlab-${{ matrix.extension }}-chat/ui-tests
123+
working-directory: python/jupyterlab-collaborative-chat/ui-tests
130124
env:
131125
YARN_ENABLE_IMMUTABLE_INSTALLS: 0
132126
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
@@ -141,21 +135,21 @@ jobs:
141135

142136
- name: Install browser
143137
run: jlpm playwright install chromium
144-
working-directory: python/jupyterlab-${{ matrix.extension }}-chat/ui-tests
138+
working-directory: python/jupyterlab-collaborative-chat/ui-tests
145139

146140
- name: Execute integration tests
147-
working-directory: python/jupyterlab-${{ matrix.extension }}-chat/ui-tests
141+
working-directory: python/jupyterlab-collaborative-chat/ui-tests
148142
run: |
149143
jlpm playwright test --retries=2
150144
151145
- name: Upload Playwright Test report
152146
if: always()
153147
uses: actions/upload-artifact@v3
154148
with:
155-
name: jupyterlab_${{ matrix.extension }}_chat-playwright-tests
149+
name: jupyterlab_collaborative_chat-playwright-tests
156150
path: |
157-
python/jupyterlab-${{ matrix.extension }}-chat/ui-tests/test-results
158-
python/jupyterlab-${{ matrix.extension }}-chat/ui-tests/playwright-report
151+
python/jupyterlab-collaborative-chat/ui-tests/test-results
152+
python/jupyterlab-collaborative-chat/ui-tests/playwright-report
159153
160154
check_links:
161155
name: Check Links

README.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,9 @@ It is composed of:
4848
the `YChat` shared document in jupyter_ydoc
4949
- a NPM package named `jupyterlab-collaborative-chat-extension`.
5050

51-
#### Chat extension based on websocket: *python/jupyterlab-ws-chat*
51+
#### REMOVED - Chat extension based on websocket
5252

53-
This extension is an implementation of the `@jupyter/chat` package, relying on
54-
websocket for the communication between server and front end.
55-
56-
It is composed of a Python package named `jupyterlab_ws_chat`
57-
for the server side and a NPM package named `jupyterlab-ws-chat`.
53+
This extension has been moved to its own [repository](https://github.com/brichet/jupyterlab-ws-chat)
5854

5955
## Contributing
6056

docs/source/developers/contributing/index.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,4 @@ maxdepth: 2
1212
1313
./jupyter-chat
1414
./jupyterlab-collaborative-chat
15-
./jupyterlab-ws-chat
1615
```

docs/source/developers/contributing/jupyterlab-collaborative-chat.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Changes in typescript sources of `@jupyter/chat` or `jupyterlab-collaborative-ch
3535
be built again to be available in the jupyterlab.
3636

3737
```bash
38-
jlpm build:collaborative
38+
jlpm build
3939
```
4040

4141
## Testing locally the extension

docs/source/developers/contributing/jupyterlab-ws-chat.md

Lines changed: 0 additions & 39 deletions
This file was deleted.

docs/source/index.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ required to build a chat. This package is designed to be used in an extension.
1010
- `jupyterlab-collaborative-chat`, an extension built on top of `@jupyter/chat`, using
1111
the collaborative edition as messaging system.
1212

13-
- `jupyterlab-ws-chat`, an other extension built on top of `@jupyter/chat`, using
14-
websocket as messaging system.
15-
1613
```{toctree}
1714
---
1815
maxdepth: 3

docs/source/users/index.md

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -62,34 +62,6 @@ area, like any other document.
6262
Opening a chat from the left panel will open it in the left panel.
6363
```
6464

65-
## Websocket chat
66-
67-
The `jupyterlab-ws-chat` extension adds a chat panel using websocket for messages
68-
exchange.
69-
70-
```{warning}
71-
This extension is currently under development, and users may encounter issues with it.
72-
```
73-
74-
### Install websocket chat
75-
76-
The websocket chat is available on [PyPI](https://pypi.org/project/jupyterlab-ws-chat/).
77-
78-
```bash
79-
pip install jupyterlab-ws-chat
80-
```
81-
82-
To uninstall the package:
83-
84-
```bash
85-
pip uninstall jupyterlab-ws-chat
86-
```
87-
88-
### Open the chat
89-
90-
The chat can be opened from the left panel
91-
![chat icon](../../../packages/jupyter-chat/style/icons/chat.svg){w=24px}.
92-
9365
## Chat usage
9466

9567
The chat UI is composed of a list of messages and an input to send new messages.

package.json

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,16 @@
2323
},
2424
"workspaces": [
2525
"packages/*",
26-
"python/jupyterlab-collaborative-chat",
27-
"python/jupyterlab-ws-chat"
26+
"python/jupyterlab-collaborative-chat"
2827
],
2928
"scripts": {
3029
"build": "lerna run build --stream",
3130
"build:core": "lerna run build --stream --scope \"@jupyter/chat\"",
32-
"build:collaborative": "lerna run build --scope=jupyterlab-collaborative-chat-extension --include-filtered-dependencies",
33-
"build:ws": "lerna run build --scope=jupyterlab-ws-chat-extension --include-filtered-dependencies",
3431
"build:prod": "lerna run build:prod --stream",
3532
"clean": "lerna run clean",
3633
"clean:all": "lerna run clean:all",
3734
"dev": "jupyter lab --config playground/config.py",
38-
"dev-install": "jlpm dev-install:collaborative && jlpm dev-install:ws",
39-
"dev-install:collaborative": "jlpm build:collaborative && lerna run dev-install --scope=jupyterlab-collaborative-chat-extension --include-filtered-dependencies",
40-
"dev-install:ws": "jlpm build:ws && lerna run dev-install --scope=jupyterlab-ws-chat-extension --include-filtered-dependencies",
35+
"dev-install": "jlpm build && lerna run dev-install",
4136
"lint": "jlpm && lerna run prettier && lerna run eslint",
4237
"lint:check": "lerna run prettier:check && lerna run eslint:check",
4338
"watch": "lerna run watch --parallel --stream",

pyproject.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ fields = ["description", "authors", "urls"]
3737
[tool.jupyter-releaser.options]
3838
version-cmd = "cd ../.. && python scripts/bump_version.py --force --skip-if-dirty"
3939
python_packages = [
40-
"python/jupyterlab-collaborative-chat",
41-
"python/jupyterlab-ws-chat"
40+
"python/jupyterlab-collaborative-chat"
4241
]
4342

4443
[tool.jupyter-releaser.hooks]

python/jupyterlab-ws-chat/LICENSE

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)