From 855391127d8835305af8681f531b9496f48f9810 Mon Sep 17 00:00:00 2001 From: FanOne <294350394@qq.com> Date: Mon, 6 Nov 2023 00:15:32 +0800 Subject: [PATCH] feat: add now time --- app/favorite/cmd/main.go | 1 - app/index_platform/cmd/main.go | 17 ++--------- app/index_platform/service/index_platform.go | 6 ++-- app/search_vector/consts/consts.py | 2 ++ app/search_vector/milvus/operators.py | 3 +- app/search_vector/service/search_vector.py | 11 ++++--- go.mod | 15 +++++----- go.sum | 31 ++++++++++++-------- main.py | 4 +-- pkg/timeutils/inverted_index.go | 7 +++++ pkg/timeutils/inverted_index_test.go | 5 ++++ 11 files changed, 57 insertions(+), 45 deletions(-) diff --git a/app/favorite/cmd/main.go b/app/favorite/cmd/main.go index c28a9ff..9626c6f 100644 --- a/app/favorite/cmd/main.go +++ b/app/favorite/cmd/main.go @@ -16,7 +16,6 @@ import ( logs "github.com/CocaineCong/tangseng/pkg/logger" ) - func main() { loading.Loading() // etcd 地址 diff --git a/app/index_platform/cmd/main.go b/app/index_platform/cmd/main.go index 0bdc183..58a3d84 100644 --- a/app/index_platform/cmd/main.go +++ b/app/index_platform/cmd/main.go @@ -13,16 +13,13 @@ import ( "github.com/CocaineCong/tangseng/app/index_platform/cmd/kfk_register" "github.com/CocaineCong/tangseng/app/index_platform/service" "github.com/CocaineCong/tangseng/config" + "github.com/CocaineCong/tangseng/consts" "github.com/CocaineCong/tangseng/idl/pb/index_platform" "github.com/CocaineCong/tangseng/loading" "github.com/CocaineCong/tangseng/pkg/discovery" logs "github.com/CocaineCong/tangseng/pkg/logger" ) -const ( - IndexPlatformServerName = "index_platform" -) - func main() { ctx := context.Background() // 加载配置 @@ -32,18 +29,12 @@ func main() { job.RegisterJob(ctx) // 注册服务 - _ = registerIndexPlatform() -} - -// registerIndexPlatform 注册索引平台服务 -func registerIndexPlatform() (err error) { etcdAddress := []string{config.Conf.Etcd.Address} etcdRegister := discovery.NewRegister(etcdAddress, logs.LogrusObj) defer etcdRegister.Stop() - - grpcAddress := config.Conf.Services[IndexPlatformServerName].Addr[0] + grpcAddress := config.Conf.Services[consts.IndexPlatformName].Addr[0] node := discovery.Server{ - Name: config.Conf.Domain[IndexPlatformServerName].Name, + Name: config.Conf.Domain[consts.IndexPlatformName].Name, Addr: grpcAddress, } server := grpc.NewServer() @@ -61,6 +52,4 @@ func registerIndexPlatform() (err error) { if err = server.Serve(lis); err != nil { panic(err) } - - return } diff --git a/app/index_platform/service/index_platform.go b/app/index_platform/service/index_platform.go index ace2006..93c0916 100644 --- a/app/index_platform/service/index_platform.go +++ b/app/index_platform/service/index_platform.go @@ -97,7 +97,7 @@ func (s *IndexPlatformSrv) BuildIndexService(ctx context.Context, req *pb.BuildI } wg.Wait() - // // 构建前缀树 // TODO:kafka处理 + // // 构建前缀树 // TODO: kafka处理 // go func(tokenList []string) { // err = input_data.DocTrie2Kfk(tokenList) // if err != nil { @@ -151,7 +151,7 @@ func (s *IndexPlatformSrv) BuildIndexService(ctx context.Context, req *pb.BuildI // storeInvertedIndexByHash 分片存储 func storeInvertedIndexByHash(ctx context.Context, invertedIndex cmap.ConcurrentMap[string, *roaring.Bitmap]) (err error) { dir, _ := os.Getwd() - outName := fmt.Sprintf("%s/%s.%s", dir, timeutils.GetTodayDate(), cconsts.InvertedBucket) + outName := fmt.Sprintf("%s/%s.%s", dir, timeutils.GetNowTime(), cconsts.InvertedBucket) invertedDB := storage.NewInvertedDB(outName) // 找出所有的key进行存储 for k, val := range invertedIndex.Items() { @@ -193,7 +193,7 @@ func storeInvertedIndexByHash(ctx context.Context, invertedIndex cmap.Concurrent func storeDictTrieByHash(ctx context.Context, dict *trie.Trie) (err error) { // TODO: 抽离一个hash存储的方法 dir, _ := os.Getwd() - outName := fmt.Sprintf("%s/%s.%s", dir, timeutils.GetTodayDate(), cconsts.TrieTreeBucket) + outName := fmt.Sprintf("%s/%s.%s", dir, timeutils.GetNowTime(), cconsts.TrieTreeBucket) trieDB := storage.NewTrieDB(outName) err = trieDB.StorageDict(dict) if err != nil { diff --git a/app/search_vector/consts/consts.py b/app/search_vector/consts/consts.py index c2762ea..ec4e53e 100644 --- a/app/search_vector/consts/consts.py +++ b/app/search_vector/consts/consts.py @@ -2,3 +2,5 @@ default some constants """ KAFKA_CONSUMER_VECTOR_INDEX_TOPIC = "search-engine-csv-loader-topic" + +VECTOR_RECALL_TOPK = 20 diff --git a/app/search_vector/milvus/operators.py b/app/search_vector/milvus/operators.py index b9248b5..eb3f41f 100644 --- a/app/search_vector/milvus/operators.py +++ b/app/search_vector/milvus/operators.py @@ -18,7 +18,8 @@ def do_upload(table_name: str, doc_id: int, title: str, body: str, try: if not table_name: table_name = DEFAULT_MILVUS_TABLE_NAME - milvus_client.create_collection(table_name) + if not milvus_client.has_collection(table_name): + milvus_client.create_collection(table_name) body_feat = TRANSFORMER_MODEL.encode(title + body) # word 转 vec ids = milvus_client.insert(table_name, [doc_id], [body_feat]) return ids diff --git a/app/search_vector/service/search_vector.py b/app/search_vector/service/search_vector.py index c82bb68..b7e21a4 100644 --- a/app/search_vector/service/search_vector.py +++ b/app/search_vector/service/search_vector.py @@ -1,8 +1,10 @@ +"""search vector grpc service""" import json import grpc import logging import asyncio +from ..consts.consts import VECTOR_RECALL_TOPK from idl.pb.search_vector import search_vector_pb2 from ..config.config import DEFAULT_MILVUS_TABLE_NAME, VECTOR_ADDR from ..milvus.operators import do_search @@ -12,6 +14,9 @@ class SearchVectorService(search_vector_pb2_grpc.SearchVectorServiceServicer): + """ + search vector service objective + """ def SearchVector(self, request, context) -> search_vector_pb2.SearchVectorResponse: @@ -19,8 +24,8 @@ def SearchVector(self, request, queryies = request.query doc_ids = [] for query in queryies: - ids, distants = do_search(DEFAULT_MILVUS_TABLE_NAME, query, 1, - milvus_client) + ids, distants = do_search(DEFAULT_MILVUS_TABLE_NAME, query, + VECTOR_RECALL_TOPK, milvus_client) print("search vector ids", ids) doc_ids += ids print("search vector data", doc_ids) @@ -31,8 +36,6 @@ def SearchVector(self, request, except Exception as e: print("search vector error", e) return search_vector_pb2.SearchVectorResponse(code=500, - doc_ids='', - msg='fail', error=str(e)) diff --git a/go.mod b/go.mod index 7822194..019bade 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/redis/go-redis/v9 v9.2.1 github.com/robfig/cron/v3 v3.0.1 github.com/samber/lo v1.38.1 - github.com/sirupsen/logrus v1.9.2 + github.com/sirupsen/logrus v1.9.3 github.com/spf13/cast v1.5.0 github.com/spf13/viper v1.15.0 github.com/xtgo/set v1.0.0 @@ -52,6 +52,7 @@ require ( github.com/eapache/go-resiliency v1.4.0 // indirect github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect github.com/eapache/queue v1.1.0 // indirect + github.com/frankban/quicktest v1.14.5 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/getsentry/sentry-go v0.12.0 // indirect github.com/gin-contrib/sse v0.1.0 // indirect @@ -89,11 +90,11 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.16.7 // indirect github.com/klauspost/cpuid/v2 v2.0.9 // indirect - github.com/kr/pretty v0.3.0 // indirect + github.com/kr/pretty v0.3.1 // indirect github.com/kr/text v0.2.0 // indirect github.com/leodido/go-urn v1.2.1 // indirect github.com/magiconair/properties v1.8.7 // indirect - github.com/mattn/go-isatty v0.0.17 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect github.com/miekg/dns v1.1.27 // indirect github.com/milvus-io/milvus-proto/go-api/v2 v2.3.1 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect @@ -106,7 +107,7 @@ require ( github.com/pierrec/lz4/v4 v4.1.18 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect - github.com/rogpeppe/go-internal v1.8.1 // indirect + github.com/rogpeppe/go-internal v1.9.0 // indirect github.com/smartystreets/goconvey v1.8.0 // indirect github.com/spf13/afero v1.9.3 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect @@ -124,10 +125,10 @@ require ( go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.21.0 // indirect - golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect - golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect + golang.org/x/arch v0.5.0 // indirect + golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect golang.org/x/net v0.14.0 // indirect - golang.org/x/sys v0.11.0 // indirect + golang.org/x/sys v0.13.0 // indirect golang.org/x/text v0.12.0 // indirect google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/go.sum b/go.sum index 0036c63..54a213c 100644 --- a/go.sum +++ b/go.sum @@ -199,7 +199,8 @@ github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/forestgiant/sliceutil v0.0.0-20160425183142-94783f95db6c/go.mod h1:pFdJbAhRf7rh6YYMUdIQGyzne6zYL1tCUW8QV2B3UfY= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= -github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= +github.com/frankban/quicktest v1.14.5 h1:dfYrrRyLtiqT9GyKXgdh+k4inNeTvmGbuSgZ3lx3GhA= +github.com/frankban/quicktest v1.14.5/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= @@ -332,6 +333,7 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= @@ -465,8 +467,9 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxv github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -498,8 +501,8 @@ github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= -github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= -github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-tty v0.0.0-20180219170247-931426f7535a/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE= @@ -619,8 +622,9 @@ github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6So github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg= github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= +github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= @@ -635,8 +639,8 @@ github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeV github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/sirupsen/logrus v1.9.2 h1:oxx1eChJGI6Uks2ZC4W1zpLlVgqB8ner4EuQwV4Ik1Y= -github.com/sirupsen/logrus v1.9.2/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/assertions v1.13.1 h1:Ef7KhSmjZcK6AVf9YbJdvPYG9avaF0ZxudX+ThRdWfU= @@ -772,8 +776,9 @@ go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8= go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= -golang.org/x/arch v0.0.0-20210923205945-b76863e36670 h1:18EFjUmQOcUvxNYSkA6jO9VAiXCnxFY6NyDX0bHDmkU= golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= +golang.org/x/arch v0.5.0 h1:jpGode6huXQxcskEIpOCvrU+tzo81b6+oFLUYXWtH/Y= +golang.org/x/arch v0.5.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/crypto v0.0.0-20180621125126-a49355c7e3f8/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -811,8 +816,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 h1:3MTrJm4PyNL9NBqvYDSj3DHl46qQakyfqfWo4jgfaEM= -golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE= +golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI= +golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -978,11 +983,11 @@ golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= -golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= diff --git a/main.py b/main.py index 8bf08b9..403703e 100644 --- a/main.py +++ b/main.py @@ -185,5 +185,5 @@ def init_model(): if __name__ == "__main__": # app.run(host=WEBSITE_HOST, port=WEBSITE_PORT, debug=True) # print("start server {}:{}".format(WEBSITE_HOST, WEBSITE_PORT)) - # consume_inverted_index() - asyncio.run(serve()) + # asyncio.run(serve()) + consume_inverted_index() diff --git a/pkg/timeutils/inverted_index.go b/pkg/timeutils/inverted_index.go index fef6288..7141eea 100644 --- a/pkg/timeutils/inverted_index.go +++ b/pkg/timeutils/inverted_index.go @@ -2,6 +2,7 @@ package timeutils import ( "fmt" + "strings" "github.com/golang-module/carbon" ) @@ -11,6 +12,12 @@ func GetTodayDate() string { return carbon.Now().ToDateString() } +// GetNowTime return 2023-10-01 +func GetNowTime() string { + timeStr := strings.Split(carbon.Now().String(), " ") + return fmt.Sprintf("%s-%s", timeStr[0], timeStr[1]) +} + // GetMonthDate return 2023-10 func GetMonthDate() string { year := carbon.Now().Year() diff --git a/pkg/timeutils/inverted_index_test.go b/pkg/timeutils/inverted_index_test.go index 9ecf791..69bd477 100644 --- a/pkg/timeutils/inverted_index_test.go +++ b/pkg/timeutils/inverted_index_test.go @@ -19,3 +19,8 @@ func TestGetSeasonDate(t *testing.T) { a := GetSeasonDate() fmt.Println(a) } + +func TestGetNowTime(t *testing.T) { + b := GetNowTime() + fmt.Println(b) +}