Browse Source

Improve import path

master
Yang Luo 2 years ago
parent
commit
d389774c1c
55 changed files with 101 additions and 103 deletions
  1. +3
    -3
      .github/workflows/build.yml
  2. +1
    -1
      .github/workflows/sync.yml
  3. +19
    -21
      README.md
  4. +1
    -1
      controllers/chat.go
  5. +1
    -1
      controllers/factorset.go
  6. +1
    -1
      controllers/file.go
  7. +1
    -1
      controllers/file_cache.go
  8. +2
    -2
      controllers/message.go
  9. +4
    -4
      controllers/message_util.go
  10. +1
    -1
      controllers/permission.go
  11. +1
    -1
      controllers/provider.go
  12. +1
    -1
      controllers/store.go
  13. +1
    -1
      controllers/task.go
  14. +1
    -1
      controllers/util_record.go
  15. +1
    -1
      controllers/vector.go
  16. +3
    -3
      controllers/video.go
  17. +2
    -2
      controllers/wordset.go
  18. +1
    -1
      embedding/huggingface.go
  19. +2
    -2
      embedding/openai.go
  20. +1
    -1
      go.mod
  21. +1
    -1
      i18n/generate.go
  22. +1
    -1
      i18n/util.go
  23. +3
    -3
      main.go
  24. +1
    -1
      model/azure_openai.go
  25. +1
    -1
      model/huggingface.go
  26. +1
    -1
      model/openai.go
  27. +1
    -1
      model/openrouter.go
  28. +3
    -3
      model/query_test.go
  29. +1
    -1
      object/chat.go
  30. +1
    -1
      object/factorset.go
  31. +1
    -1
      object/factorset_upload.go
  32. +1
    -1
      object/init.go
  33. +1
    -1
      object/kmeans.go
  34. +1
    -1
      object/message.go
  35. +4
    -4
      object/provider.go
  36. +1
    -1
      object/search_hnsw.go
  37. +2
    -2
      object/store.go
  38. +1
    -1
      object/store_provider.go
  39. +1
    -1
      object/task.go
  40. +1
    -1
      object/vector.go
  41. +5
    -5
      object/vector_embedding.go
  42. +1
    -1
      object/vector_test.go
  43. +2
    -2
      object/video.go
  44. +1
    -1
      object/wordset.go
  45. +1
    -1
      object/wordset_graph.go
  46. +2
    -2
      object/wordset_upload.go
  47. +1
    -1
      proxy/proxy.go
  48. +3
    -3
      routers/filter.go
  49. +1
    -1
      routers/router.go
  50. +3
    -3
      storage/provider_test.go
  51. +1
    -1
      txt/util.go
  52. +1
    -1
      video/vod_api.go
  53. +1
    -1
      web/src/App.js
  54. +1
    -1
      web/src/backend/FetchFilter.js
  55. +1
    -1
      xlsx/xlsx.go

+ 3
- 3
.github/workflows/build.yml View File

@@ -81,7 +81,7 @@ jobs:
release-and-push:
name: Release And Push
runs-on: ubuntu-latest
if: github.repository == 'casbin/casibase' && github.event_name == 'push'
if: github.repository == 'casibase/casibase' && github.event_name == 'push'
needs: [ frontend, backend, linter]
steps:
- name: Checkout
@@ -138,14 +138,14 @@ jobs:

- name: Log in to Docker Hub
uses: docker/login-action@v1
if: github.repository == 'casbin/casibase' && github.event_name == 'push' && steps.should_push.outputs.push=='true'
if: github.repository == 'casibase/casibase' && github.event_name == 'push' && steps.should_push.outputs.push=='true'
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}

- name: Push to Docker Hub
uses: docker/build-push-action@v3
if: github.repository == 'casbin/casibase' && github.event_name == 'push' && steps.should_push.outputs.push=='true'
if: github.repository == 'casibase/casibase' && github.event_name == 'push' && steps.should_push.outputs.push=='true'
with:
context: .
target: STANDARD


+ 1
- 1
.github/workflows/sync.yml View File

@@ -7,7 +7,7 @@ on:
jobs:
synchronize-with-crowdin:
runs-on: ubuntu-latest
if: github.repository == 'casbin/casibase' && github.event_name == 'push'
if: github.repository == 'casibase/casibase' && github.event_name == 'push'
steps:

- name: Checkout


+ 19
- 21
README.md View File

@@ -7,37 +7,37 @@
<a href="https://hub.docker.com/r/casbin/casibase">
<img alt="docker pull casbin/casibase" src="https://img.shields.io/docker/pulls/casbin/casibase.svg">
</a>
<a href="https://github.com/casbin/casibase/actions/workflows/build.yml">
<img alt="GitHub Workflow Status (branch)" src="https://github.com/casbin/casibase/workflows/Build/badge.svg?style=flat-square">
<a href="https://github.com/casibase/casibase/actions/workflows/build.yml">
<img alt="GitHub Workflow Status (branch)" src="https://github.com/casibase/casibase/workflows/Build/badge.svg?style=flat-square">
</a>
<a href="https://github.com/casbin/casibase/releases/latest">
<img alt="GitHub Release" src="https://img.shields.io/github/v/release/casbin/casibase.svg">
<a href="https://github.com/casibase/casibase/releases/latest">
<img alt="GitHub Release" src="https://img.shields.io/github/v/release/casibase/casibase.svg">
</a>
<a href="https://hub.docker.com/repository/docker/casbin/casibase">
<img alt="Docker Image Version (latest semver)" src="https://img.shields.io/badge/Docker%20Hub-latest-brightgreen">
</a>
<!-- waiting for changing -->
<!-- <a href="https://hub.docker.com/r/casbin/casibase"> -->
<!-- <a href="https://github.com/casbin/casibase/actions/workflows/build.yml"> -->
<!-- <a href="https://github.com/casbin/casibase/releases/latest"> -->
<!-- <a href="https://github.com/casibase/casibase/actions/workflows/build.yml"> -->
<!-- <a href="https://github.com/casibase/casibase/releases/latest"> -->
<!-- <a href="https://hub.docker.com/repository/docker/casbin/casibase"> -->
</p>

<p align="center">
<a href="https://goreportcard.com/report/github.com/casbin/casibase">
<img alt="Go Report Card" src="https://goreportcard.com/badge/github.com/casbin/casibase?style=flat-square">
<a href="https://goreportcard.com/report/github.com/casibase/casibase">
<img alt="Go Report Card" src="https://goreportcard.com/badge/github.com/casibase/casibase?style=flat-square">
</a>
<a href="https://github.com/casbin/casibase/blob/master/LICENSE">
<img src="https://img.shields.io/github/license/casbin/casibase?style=flat-square" alt="license">
<a href="https://github.com/casibase/casibase/blob/master/LICENSE">
<img src="https://img.shields.io/github/license/casibase/casibase?style=flat-square" alt="license">
</a>
<a href="https://github.com/casbin/casibase/issues">
<img alt="GitHub issues" src="https://img.shields.io/github/issues/casbin/casibase?style=flat-square">
<a href="https://github.com/casibase/casibase/issues">
<img alt="GitHub issues" src="https://img.shields.io/github/issues/casibase/casibase?style=flat-square">
</a>
<a href="#">
<img alt="GitHub stars" src="https://img.shields.io/github/stars/casbin/casibase?style=flat-square">
<img alt="GitHub stars" src="https://img.shields.io/github/stars/casibase/casibase?style=flat-square">
</a>
<a href="https://github.com/casbin/casibase/network">
<img alt="GitHub forks" src="https://img.shields.io/github/forks/casbin/casibase?style=flat-square">
<a href="https://github.com/casibase/casibase/network">
<img alt="GitHub forks" src="https://img.shields.io/github/forks/casibase/casibase?style=flat-square">
</a>
<a href="https://crowdin.com/project/casibase">
<img alt="Crowdin" src="https://badges.crowdin.net/casibase/localized.svg">
@@ -49,7 +49,7 @@

## Online Demo

<https://ai.casbin.com>
<https://ai.v2tl.com>

## Architecture

@@ -100,13 +100,11 @@ Casibase contains 2 parts:

Discord: <https://discord.gg/5rPsrAzK7S>

Forum: <https://forum.casbin.com>

Contact: <https://tawk.to/chat/623352fea34c2456412b8c51/1fuc7od6e>

## Contribute

For Casibase, if you have any questions, you can give issues, or you can also directly start Pull Requests(but we recommend giving issues first to communicate with the community).


## License
[Apache-2.0](https://github.com/casbin/casibase/blob/master/LICENSE)

[Apache-2.0](https://github.com/casibase/casibase/blob/master/LICENSE)

+ 1
- 1
controllers/chat.go View File

@@ -17,7 +17,7 @@ package controllers
import (
"encoding/json"

"github.com/casbin/casibase/object"
"github.com/casibase/casibase/object"
)

func (c *ApiController) GetGlobalChats() {


+ 1
- 1
controllers/factorset.go View File

@@ -17,7 +17,7 @@ package controllers
import (
"encoding/json"

"github.com/casbin/casibase/object"
"github.com/casibase/casibase/object"
)

func (c *ApiController) GetGlobalFactorsets() {


+ 1
- 1
controllers/file.go View File

@@ -18,7 +18,7 @@ import (
"encoding/json"
"mime/multipart"

"github.com/casbin/casibase/object"
"github.com/casibase/casibase/object"
)

func (c *ApiController) UpdateFile() {


+ 1
- 1
controllers/file_cache.go View File

@@ -19,7 +19,7 @@ import (
"strings"

"github.com/astaxie/beego"
"github.com/casbin/casibase/util"
"github.com/casibase/casibase/util"
)

var (


+ 2
- 2
controllers/message.go View File

@@ -19,8 +19,8 @@ import (
"fmt"
"strings"

"github.com/casbin/casibase/object"
"github.com/casbin/casibase/util"
"github.com/casibase/casibase/object"
"github.com/casibase/casibase/util"
)

func (c *ApiController) GetGlobalMessages() {


+ 4
- 4
controllers/message_util.go View File

@@ -17,10 +17,10 @@ package controllers
import (
"fmt"

"github.com/casbin/casibase/embedding"
"github.com/casbin/casibase/model"
"github.com/casbin/casibase/object"
"github.com/casbin/casibase/util"
"github.com/casibase/casibase/embedding"
"github.com/casibase/casibase/model"
"github.com/casibase/casibase/object"
"github.com/casibase/casibase/util"
)

func (c *ApiController) ResponseErrorStream(errorText string) {


+ 1
- 1
controllers/permission.go View File

@@ -17,8 +17,8 @@ package controllers
import (
"encoding/json"

"github.com/casbin/casibase/util"
"github.com/casdoor/casdoor-go-sdk/casdoorsdk"
"github.com/casibase/casibase/util"
)

func (c *ApiController) GetPermissions() {


+ 1
- 1
controllers/provider.go View File

@@ -17,7 +17,7 @@ package controllers
import (
"encoding/json"

"github.com/casbin/casibase/object"
"github.com/casibase/casibase/object"
)

func (c *ApiController) GetGlobalProviders() {


+ 1
- 1
controllers/store.go View File

@@ -20,7 +20,7 @@ import (
"net"
"strings"

"github.com/casbin/casibase/object"
"github.com/casibase/casibase/object"
)

func (c *ApiController) GetGlobalStores() {


+ 1
- 1
controllers/task.go View File

@@ -17,7 +17,7 @@ package controllers
import (
"encoding/json"

"github.com/casbin/casibase/object"
"github.com/casibase/casibase/object"
)

func (c *ApiController) GetGlobalTasks() {


+ 1
- 1
controllers/util_record.go View File

@@ -19,8 +19,8 @@ import (
"strings"

"github.com/astaxie/beego/context"
"github.com/casbin/casibase/util"
"github.com/casdoor/casdoor-go-sdk/casdoorsdk"
"github.com/casibase/casibase/util"
)

func NewRecord(ctx *context.Context) *casdoorsdk.Record {


+ 1
- 1
controllers/vector.go View File

@@ -17,7 +17,7 @@ package controllers
import (
"encoding/json"

"github.com/casbin/casibase/object"
"github.com/casibase/casibase/object"
)

func (c *ApiController) GetGlobalVectors() {


+ 3
- 3
controllers/video.go View File

@@ -21,9 +21,9 @@ import (
"io"
"time"

"github.com/casbin/casibase/object"
"github.com/casbin/casibase/util"
"github.com/casbin/casibase/video"
"github.com/casibase/casibase/object"
"github.com/casibase/casibase/util"
"github.com/casibase/casibase/video"
)

func (c *ApiController) GetGlobalVideos() {


+ 2
- 2
controllers/wordset.go View File

@@ -17,8 +17,8 @@ package controllers
import (
"encoding/json"

"github.com/casbin/casibase/object"
"github.com/casbin/casibase/util"
"github.com/casibase/casibase/object"
"github.com/casibase/casibase/util"
)

func (c *ApiController) GetGlobalWordsets() {


+ 1
- 1
embedding/huggingface.go View File

@@ -17,7 +17,7 @@ package embedding
import (
"context"

"github.com/casbin/casibase/proxy"
"github.com/casibase/casibase/proxy"
"github.com/henomis/lingoose/embedder/huggingface"
)



+ 2
- 2
embedding/openai.go View File

@@ -17,8 +17,8 @@ package embedding
import (
"context"

"github.com/casbin/casibase/proxy"
"github.com/casbin/casibase/util"
"github.com/casibase/casibase/proxy"
"github.com/casibase/casibase/util"
"github.com/sashabaranov/go-openai"
)



+ 1
- 1
go.mod View File

@@ -1,4 +1,4 @@
module github.com/casbin/casibase
module github.com/casibase/casibase

go 1.20



+ 1
- 1
i18n/generate.go View File

@@ -21,7 +21,7 @@ import (
"regexp"
"strings"

"github.com/casbin/casibase/util"
"github.com/casibase/casibase/util"
)

type I18nData map[string]map[string]string


+ 1
- 1
i18n/util.go View File

@@ -17,7 +17,7 @@ package i18n
import (
"fmt"

"github.com/casbin/casibase/util"
"github.com/casibase/casibase/util"
)

func getI18nFilePath(language string) string {


+ 3
- 3
main.go View File

@@ -18,9 +18,9 @@ import (
"github.com/astaxie/beego"
"github.com/astaxie/beego/plugins/cors"
_ "github.com/astaxie/beego/session/redis"
"github.com/casbin/casibase/object"
"github.com/casbin/casibase/proxy"
"github.com/casbin/casibase/routers"
"github.com/casibase/casibase/object"
"github.com/casibase/casibase/proxy"
"github.com/casibase/casibase/routers"
)

func main() {


+ 1
- 1
model/azure_openai.go View File

@@ -15,7 +15,7 @@
package model

import (
"github.com/casbin/casibase/proxy"
"github.com/casibase/casibase/proxy"
"github.com/sashabaranov/go-openai"
)



+ 1
- 1
model/huggingface.go View File

@@ -20,7 +20,7 @@ import (
"io"
"strings"

"github.com/casbin/casibase/proxy"
"github.com/casibase/casibase/proxy"
"github.com/henomis/lingoose/llm/huggingface"
)



+ 1
- 1
model/openai.go View File

@@ -21,7 +21,7 @@ import (
"net/http"
"strings"

"github.com/casbin/casibase/proxy"
"github.com/casibase/casibase/proxy"
"github.com/sashabaranov/go-openai"
)



+ 1
- 1
model/openrouter.go View File

@@ -22,7 +22,7 @@ import (
"strings"

"github.com/Lok-Lu/go-openrouter"
"github.com/casbin/casibase/proxy"
"github.com/casibase/casibase/proxy"
)

type OpenRouterModelProvider struct {


+ 3
- 3
model/query_test.go View File

@@ -20,9 +20,9 @@ package model_test
import (
"testing"

"github.com/casbin/casibase/model"
"github.com/casbin/casibase/object"
"github.com/casbin/casibase/proxy"
"github.com/casibase/casibase/model"
"github.com/casibase/casibase/object"
"github.com/casibase/casibase/proxy"
"github.com/sashabaranov/go-openai"
)



+ 1
- 1
object/chat.go View File

@@ -17,7 +17,7 @@ package object
import (
"fmt"

"github.com/casbin/casibase/util"
"github.com/casibase/casibase/util"
"xorm.io/core"
)



+ 1
- 1
object/factorset.go View File

@@ -17,7 +17,7 @@ package object
import (
"fmt"

"github.com/casbin/casibase/util"
"github.com/casibase/casibase/util"
"xorm.io/core"
)



+ 1
- 1
object/factorset_upload.go View File

@@ -18,7 +18,7 @@ import (
"fmt"
"strings"

"github.com/casbin/casibase/util"
"github.com/casibase/casibase/util"
)

func (factorset *Factorset) LoadFactors(pathPrefix string) {


+ 1
- 1
object/init.go View File

@@ -14,7 +14,7 @@

package object

import "github.com/casbin/casibase/util"
import "github.com/casibase/casibase/util"

func InitDb() {
existed := initBuiltInStore()


+ 1
- 1
object/kmeans.go View File

@@ -19,7 +19,7 @@ import (
"strconv"
"strings"

"github.com/casbin/casibase/util"
"github.com/casibase/casibase/util"
"github.com/muesli/clusters"
"github.com/muesli/kmeans"
)


+ 1
- 1
object/message.go View File

@@ -17,7 +17,7 @@ package object
import (
"fmt"

"github.com/casbin/casibase/util"
"github.com/casibase/casibase/util"
"xorm.io/core"
)



+ 4
- 4
object/provider.go View File

@@ -17,10 +17,10 @@ package object
import (
"fmt"

"github.com/casbin/casibase/embedding"
"github.com/casbin/casibase/model"
"github.com/casbin/casibase/storage"
"github.com/casbin/casibase/util"
"github.com/casibase/casibase/embedding"
"github.com/casibase/casibase/model"
"github.com/casibase/casibase/storage"
"github.com/casibase/casibase/util"
"xorm.io/core"
)



+ 1
- 1
object/search_hnsw.go View File

@@ -19,7 +19,7 @@ import (
"io/ioutil"
"sync"

"github.com/casbin/casibase/util"
"github.com/casibase/casibase/util"
"github.com/casibase/go-hnsw"
)



+ 2
- 2
object/store.go View File

@@ -17,8 +17,8 @@ package object
import (
"fmt"

"github.com/casbin/casibase/storage"
"github.com/casbin/casibase/util"
"github.com/casibase/casibase/storage"
"github.com/casibase/casibase/util"
"xorm.io/core"
)



+ 1
- 1
object/store_provider.go View File

@@ -19,7 +19,7 @@ import (
urllib "net/url"
"strings"

"github.com/casbin/casibase/storage"
"github.com/casibase/casibase/storage"
)

func (store *Store) createPathIfNotExisted(tokens []string, size int64, url string, lastModifiedTime string, isLeaf bool) {


+ 1
- 1
object/task.go View File

@@ -17,7 +17,7 @@ package object
import (
"fmt"

"github.com/casbin/casibase/util"
"github.com/casibase/casibase/util"
"xorm.io/core"
)



+ 1
- 1
object/vector.go View File

@@ -17,7 +17,7 @@ package object
import (
"fmt"

"github.com/casbin/casibase/util"
"github.com/casibase/casibase/util"
"xorm.io/core"
)



+ 5
- 5
object/vector_embedding.go View File

@@ -21,11 +21,11 @@ import (
"strings"
"time"

"github.com/casbin/casibase/embedding"
"github.com/casbin/casibase/model"
"github.com/casbin/casibase/storage"
"github.com/casbin/casibase/txt"
"github.com/casbin/casibase/util"
"github.com/casibase/casibase/embedding"
"github.com/casibase/casibase/model"
"github.com/casibase/casibase/storage"
"github.com/casibase/casibase/txt"
"github.com/casibase/casibase/util"
"golang.org/x/time/rate"
)



+ 1
- 1
object/vector_test.go View File

@@ -17,7 +17,7 @@ package object
import (
"testing"

"github.com/casbin/casibase/model"
"github.com/casibase/casibase/model"
)

func TestUpdateVectors(t *testing.T) {


+ 2
- 2
object/video.go View File

@@ -17,8 +17,8 @@ package object
import (
"fmt"

"github.com/casbin/casibase/util"
"github.com/casbin/casibase/video"
"github.com/casibase/casibase/util"
"github.com/casibase/casibase/video"
"xorm.io/core"
)



+ 1
- 1
object/wordset.go View File

@@ -17,7 +17,7 @@ package object
import (
"fmt"

"github.com/casbin/casibase/util"
"github.com/casibase/casibase/util"
"xorm.io/core"
)



+ 1
- 1
object/wordset_graph.go View File

@@ -20,7 +20,7 @@ import (
"math"
"strconv"

"github.com/casbin/casibase/util"
"github.com/casibase/casibase/util"
)

var graphCache map[string]*Graph


+ 2
- 2
object/wordset_upload.go View File

@@ -15,8 +15,8 @@
package object

import (
"github.com/casbin/casibase/util"
"github.com/casbin/casibase/xlsx"
"github.com/casibase/casibase/util"
"github.com/casibase/casibase/xlsx"
)

func uploadFactorNames(owner string, fileId string) (bool, error) {


+ 1
- 1
proxy/proxy.go View File

@@ -22,7 +22,7 @@ import (
"strings"
"time"

"github.com/casbin/casibase/conf"
"github.com/casibase/casibase/conf"
"golang.org/x/net/proxy"
)



+ 3
- 3
routers/filter.go View File

@@ -21,9 +21,9 @@ import (

"github.com/astaxie/beego"
"github.com/astaxie/beego/context"
"github.com/casbin/casibase/conf"
"github.com/casbin/casibase/controllers"
"github.com/casbin/casibase/util"
"github.com/casibase/casibase/conf"
"github.com/casibase/casibase/controllers"
"github.com/casibase/casibase/util"
)

const (


+ 1
- 1
routers/router.go View File

@@ -16,7 +16,7 @@ package routers

import (
"github.com/astaxie/beego"
"github.com/casbin/casibase/controllers"
"github.com/casibase/casibase/controllers"
)

func init() {


+ 3
- 3
storage/provider_test.go View File

@@ -21,9 +21,9 @@ import (
"fmt"
"testing"

"github.com/casbin/casibase/controllers"
"github.com/casbin/casibase/object"
"github.com/casbin/casibase/storage"
"github.com/casibase/casibase/controllers"
"github.com/casibase/casibase/object"
"github.com/casibase/casibase/storage"
)

func TestStorage(t *testing.T) {


+ 1
- 1
txt/util.go View File

@@ -20,7 +20,7 @@ import (
"io/ioutil"
"path/filepath"

"github.com/casbin/casibase/proxy"
"github.com/casibase/casibase/proxy"
)

func downloadFile(url string) (*bytes.Buffer, error) {


+ 1
- 1
video/vod_api.go View File

@@ -20,7 +20,7 @@ import (
"time"

"github.com/aliyun/alibaba-cloud-sdk-go/services/vod"
"github.com/casbin/casibase/util"
"github.com/casibase/casibase/util"
)

func GetVideoPlayAuth(videoId string) string {


+ 1
- 1
web/src/App.js View File

@@ -445,7 +445,7 @@ class App extends Component {
textAlign: "center",
}
}>
Powered by <a style={{fontWeight: "bold", color: "black"}} target="_blank" rel="noreferrer" href="https://github.com/casbin/casibase">Casibase</a>
Powered by <a style={{fontWeight: "bold", color: "black"}} target="_blank" rel="noreferrer" href="https://github.com/casibase/casibase">Casibase</a>
</Footer>
</React.Fragment>
);


+ 1
- 1
web/src/backend/FetchFilter.js View File

@@ -31,7 +31,7 @@ const demoModeCallback = (res) => {
okText: i18next.t("general:OK"),
cancelText: i18next.t("general:Cancel"),
onOk() {
Setting.openLink(`https://demo-ai.casbin.com${location.pathname}${location.search}?username=built-in/admin&password=123`);
Setting.openLink(`https://demo.casibase.com${location.pathname}${location.search}?username=built-in/admin&password=123`);
},
onCancel() {},
});


+ 1
- 1
xlsx/xlsx.go View File

@@ -15,7 +15,7 @@
package xlsx

import (
"github.com/casbin/casibase/util"
"github.com/casibase/casibase/util"
"github.com/tealeg/xlsx"
)



Loading…
Cancel
Save