Skip to content

Commit

Permalink
Merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
daveatweaviate committed Aug 30, 2024
2 parents fc06301 + fd1a292 commit 34e70fb
Show file tree
Hide file tree
Showing 276 changed files with 11,591 additions and 3,074 deletions.
17 changes: 11 additions & 6 deletions .vscode/python.code-snippets
Original file line number Diff line number Diff line change
@@ -1,17 +1,22 @@
{
"Edu demo WCD connect": {
"prefix": "edu-demo-wcd-connect",
"Weaviate WCD connect": {
"prefix": "Weaviate-wcd-connect",
"body": [
"import weaviate",
"from weaviate.classes.init import Auth",
"import os",
"",
"wcd_url = os.environ[\"WCD_DEMO_URL\"]",
"wcd_api_key = os.environ[\"WCD_DEMO_RO_KEY\"]",
"openai_api_key = os.environ[\"OPENAI_APIKEY\"]",
"cohere_api_key = os.environ[\"COHERE_APIKEY\"]",
"",
"client = weaviate.connect_to_weaviate_cloud(",
" cluster_url=os.getenv(\"WCD_DEMO_URL\"),",
" auth_credentials=Auth.api_key(os.getenv(\"WCD_DEMO_RO_KEY\")),",
" cluster_url=wcd_url,",
" auth_credentials=Auth.api_key(wcd_api_key),",
" headers={",
" \"X-OpenAI-Api-Key\": os.getenv(\"OPENAI_APIKEY\"),",
" \"X-Cohere-Api-Key\": os.getenv(\"COHERE_APIKEY\"),",
" \"X-OpenAI-Api-Key\": openai_api_key,",
" \"X-Cohere-Api-Key\": cohere_api_key,",
" },",
")",
""
Expand Down
5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,5 +92,10 @@
"Verba",
"xlarge",
"xsum"
],
"cSpell.ignoreWords": [
"EKZGU",
"LBRW",
"pcep"
]
}
1 change: 1 addition & 0 deletions _build_scripts/slack-find-author.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ git_slack_map=(
["thomashacker"]="<@U056E1ZEM3L>"
["Wera"]="<@U043TKSEU5V>"
["Zain Hasan"]="<@U043TKSJQF9>"
["Mohamed Shahin"]="<@U05V4HPJ3M0>"
)

# Get the Author name and map it to their Slack handle
Expand Down
18 changes: 12 additions & 6 deletions _build_scripts/update-config-versions.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
const fetch = require('node-fetch');

const getRepoVersion = async (repoName) => {
const response = await fetch(
`https://api.github.com/repos/weaviate/${repoName}/releases/latest`,
const response = await fetch( // fetch all release versions
`https://api.github.com/repos/weaviate/${repoName}/releases`,
{
method: 'GET',
headers: {
Expand All @@ -14,12 +14,18 @@ const getRepoVersion = async (repoName) => {
}
);

const repoData = await response.json();
const releases = await response.json();
const highestVersion = releases
.filter(item => !item.prerelease) // remove pre-release items
.map(item => item.tag_name) // keep only the tag_name
.sort() // sort items alphabetically – ascending
.pop() // the last item contains the highest version (what we need)
.replace('v', '') // remove the v from the name "v1.26.1" => "1.26.1"

const version = repoData.tag_name.match(/\d{1,2}\.\d{1,2}\.\d{1,2}/g)[0]
return version;
}
console.log(`${repoName} ${highestVersion}`)

return highestVersion;
}

// Build time versions replace values set in versions-config.json
// versions-config.json values are used for yarn local yarn builds
Expand Down
2 changes: 2 additions & 0 deletions _includes/clients/matrix-intro.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ For links to the client releases associated with the latest Weaviate core releas

|Weaviate Version|Release Date|Python|TypeScript|Go|Java|
|:-|:-|:-:|:-:|:-:|:-:|
| [1.26.3](https://github.com/weaviate/weaviate/releases/tag/v1.26.3) | 2024-08-29 | 4.7.1 | 3.1.4 | 4.15.1 | 4.8.2 |
| [1.26.2](https://github.com/weaviate/weaviate/releases/tag/v1.26.2) | 2024-08-29 | '' | '' | '' | '' |
| [1.26.1](https://github.com/weaviate/weaviate/releases/tag/v1.26.1) | 2024-07-18 | 4.6.6 | 3.0.8 | 4.14.2 | 4.8.0 |
| [1.26.0](https://github.com/weaviate/weaviate/releases/tag/v1.26.0) | 2024-07-18 | '' | '' | '' | 4.7.0 |

Expand Down
20 changes: 19 additions & 1 deletion _includes/code/connections/connect-python-v3.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,30 @@

# Create the client
client = weaviate.Client(
url="http:localhost:8080"
url="http://localhost:8080"
)

print(client.is_ready())
# END LocalNoAuth

###############################
### Local change URL & port ###
###############################

# START CustomURL
import weaviate

# Create the client
client = weaviate.Client(
url="http://127.0.0.1:8080"
# The v3 client doesn't use the gRPC port
)

print(client.is_ready())
# END CustomURL



##################
### Local auth ###
##################
Expand Down
Loading

0 comments on commit 34e70fb

Please sign in to comment.