delete /api/v1/job/{job_id}get /api/v1/graph/{graph_id}/dataloading/configpost /api/v1/graph/{graph_id}/dataloading/configget /api/v1/job/{job_id}get /api/v1/jobpost /api/v1/graph/{graph_id}/dataloading500
Error
+
+
+
Up
+
get /api/v1/deployment/log
+
(getDeploymentPodLog)
+
[Deprecated] Get kubernetes pod's log
+
+
+
+
+
+
Query parameters
+
+
pod_name (required)
+
+
Query Parameter —
component (required)
+
+
Query Parameter —
from_cache (required)
+
+
Query Parameter —
+
+
+
Return type
+
+
+
+
+
Example data
+
Content-Type: application/json
+
{
+ "log" : ""
+}
+
+
Produces
+ This API call produces the following media types according to the request header;
+ the media type will be conveyed by the response header.
+
+
+
Responses
+
200
+ Successfully returned the pod's log
+
GetPodLogResponse
+
Example data
+
Content-Type: application/json
+
{"container1":"line1\nline2\nline3","container2":"line1\nline2\nline3"}
+
500
+ Server error
+
Error
+
+
+
+
Up
+
get /api/v1/deployment/resource/usage
+
(getDeploymentResourceUsage)
+
[Deprecated] Get resource usage(cpu/memory) of cluster
+
+
+
+
+
+
+
+
Return type
+
+
+
+
+
Example data
+
Content-Type: application/json
+
{
+ "memory_usage" : [ null, null ],
+ "cpu_usage" : [ {
+ "usage" : "usage",
+ "host" : "host",
+ "timestamp" : "timestamp"
+ }, {
+ "usage" : "usage",
+ "host" : "host",
+ "timestamp" : "timestamp"
+ } ]
+}
+
+
Produces
+ This API call produces the following media types according to the request header;
+ the media type will be conveyed by the response header.
+
+
+
Responses
+
200
+ Successfully returned the resource usage
+
GetResourceUsageResponse
+
Example data
+
Content-Type: application/json
+
{"cpu_usage":[{"host":"dztest283-graphscope-store-store-0","timestamp":"2024/07/19 13:15:12","usage":52},{"host":"dztest283-graphscope-store-store-1","timestamp":"2024/07/19 13:16:12","usage":90}],"memory_usage":[{"host":"dztest283-graphscope-store-store-0","timestamp":"2024/07/19 13:15:12","usage":152},{"host":"dztest283-graphscope-store-store-1","timestamp":"2024/07/19 13:16:12","usage":290}]}
+
500
+ Server error
+
Error
+
Up
get /api/v1/deployment/status
(getDeploymentStatus)
-
Deployment status
+
Get deployment status of cluster
@@ -1134,7 +1247,44 @@
Return type
Example data
Content-Type: application/json
{
- "nodes" : [ "", "" ],
+ "nodes" : [ {
+ "name" : "name",
+ "memory_usage" : 6.027456183070403,
+ "disk_usage" : 1.4658129805029452,
+ "cpu_usage" : 0.8008281904610115
+ }, {
+ "name" : "name",
+ "memory_usage" : 6.027456183070403,
+ "disk_usage" : 1.4658129805029452,
+ "cpu_usage" : 0.8008281904610115
+ } ],
+ "pods" : {
+ "key" : [ {
+ "creation_time" : "creation_time",
+ "image" : [ "image", "image" ],
+ "node" : "node",
+ "restart_count" : 5,
+ "name" : "name",
+ "memory_usage" : 2,
+ "cpu_usage" : 5,
+ "component_belong_to" : "component_belong_to",
+ "labels" : "",
+ "status" : "status",
+ "timestamp" : "timestamp"
+ }, {
+ "creation_time" : "creation_time",
+ "image" : [ "image", "image" ],
+ "node" : "node",
+ "restart_count" : 5,
+ "name" : "name",
+ "memory_usage" : 2,
+ "cpu_usage" : 5,
+ "component_belong_to" : "component_belong_to",
+ "labels" : "",
+ "status" : "status",
+ "timestamp" : "timestamp"
+ } ]
+ },
"cluster_type" : "HOSTS"
}
@@ -1151,7 +1301,55 @@
200
RunningDeploymentStatus
Example data
Content-Type: application/json
-
{"cluster_type":"HOSTS","nodes":[{"name":"HOSTNAME-1","cpu_usage":83,"memory_usage":37.5,"disk_usage":97}]}
+
{"cluster_type":"HOSTS","nodes":[{"name":"HOSTNAME-1","cpu_usage":83,"memory_usage":37.5,"disk_usage":97}],"pods":{"coordinator":[{"name":"dztest283-graphscope-store-coordinator-0","image":["graphscope-store:0.28.0"],"labels":{"app.kubernetes.io/version":"3.4.0"},"node":"i-uf6f9rdd1wh126dg2y1p","status":"Running","restart_count":0,"cpu_usage":2,"memory_usage":597,"timestamp":"2024/07/19 16:40:04","creation_time":"2024/07/03 11:08:57","component_belong_to":"coordinator"}],"store":[{"name":"dztest283-graphscope-store-store-0","image":["graphscope-store:0.28.0"],"labels":{"app.kubernetes.io/version":"3.4.0"},"node":"i-uf6f9rdd1wh126dg2y1p","status":"Running","restart_count":0,"cpu_usage":2,"memory_usage":597,"timestamp":"2024/07/19 16:40:04","creation_time":"2024/07/03 11:08:57","component_belong_to":"store"},{"name":"dztest283-graphscope-store-store-1","image":["graphscope-store:0.28.0"],"labels":{"app.kubernetes.io/version":"3.4.0"},"node":"i-uf6f9rdd1wh126dg2y1p","status":"Running","restart_count":0,"cpu_usage":2,"memory_usage":597,"timestamp":"2024/07/19 16:40:04","creation_time":"2024/07/03 11:08:57","component_belong_to":"store"}]}}
+
500
+ Server error
+
Error
+
+
+
+
+
Up
+
get /api/v1/deployment/storage/usage
+
(getStorageUsage)
+
[Deprecated] Get storage usage of Groot
+
+
+
+
+
+
+
+
Return type
+
+
+
+
+
Example data
+
Content-Type: application/json
+
{
+ "storage_usage" : {
+ "key" : 0.8008281904610115
+ }
+}
+
+
Produces
+ This API call produces the following media types according to the request header;
+ the media type will be conveyed by the response header.
+
+
+
Responses
+
200
+ Successfully returned the resource usage
+
GetStorageUsageResponse
+
Example data
+
Content-Type: application/json
+
{"dztest283-graphscope-store-store-0":72.2,"dztest283-graphscope-store-store-1":91.7}
500
Server error
Error
@@ -1745,6 +1943,11 @@
Path parameters
+
Query parameters
+
+
delete_scheduler (optional)
+
+
Query Parameter —
Return type
@@ -1778,9 +1981,9 @@
500
Up
-
get /api/v1/graph/{graph_id}/dataloading/config
+
post /api/v1/graph/{graph_id}/dataloading/config
(getDataloadingJobConfig)
-
Get the data loading configuration
+
Post to get the data loading configuration for MapReduce Task
Path parameters
@@ -1788,14 +1991,25 @@
Path parameters
Path Parameter —
+
Consumes
+ This API call consumes the following media types via the request header:
+
+
Request body
+
Return type
@@ -1804,29 +2018,7 @@
Return type
Example data
Content-Type: application/json
{
- "schedule" : "schedule",
- "loading_config" : {
- "format" : {
- "metadata" : "",
- "type" : "type"
- },
- "import_option" : "overwrite"
- },
- "vertices" : [ {
- "type_name" : "type_name"
- }, {
- "type_name" : "type_name"
- } ],
- "repeat" : "once",
- "edges" : [ {
- "type_name" : "type_name",
- "source_vertex" : "source_vertex",
- "destination_vertex" : "destination_vertex"
- }, {
- "type_name" : "type_name",
- "source_vertex" : "source_vertex",
- "destination_vertex" : "destination_vertex"
- } ]
+ "config" : "config"
}
Produces
@@ -1838,8 +2030,14 @@
Produces
Responses
200
- Successfully returned the dataloading job configuration
-
DataloadingJobConfig
+ Successfully returned the job configuration for MapReduce Task
+
DataloadingMRJobConfig
+
Example data
+
Content-Type: application/json
+
split.size=32
+separator=\\|
+graph.endpoint=11.11.11.11:55556
+project=graphscope
500
Server error
Error
@@ -1953,7 +2151,7 @@
200
Example data
Content-Type: application/json
-
[{"id":"JOB-QWERTYUIOPASDFGH-1","type":"DATA IMPORT","status":"RUNNING","start_time":"2024-02-24T00:00:00.000Z","log":"logging...","detail":{"graph_name":"demo"}},{"id":"JOB-QWERTYUIOPASDFGH-2","type":"DATA IMPORT","status":"CANCELLED","start_time":"2024-02-24T00:00:00.000Z","log":"logging...","detail":{"graph_name":"demo"}},{"id":"JOB-QWERTYUIOPASDFGH-3","type":"DATA IMPORT","status":"SUCCESS","start_time":"2024-02-24T00:00:00.000Z","end_time":"2024-02-24T12:00:00.000Z","detail":{"graph_name":"demo"}},{"id":"JOB-QWERTYUIOPASDFGH-4","type":"DATA IMPORT","status":"FAILED","start_time":"2024-02-24T00:00:00.000Z","end_time":"2024-02-24T12:00:00.000Z","log":"logging...","detail":{"graph_name":"demo"}},{"id":"JOB-QWERTYUIOPASDFGH-5","type":"DATA IMPORT","status":"WAITING","detail":{"graph_name":"demo"}}]
+
[{"id":"JOB-QWERTYUIOPASDFGH-1","type":"DATA IMPORT","status":"RUNNING","start_time":"2024-02-24T00:00:00.000Z","log":"logging...","detail":{"graph_id":"GRAPHID"}},{"id":"JOB-QWERTYUIOPASDFGH-2","type":"DATA IMPORT","status":"CANCELLED","start_time":"2024-02-24T00:00:00.000Z","log":"logging...","detail":{"graph_id":"GRAPHID"}},{"id":"JOB-QWERTYUIOPASDFGH-3","type":"DATA IMPORT","status":"SUCCESS","start_time":"2024-02-24T00:00:00.000Z","end_time":"2024-02-24T12:00:00.000Z","detail":{"graph_id":"GRAPHID"}},{"id":"JOB-QWERTYUIOPASDFGH-4","type":"DATA IMPORT","status":"FAILED","start_time":"2024-02-24T00:00:00.000Z","end_time":"2024-02-24T12:00:00.000Z","log":"logging...","detail":{"graph_id":"GRAPHID"}},{"id":"JOB-QWERTYUIOPASDFGH-5","type":"DATA IMPORT","status":"WAITING","detail":{"graph_id":"GRAPHID"}}]
500
Server error
Error
@@ -2075,7 +2273,7 @@
200
ServiceStatus
Example data
Content-Type: application/json
-
{"graph_id":"GRAPHID","status":"Running","sdk_endpoints":{"cypher":"neo4j://mock.api.cypher:7676","gremin":"ws://mock.api.gremlin/gremlin","hqps":"http://mock.api.hqps:10000"},"start_time":"2024-01-01 00:00:00"}
+
{"graph_id":"GRAPHID","status":"Running","sdk_endpoints":{"cypher":"neo4j://mock.api.cypher:7676","gremlin":"ws://mock.api.gremlin/gremlin","hqps":"http://mock.api.hqps:10000"},"start_time":"2024-01-01 00:00:00"}
500
Server error
Error
@@ -2590,7 +2788,8 @@
Return type
Example data
Content-Type: application/json
{
- "file_path" : "file_path"
+ "file_path" : "file_path",
+ "metadata" : ""
}
Produces
@@ -2604,6 +2803,9 @@
Responses
200
successful operation
UploadFileResponse
+
Example data
+
Content-Type: application/json
+
{"file_path":"/home/graphscope/path/to/file.csv","metadata":{"datasource":"file","file_type":"csv"}}
500
Server error
Error
@@ -2641,6 +2843,8 @@
Table of Contents
DataloadingJobConfig_loading_configDataloadingJobConfig_loading_config_formatDataloadingJobConfig_vertices
+
DataloadingMRJobConfig
+
DateTypeEdgeMappingEdgeMapping_type_tripletError
@@ -2651,14 +2855,19 @@
Table of Contents
GetEdgeTypeGetGraphResponseGetGraphSchemaResponse
+
GetPodLogResponseGetPropertyMeta
+
GetResourceUsageResponse
+
GetStorageUsageResponseGetStoredProcResponseGetVertexTypeJobStatusLongTextNodeStatusParameter
+
PodStatusPrimitiveType
+
ResourceUsageRunningDeploymentInfoRunningDeploymentStatusSchemaMapping
@@ -2667,6 +2876,8 @@
Table of Contents
StartServiceRequestStoredProcedureMetaStringType
+
TemporalType
+
TimeStampTypeUpdateAlertMessageStatusRequestUpdateStoredProcRequestUploadFileResponse
@@ -2702,7 +2913,7 @@
+
+
+
+
cpu_usage
+
memory_usage
+
+
@@ -3074,7 +3321,7 @@
-
type_id
+
type_id (optional)
properties
description (optional)
type_name
@@ -3122,6 +3369,23 @@
+
+
+
+
+
name
+
image
+
labels
+
node
+
status
+
restart_count
+
cpu_usage
+
memory_usage
+
timestamp (optional)
+
creation_time
+
component_belong_to (optional)
+
+
DT_UNSIGNED_INT32
DT_SIGNED_INT64
DT_UNSIGNED_INT64
DT_BOOL
DT_FLOAT
DT_DOUBLE
+
+
+
+
+
host
+
timestamp
+
usage
+
+
Gaia
storage
- MutableCSR
+ MutableCSR
MutablePersistent
+
diff --git a/docs/analytical_engine/dev_and_test.md b/docs/analytical_engine/dev_and_test.md
index 262cefc8b8e3..935b93777eb6 100644
--- a/docs/analytical_engine/dev_and_test.md
+++ b/docs/analytical_engine/dev_and_test.md
@@ -83,9 +83,9 @@ With `gs` command-line utility, you can build analytical engine of GraphScope wi
```bash
# Clone a repo if needed
-# git clone https://github.com/alibaba/graphscope
-# cd graphscope
-python3 gsctl.py make analytical
+# git clone https://github.com/alibaba/GraphScope
+# cd GraphScope
+make analytical
```
The code of analytical engine is a cmake project, with a `CMakeLists.txt` in the its root directory (`/analytical_engine`). After the building with `gs`, you may found the built artifacts in `analytical_engine/build/grape_engine`.
@@ -95,7 +95,7 @@ Together with the `grape_engine` are shared libraries, or there may have a bunch
You could install it to a location by
```bash
-python3 gsctl.py make analytical-install --install-prefix /usr/local
+make analytical-install INSTALL_PREFIX=/usr/local
```
````{note}
@@ -116,7 +116,9 @@ export GRAPHSCOPE_HOME=`pwd`
See more about `GRAPHSCOPE_HOME` in [run tests](../development/how_to_test.md#run-tests)
```bash
-python3 gsctl.py test analytical
+# git clone -b master --single-branch --depth=1 https://github.com/7br/gstest.git ${GS_TEST_DIR}
+cd analytical_engine/build
+../test/app_tests.sh --test_dir ${GS_TEST_DIR}
```
-It would download the test dataset to the `/tmp/gstest` (if not exists) and run multiple algorithms against various graphs, and compare the result with the ground truth.
+It would download the test dataset to the `${GS_TEST_DIR}` (if not exists) and run multiple algorithms against various graphs, and compare the result with the ground truth.
diff --git a/docs/development/dev_guide.md b/docs/development/dev_guide.md
index b53536eaa363..560a144a7fe9 100644
--- a/docs/development/dev_guide.md
+++ b/docs/development/dev_guide.md
@@ -34,25 +34,29 @@ To use the dev containers for GraphScope development, you can follow these steps
### Install deps on local
-To install all dependencies on your local, use the GraphScope command-line utility [gs](https://github.com/alibaba/GraphScope/blob/main/gs) with the subcommand `install-deps` like this
+To install all dependencies on your local, use the GraphScope command-line utility [gsctl](../utilities/gs.md) with the subcommand `install-deps` like this
```bash
-python3 gsctl.py install-deps dev
+# pip3 install gsctl
+gsctl install-deps dev
# for more usage, try
-# python3 gsctl.py install-deps -h
+# gsctl install-deps -h
```
-You could download the `gs` directly or clone the [GraphScope](https://github.com/alibaba/GraphScope) to local, the `gs` is located in the root directory of GraphScope.
-
+You could download the `gsctl` directly or clone the [GraphScope](https://github.com/alibaba/GraphScope) to local, the `gsctl` is located in the root directory of GraphScope.
+```
+# git clone https://github.com/alibaba/GraphScope.git
+cd GraphScope && python3 gsctl.py install-deps dev
+```
## Build All Targets for GraphScope
-With `gs` command-line utility, you can build all targets for GraphScope with a single command.
+You can build all targets for GraphScope with a single command.
```bash
-python3 gsctl.py make all
+cd GraphScope && make
```
This would build all targets sequentially, here we
@@ -65,10 +69,10 @@ You may found the built artifacts in several places according to each components
And you could install them to one place by
```bash
-python3 gsctl.py make install [--prefix=/opt/graphscope]
+make install [INSTALL_PREFIX=/opt/graphscope]
```
-By default it would install all artifacts to `/opt/graphscope`, and you could specify another location by assigning the value of `--prefix`.
+By default it would install all artifacts to `/opt/graphscope`, and you could specify another location by assigning the value of `INSTALL_PREFIX`.
## Build Components Individually
@@ -86,7 +90,6 @@ You may find the guides for building and testing each engine as below.
The gscoordinator package is responsible for launching engines, circulating and propagating messages and errors, and scheduling the workload operations.
-
This will install coordinator package, thus make `import gscoordinator` work
````{tip}
@@ -94,19 +97,33 @@ The package would be installed in [editable mode](https://pip.pypa.io/en/stable/
````
```shell
-python3 gsctl.py make coordinator
+make coordinator
```
### Build Python Client
-The `graphscope` package is the entrypoint for playing with GraphScope.
+The `graphscope` package is a python entrypoint for playing with GraphScope.
This will install the graphscope-client package, thus make `import graphscope` work.
````{tip}
-This package would also be installed in [editable mode](https://pip.pypa.io/en/stable/cli/pip_install/#cmdoption-e)
+This package would also be installed in [editable mode](https://pip.pypa.io/en/stable/cli/pip_install/#cmdoption-e), which means any changed you made in local directory will take effect.
+````
+
+```shell
+make client
+```
+
+### Build gsctl
+
+The `gsctl` package is a command-line utility for GraphScope. It provides a set of functionalities to make it easy to use GraphScope.
+
+This will install the gsctl package, thus make `gsctl` work.
+
+````{tip}
+This package would also be installed in [editable mode](https://pip.pypa.io/en/stable/cli/pip_install/#cmdoption-e), which means any changed you made in local directory will take effect.
````
```shell
-python3 gsctl.py make client
+make gsctl
```
diff --git a/docs/learning_engine/dev_and_test.md b/docs/learning_engine/dev_and_test.md
index 960944ba6f6e..bf83fedf5abd 100644
--- a/docs/learning_engine/dev_and_test.md
+++ b/docs/learning_engine/dev_and_test.md
@@ -14,10 +14,10 @@ To install all dependencies on your local, use the GraphScope command-line utili
`install-deps` like this
```bash
-python3 gsctl.py install-deps dev
+gsctl install-deps dev-learning
# for more usage, try
-# python3 gsctl.py install-deps -h
+# gsctl install-deps -h
```
### Dev on docker container
@@ -40,13 +40,13 @@ More options about `docker` command can be found [here](https://docs.docker.com/
You can build all targets for GraphScope Learning Engine with a single command.
```bash
-python3 gsctl.py make learning
+make learning
```
You could install it to a location by:
```bash
-python3 gsctl.py make learning-install --install-prefix /opt/graphscope
+make learning-install INSTALL_PREFIX=/opt/graphscope
```
## How to Test
diff --git a/docs/utilities/gs.md b/docs/utilities/gs.md
index 4ce3aaa236e0..91f895f4e01d 100644
--- a/docs/utilities/gs.md
+++ b/docs/utilities/gs.md
@@ -1,21 +1,22 @@
# Command-line Utility `gsctl`
-`gsctl` is a command-line utility for GraphScope. It provides a set of functionalities to make it easy to use GraphScope. These functionalities include building and testing binaries, managing sessions and resources, and more.
+`gsctl` is a command-line utility for GraphScope. It provides a set of functionalities to make it easy to use GraphScope. These functionalities include building images and packages, managing sessions and resources, and more.
## Install/Update `gsctl`
```bash
$ pip3 install gsctl
+# or force reinstall gsctl by:
+$ pip3 install gsctl --force-reinstall -U
```
In some cases, such as development on `gsctl`, you may want to build it from source.
To do this, navigate to the directory where the source code is located and run the following command:
```bash
-$ cd REPO_HOME
+$ cd ${REPO_HOME}
# If you want to develop gsctl,
-# please note the entry point is located on:
-# /python/graphscope/gsctl/gsctl.py
+# please note the entry point is located on /python/graphscope/gsctl/gsctl.py
$ make gsctl
```
This will install `gsctl` in an editable mode, which means that any changes you make to the source code will be reflected in the installed version of `gsctl`.
@@ -32,12 +33,11 @@ Default, the `gsctl` provide helper functions and utilities that can be run usin
`gsctl` acts as the command-line entrypoint for GraphScope. Some examples of utility scripts are:
- `gsctl install-deps`, install dependencies for building GraphScope.
-- `gsctl make`, build GraphScope executable binaries and artifacts.
-- `gsctl make-image`, build GraphScope docker images.
-- `gsctl test`, trigger test suites.
-- `gsctl connect`, connect to the launched coordinator by ~/.gs/config.
+- `gsctl connect`, connect to the launched coordinator with configuration file ~/.gsctl.
- `gsctl close`, Close the connection from the coordinator.
- `gsctl flexbuild`, Build docker image for Interactive, Insight product.
+- `gsctl version`, Print the client version information.
+- `gsctl instance`, Deploy, destroy a GraphScope Flex instance.
### Client/Server Mode
@@ -45,7 +45,7 @@ To switch to the client/server mode, use the `gsctl connect` command. By default
Once connected, you can use `gsctl` to communicate with the coordinator which serves the specific Flex product behind it.
-#### Change scope
+#### Change Scope
In `gsctl`, you can run commands on a global scope or a local scope. When you connect to a coordinator, you are in the global scope. To change to local scope of a graph, run the `gsctl use GRAPH
` command. You can find the graph identifier with `gsctl ls` command.
@@ -62,6 +62,13 @@ Using GLOBAL
```
Different scopes have different commands. Always remember to use `--help` on a command to get more information.
-#### Close the connection
+#### Close the Connection
To disconnect from the coordinator and switch back to the utility scripts mode, you can use the `gsctl close` command. This command closes the connection from the coordinator and allows you to use `gsctl` as a standalone utility again.
+
+
+## What's the Next
+
+- [FLEX Coordinator](../flex/coordinator.md)
+- [Install dependencies on local environment](../development/dev_guide.md)
+- [Manage GraphScope Interactive by gsctl](../flex/interactive_intro.md)
diff --git a/k8s/dockerfiles/flex-interactive.Dockerfile b/k8s/dockerfiles/flex-interactive.Dockerfile
index f9338f221184..8a978c0ec842 100644
--- a/k8s/dockerfiles/flex-interactive.Dockerfile
+++ b/k8s/dockerfiles/flex-interactive.Dockerfile
@@ -34,19 +34,20 @@ RUN . ${HOME}/.cargo/env && cd ${HOME}/GraphScope/flex && \
cp ~/GraphScope/interactive_engine/executor/ir/target/release/libir_core.so /opt/flex/lib/
# build coordinator
+RUN mkdir -p /opt/flex/wheel
RUN if [ "${ENABLE_COORDINATOR}" = "true" ]; then \
export PATH=${HOME}/.local/bin:${PATH} && \
cd ${HOME}/GraphScope/flex/interactive/sdk && \
./generate_sdk.sh -g python && cd python && \
python3 -m pip install --upgrade pip && python3 -m pip install -r requirements.txt && \
python3 setup.py build_proto && python3 setup.py bdist_wheel && \
- mkdir -p /opt/flex/wheel && cp dist/*.whl /opt/flex/wheel/ && \
+ cp dist/*.whl /opt/flex/wheel/ && \
cd ${HOME}/GraphScope/python && \
export WITHOUT_LEARNING_ENGINE=ON && python3 setup.py bdist_wheel && \
- mkdir -p /opt/flex/wheel && cp dist/*.whl /opt/flex/wheel/ && \
+ cp dist/*.whl /opt/flex/wheel/ && \
cd ${HOME}/GraphScope/coordinator && \
python3 setup.py bdist_wheel && \
- mkdir -p /opt/flex/wheel && cp dist/*.whl /opt/flex/wheel/; \
+ cp dist/*.whl /opt/flex/wheel/; \
fi
diff --git a/python/graphscope/gsctl/commands/common.py b/python/graphscope/gsctl/commands/common.py
index fe68941f5a42..2a1d63416e75 100644
--- a/python/graphscope/gsctl/commands/common.py
+++ b/python/graphscope/gsctl/commands/common.py
@@ -28,6 +28,7 @@
from graphscope.gsctl.utils import err
from graphscope.gsctl.utils import info
from graphscope.gsctl.utils import succ
+from graphscope.gsctl.version import __version__
@click.group()
@@ -36,6 +37,12 @@ def cli():
pass
+@cli.command()
+def version():
+ """Print the client version information"""
+ info(__version__)
+
+
@cli.command()
@click.option(
"-c",
diff --git a/python/graphscope/gsctl/impl/stored_procedure.py b/python/graphscope/gsctl/impl/stored_procedure.py
index d2fd2e76180d..77b6c064498a 100644
--- a/python/graphscope/gsctl/impl/stored_procedure.py
+++ b/python/graphscope/gsctl/impl/stored_procedure.py
@@ -26,6 +26,11 @@
def create_stored_procedure(graph_identifier: str, stored_procedure: dict) -> str:
+ # path begin with "@" represents the local file
+ if stored_procedure["query"].startswith("@"):
+ location = stored_procedure["query"][1:]
+ with open(location, "r") as f:
+ stored_procedure["query"] = f.read()
context = get_current_context()
with graphscope.flex.rest.ApiClient(
graphscope.flex.rest.Configuration(context.coordinator_endpoint)
diff --git a/python/graphscope/gsctl/tests/test_interactive.py b/python/graphscope/gsctl/tests/test_interactive.py
index b00340de2a79..01132fa9c5cc 100644
--- a/python/graphscope/gsctl/tests/test_interactive.py
+++ b/python/graphscope/gsctl/tests/test_interactive.py
@@ -50,6 +50,51 @@
COORDINATOR_ENDPOINT = "http://127.0.0.1:8080"
+sample_cc = """
+#include "flex/engines/hqps_db/app/interactive_app_base.h"
+#include "flex/engines/hqps_db/core/sync_engine.h"
+#include "flex/utils/app_utils.h"
+
+namespace gs {
+class ExampleQuery : public CypherReadAppBase {
+ public:
+ using Engine = SyncEngine;
+ using label_id_t = typename gs::MutableCSRInterface::label_id_t;
+ using vertex_id_t = typename gs::MutableCSRInterface::vertex_id_t;
+ ExampleQuery() {}
+ // Query function for query class
+ results::CollectiveResults Query(const gs::GraphDBSession& sess,
+ int32_t param1) override {
+ LOG(INFO) << "param1: " << param1;
+ gs::MutableCSRInterface graph(sess);
+ auto ctx0 = Engine::template ScanVertex(
+ graph, 0, Filter());
+
+ auto ctx1 = Engine::Project(
+ graph, std::move(ctx0),
+ std::tuple{gs::make_mapper_with_variable(
+ gs::PropertySelector("id"))});
+ auto ctx2 = Engine::Limit(std::move(ctx1), 0, 5);
+ auto res = Engine::Sink(graph, ctx2, std::array{0});
+ LOG(INFO) << "res: " << res.DebugString();
+ return res;
+ }
+};
+} // namespace gs
+
+extern "C" {
+void* CreateApp(gs::GraphDBSession& db) {
+ gs::ExampleQuery* app = new gs::ExampleQuery();
+ return static_cast(app);
+}
+
+void DeleteApp(void* app) {
+ gs::ExampleQuery* casted = static_cast(app);
+ delete casted;
+}
+}
+"""
+
modern_graph = {
"name": "modern_graph",
"description": "This is a test graph",
@@ -305,7 +350,7 @@ def test_bulk_loading(self, tmpdir):
assert not ds["edge_mappings"]
delete_graph_by_id(graph_id)
- def test_procedure(self):
+ def test_cypher_procedure(self):
stored_procedure_dict = {
"name": "procedure_name",
"description": "This is a test procedure",
@@ -319,7 +364,7 @@ def test_procedure(self):
new_procedure_exist = False
procedures = list_stored_procedures(graph_id)
for p in procedures:
- if p.id == stored_procedure_id and p.name == "procedure_name":
+ if p.id == stored_procedure_id and p.name == stored_procedure_dict["name"]:
new_procedure_exist = True
assert new_procedure_exist
# test update a procedure
@@ -339,6 +384,28 @@ def test_procedure(self):
assert not new_procedure_exist
delete_graph_by_id(graph_id)
+ def test_cpp_procedure(self, tmpdir):
+ # generate sample_app.cc
+ cpp_procedure_file = tmpdir.join("sample_app.cc")
+ cpp_procedure_file.write(sample_cc)
+ # test create a new cpp stored procedure
+ stored_procedure_dict = {
+ "name": "cpp_stored_procedure_name",
+ "description": "This is a cpp test stored procedure",
+ "query": f"@{str(cpp_procedure_file)}",
+ "type": "cpp",
+ }
+ graph_id = create_graph(modern_graph)
+ stored_procedure_id = create_stored_procedure(graph_id, stored_procedure_dict)
+ assert stored_procedure_id is not None
+ new_procedure_exist = False
+ procedures = list_stored_procedures(graph_id)
+ for p in procedures:
+ if p.id == stored_procedure_id and p.name == stored_procedure_dict["name"]:
+ new_procedure_exist = True
+ assert new_procedure_exist
+ delete_graph_by_id(graph_id)
+
def test_service(self):
original_graph_id = None
status = list_service_status()
diff --git a/python/graphscope/gsctl/utils.py b/python/graphscope/gsctl/utils.py
index 959695fcd396..db525c84cf67 100644
--- a/python/graphscope/gsctl/utils.py
+++ b/python/graphscope/gsctl/utils.py
@@ -188,9 +188,12 @@ def create_stored_procedure_node(self, graph, stored_procedures):
parent=graph.id,
)
for p in stored_procedures:
+ query = p.query.replace("\n", "\\\\n")
+ if len(query) > 100:
+ query = query[:100] + "..."
self.tree.create_node(
tag="StoredProc(identifier: {0}, type: {1}, runnable: {2}, query: {3}, description: {4})".format(
- p.id, p.type, p.runnable, p.query, p.description
+ p.id, p.type, p.runnable, query, p.description
),
identifier=f"{stored_procedure_identifier}_{p.id}",
parent=stored_procedure_identifier,