datachain 0.2.18__tar.gz → 0.3.1__tar.gz

{datachain-0.2.18 → datachain-0.3.1}/.github/workflows/tests.yml

@@ -8,6 +8,7 @@ on:
 
 env:
   FORCE_COLOR: "1"
+  BRANCH: ${{ github.head_ref || github.ref_name }}
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -144,12 +145,30 @@ jobs:
           - 6379:6379
     steps:
 
+      - name: Studio branch name
+        env:
+          BRANCH: ${{ env.BRANCH }}
+          STUDIO_READ_ACCESS_TOKEN: ${{ secrets.ITERATIVE_STUDIO_READ_ACCESS_TOKEN }}
+        run: |
+          echo "DataChain branch: $BRANCH"
+          if [[ "$BRANCH" == "main" ]]
+          then
+              STUDIO_BRANCH=develop
+          elif git ls-remote --heads https://"$STUDIO_READ_ACCESS_TOKEN"@github.com/iterative/studio.git "$BRANCH" | grep -F "$BRANCH" 2>&1>/dev/null
+          then
+              STUDIO_BRANCH="$BRANCH"
+          else
+              STUDIO_BRANCH=develop
+          fi
+          echo "STUDIO_BRANCH=$STUDIO_BRANCH" >> $GITHUB_ENV
+          echo "Studio branch: $STUDIO_BRANCH"
+
       - name: Check out Studio
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
           repository: iterative/studio
-          ref: develop
+          ref: ${{ env.STUDIO_BRANCH }}
           token: ${{ secrets.ITERATIVE_STUDIO_READ_ACCESS_TOKEN }}
 
       - name: Check out repository

{datachain-0.2.18/src/datachain.egg-info → datachain-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datachain
-Version: 0.2.18
+Version: 0.3.1
 Summary: Wrangle unstructured AI data at scale
 Author-email: Dmitry Petrov <support@dvc.org>
 License: Apache-2.0

{datachain-0.2.18 → datachain-0.3.1}/examples/computer_vision/blip2_image_desc_lib.py

@@ -86,7 +86,7 @@ class LLaVADescribe(Mapper):
 if __name__ == "__main__":
     (
         DataChain.from_storage(source, type="image")
-        .filter(C("file.name").glob("cat*.jpg"))
+        .filter(C("file.path").glob("*/cat*.jpg"))
         .map(
             desc=BLIP2Describe(
                 # device=device,
@@ -95,8 +95,6 @@ if __name__ == "__main__":
             params=["file"],
             output={"description": str, "error": str},
         )
-        .select(
-            "file.source", "file.parent", "file.name", "desc.description", "desc.error"
-        )
+        .select("file.source", "file.path", "desc.description", "desc.error")
         .show(5)
     )