pointblank 0.9.6__tar.gz → 0.10.0__tar.gz

{pointblank-0.9.6 → pointblank-0.10.0}/.github/workflows/ci-docs.yaml

@@ -14,13 +14,17 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.11"
       - name: Install dependencies
         run: |
           python -m pip install -e .
           python -m pip install ".[docs]"
           python -m pip install ibis-framework[duckdb]
           python -m pip install pins
+          python -m pip install pandera
+          python -m pip install patito
+          python -m pip install validoopsie
+          python -m pip install dataframely
       - name: Set up Quarto
         uses: quarto-dev/quarto-actions/setup@v2
       - name: Build docs

{pointblank-0.9.6 → pointblank-0.10.0}/.github/workflows/ci-tests.yaml

@@ -24,12 +24,8 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Install dependencies
-        run: |
-          pip install -e '.[dev]'
-      - name: Install test dependencies
-        run: |
-          pip install pytest pytest-rerunfailures pytest-randomly pytest-xdist pytest-cov pytest-snapshot pandas polars ibis-framework[duckdb,mysql,postgres,sqlite]>=9.5.0 chatlas requests shiny
+      - name: Install uv
+        uses: astral-sh/setup-uv@v5
       - name: pytest unit tests
         run: |
           make test

{pointblank-0.9.6 → pointblank-0.10.0}/.gitignore

@@ -130,3 +130,6 @@ benchmark/results/
 benchmark/reports/
 benchmark/data/*.csv.gz
 benchmark/data/*.json
+.swp
+
+uv.lock

{pointblank-0.9.6 → pointblank-0.10.0}/Makefile

@@ -2,7 +2,7 @@
 
 .PHONY: test
 test:
-	@pytest \
+	@uv run pytest \
 		--cov=pointblank \
 		--cov-report=term-missing \
 		--randomly-seed 123 \

{pointblank-0.9.6 → pointblank-0.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pointblank
-Version: 0.9.6
+Version: 0.10.0
 Summary: Find out if your data is what you think it is.
 Author-email: Richard Iannone <riannone@me.com>
 License: MIT License
@@ -43,7 +43,7 @@ License-File: LICENSE
 Requires-Dist: commonmark>=0.9.1
 Requires-Dist: importlib-metadata
 Requires-Dist: great_tables>=0.17.0
-Requires-Dist: narwhals>=1.24.1
+Requires-Dist: narwhals>=1.41.0
 Requires-Dist: typing_extensions>=3.10.0.0
 Requires-Dist: requests>=2.31.0
 Provides-Extra: pd
@@ -84,7 +84,7 @@ Dynamic: license-file
 
 <div align="center">
 
-<a href="https://posit-dev.github.io/pointblank/"><img src="https://posit-dev.github.io/pointblank/assets/pointblank_logo.svg" width="75%"/></a>
+<a href="https://posit-dev.github.io/pointblank/"><img src="https://posit-dev.github.io/pointblank/assets/pointblank_logo.svg" width="85%"/></a>
 
 _Data validation made beautiful and powerful_
 
@@ -98,6 +98,7 @@ _Data validation made beautiful and powerful_
 [![Codecov branch](https://img.shields.io/codecov/c/github/posit-dev/pointblank/main.svg)](https://codecov.io/gh/posit-dev/pointblank)
 [![Repo Status](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active)
 [![Documentation](https://img.shields.io/badge/docs-project_website-blue.svg)](https://posit-dev.github.io/pointblank/)
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/posit-dev/pointblank)
 
 [![Contributors](https://img.shields.io/github/contributors/posit-dev/pointblank)](https://github.com/posit-dev/pointblank/graphs/contributors)
 [![Discord](https://img.shields.io/discord/1345877328982446110?color=%237289da&label=Discord)](https://discord.com/invite/YH7CybCNCQ)

{pointblank-0.9.6 → pointblank-0.10.0}/README.md

@@ -1,6 +1,6 @@
 <div align="center">
 
-<a href="https://posit-dev.github.io/pointblank/"><img src="https://posit-dev.github.io/pointblank/assets/pointblank_logo.svg" width="75%"/></a>
+<a href="https://posit-dev.github.io/pointblank/"><img src="https://posit-dev.github.io/pointblank/assets/pointblank_logo.svg" width="85%"/></a>
 
 _Data validation made beautiful and powerful_
 
@@ -14,6 +14,7 @@ _Data validation made beautiful and powerful_
 [![Codecov branch](https://img.shields.io/codecov/c/github/posit-dev/pointblank/main.svg)](https://codecov.io/gh/posit-dev/pointblank)
 [![Repo Status](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active)
 [![Documentation](https://img.shields.io/badge/docs-project_website-blue.svg)](https://posit-dev.github.io/pointblank/)
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/posit-dev/pointblank)
 
 [![Contributors](https://img.shields.io/github/contributors/posit-dev/pointblank)](https://github.com/posit-dev/pointblank/graphs/contributors)
 [![Discord](https://img.shields.io/discord/1345877328982446110?color=%237289da&label=Discord)](https://discord.com/invite/YH7CybCNCQ)

{pointblank-0.9.6 → pointblank-0.10.0}/docs/_extensions/machow/interlinks/interlinks.lua

@@ -1,3 +1,13 @@
+local inventory = {} -- sphinx inventories
+local autolink       -- set in Meta
+local autolink_ignore_token = "qd-no-link"
+
+local function _debug_log(text, debug)
+    if debug then
+        quarto.log.warning(text)
+    end
+end
+
 local function read_inv_text(filename)
     -- read file
     local file = io.open(filename, "r")
@@ -11,16 +21,16 @@ local function read_inv_text(filename)
     local project = str:match("# Project: (%S+)")
     local version = str:match("# Version: (%S+)")
 
-    local data = {project = project, version = version, items = {}}
+    local data = { project = project, version = version, items = {} }
 
     local ptn_data =
         "^" ..
-        "(.-)%s+" ..        -- name
-        "([%S:]-):" ..      -- domain
-        "([%S]+)%s+" ..     -- role
-        "(%-?%d+)%s+" ..     -- priority
-        "(%S*)%s+" ..       -- uri
-        "(.-)\r?$"         -- dispname
+        "(.-)%s+" ..     -- name
+        "([%S:]-):" ..   -- domain
+        "([%S]+)%s+" ..  -- role
+        "(%-?%d+)%s+" .. -- priority
+        "(%S*)%s+" ..    -- uri
+        "(.-)\r?$"       -- dispname
 
 
     -- Iterate through each line in the file content
@@ -48,7 +58,6 @@ local function read_inv_text(filename)
 end
 
 local function read_json(filename)
-
     local file = io.open(filename, "r")
     if file == nil then
         return nil
@@ -66,7 +75,6 @@ local function read_inv_text_or_json(base_name)
         -- TODO: refactors so we don't just close the file immediately
         io.close(file)
         json = read_inv_text(base_name .. ".txt")
-
     else
         json = read_json(base_name .. ".json")
     end
@@ -74,10 +82,8 @@ local function read_inv_text_or_json(base_name)
     return json
 end
 
-local inventory = {}
-
-local function lookup(search_object)
-
+-- each inventory has entries: project, version, items
+local function lookup(search_object, debug)
     local results = {}
     for _, inv in ipairs(inventory) do
         for _, item in ipairs(inv.items) do
@@ -98,7 +104,7 @@ local function lookup(search_object)
                 goto continue
             else
                 if search_object.domain or item.domain == "py" then
-                  table.insert(results, item)
+                    table.insert(results, item)
                 end
 
                 goto continue
@@ -112,23 +118,24 @@ local function lookup(search_object)
         return results[1]
     end
     if #results > 1 then
-        quarto.log.warning("Found multiple matches for " .. search_object.name .. ", using the first match.")
+        _debug_log("Found multiple matches for " .. search_object.name .. ", using the first match.", debug)
         return results[1]
     end
     if #results == 0 then
-        quarto.log.warning("Found no matches for object:\n", search_object)
+        _debug_log("Found no matches for object:\n", debug)
+        _debug_log(search_object, debug)
     end
 
     return nil
 end
 
-local function mysplit (inputstr, sep)
+local function mysplit(inputstr, sep)
     if sep == nil then
-            sep = "%s"
+        sep = "%s"
     end
-    local t={}
-    for str in string.gmatch(inputstr, "([^"..sep.."]+)") do
-            table.insert(t, str)
+    local t = {}
+    for str in string.gmatch(inputstr, "([^" .. sep .. "]+)") do
+        table.insert(t, str)
     end
     return t
 end
@@ -140,7 +147,84 @@ local function normalize_role(role)
     return role
 end
 
-local function build_search_object(str)
+local function copy_replace(original, key, new_value)
+    -- First create a copy of the table
+    local copy = {}
+    for k, v in pairs(original) do
+        copy[k] = v
+    end
+
+    -- Then replace the specific value
+    copy[key] = new_value
+
+    return copy
+end
+
+local function contains(list, value)
+    -- check if list contains a value
+    for i, v in ipairs(list) do
+        if v == value then
+            return true
+        end
+    end
+    return false
+end
+
+local function flatten_alias_list(list)
+    -- flatten a list of lists into a single list,
+    -- where each entry has the form {key, subvalue}}
+    -- e.g.
+    --   input: {key1 = {subval1, subval2}, key2 = subval3}
+    --   output: {{key1, subval1}, {key1, subval2}, {key2, subval3}}
+    local flat = {}
+    for key, sublist in pairs(list) do
+        if type(sublist) == "table" then
+            for _, subvalue in ipairs(sublist) do
+                table.insert(flat, { key, subvalue })
+            end
+        else
+            table.insert(flat, { key, sublist })
+        end
+    end
+    return flat
+end
+
+local function prepend_aliases(flat_aliases)
+    -- if str up to first period starts with an alias, then
+    -- replace it with the full name.
+    -- For example, suppose we have the alias quartodoc -> qd
+    -- e.g. qd.Auto -> quartodoc.Auto
+    -- e.g. qda.Auto -> qda.Auto
+
+    local new_inv = {}
+    new_inv["project"] = "aliases"
+    new_inv["version"] = "0.0.9999" -- I have not begun to think about version...
+    new_inv["items"] = {}
+
+    for _, name_pair in pairs(flat_aliases) do
+        local full = name_pair[1]
+        local alias = name_pair[2]
+        for _, inv in ipairs(inventory) do
+            for _, item in ipairs(inv.items) do
+                if string.sub(item.name, 1, string.len(full) + 1) == (full .. ".") then
+                    -- replace full .. "." with alias .. "."
+                    local prefix
+                    if not alias or pandoc.utils.stringify(alias) == "" then
+                        prefix = ""
+                    else
+                        -- TODO: ensure alias doesn't end with period
+                        prefix = pandoc.utils.stringify(alias) .. "."
+                    end
+                    local new_name = prefix .. string.sub(item.name, string.len(full) + 2)
+                    table.insert(new_inv.items, copy_replace(item, "name", new_name))
+                end
+            end
+        end
+    end
+    table.insert(inventory, new_inv)
+end
+
+local function build_search_object(str, debug)
     local starts_with_colon = str:sub(1, 1) == ":"
     local search = {}
     if starts_with_colon then
@@ -163,7 +247,7 @@ local function build_search_object(str)
             search.role = normalize_role(t[3])
             search.name = t[4]:match("%%60(.*)%%60")
         else
-            quarto.log.warning("couldn't parse this link: " .. str)
+            _debug_log("couldn't parse this link: " .. str, debug)
             return {}
         end
     else
@@ -171,7 +255,7 @@ local function build_search_object(str)
     end
 
     if search.name == nil then
-        quarto.log.warning("couldn't parse this link: " .. str)
+        _debug_log("couldn't parse this link: " .. str, debug)
         return {}
     end
 
@@ -220,7 +304,60 @@ function Link(link)
     return link
 end
 
-local function fixup_json(json, prefix)
+function Code(code)
+    if (not autolink) or contains(code.classes, autolink_ignore_token) then
+        return code
+    end
+
+    -- allow text for lookup to be simple function call
+    -- and also support shortened syntax (~~ prefix)
+    -- e.g. my_func() -> my_func
+    -- e.g. a.b.call() -> a.b.call
+    -- e.g. ~~my_func() -> my_func
+    local text
+
+    -- detect and remove shortening syntax (~~ prefix)
+    local is_shortened = code.text:sub(1, 2) == "~~"
+    local is_short_dot = code.text:sub(1, 3) == "~~."
+    local unprefixed = code.text:gsub("^~~%.?", "")
+    if unprefixed:match("%(%s*%)") then
+        text = unprefixed:gsub("%(%s*%)", "")
+    else
+        text = unprefixed
+    end
+
+
+    -- return code.attr
+    local search = build_search_object("%60" .. text .. "%60")
+    local item = lookup(search)
+
+    -- determine replacement, used if no link text specified ----
+    if item == nil then
+        code.text = unprefixed
+        return code
+    end
+
+    -- shorten text if shortening syntax used
+    if is_shortened then
+        -- keep text after last period (.)
+        local split = mysplit(unprefixed, ".")
+        if #split > 0 then
+            local new_name = split[#split]
+            if is_short_dot then
+                -- if shortened with dot, keep the dot
+                new_name = "." .. new_name
+            end
+            code.text = new_name
+        else
+            code.text = unprefixed
+        end
+    end
+
+
+    return pandoc.Link(code, item.uri:gsub("%$$", search.name))
+end
+
+local function fixup_json(json, prefix, attach)
     for _, item in ipairs(json.items) do
         item.uri = prefix .. item.uri
     end
@@ -232,6 +369,23 @@ return {
         Meta = function(meta)
             local json
             local prefix
+            local aliases
+
+            -- set globals from config
+            if meta.interlinks and meta.interlinks.autolink then
+                autolink = true
+            else
+                autolink = false
+            end
+
+            local aliases
+            if meta.interlinks and meta.interlinks.aliases then
+                aliases = meta.interlinks.aliases
+            else
+                aliases = {}
+            end
+
+            -- process sources
             if meta.interlinks and meta.interlinks.sources then
                 for k, v in pairs(meta.interlinks.sources) do
                     local base_name = quarto.project.offset .. "/_inv/" .. k .. "_objects"
@@ -246,9 +400,12 @@ return {
             if json ~= nil then
                 fixup_json(json, "/")
             end
+
+            prepend_aliases(flatten_alias_list(aliases))
         end
     },
     {
-        Link = Link
+        Link = Link,
+        Code = Code
     }
 }

{pointblank-0.9.6 → pointblank-0.10.0}/docs/_quarto.yml

@@ -1,5 +1,6 @@
 project:
   type: website
+  post-render: scripts/post-render.py
 
 format:
   html:
@@ -19,6 +20,9 @@ filters:
 
 interlinks:
   fast: true
+  autolink: true
+  aliases:
+    pointblank: [null, pb]
   sources:
     numpy:
       url: https://numpy.org/doc/stable/
@@ -83,6 +87,9 @@ website:
             - user-guide/preview.qmd
             - user-guide/col-summary-tbl.qmd
             - user-guide/missing-vals-tbl.qmd
+  page-footer:
+    left: 'Proudly supported by <a href="https://www.posit.co/" class="no-icon"><img src="/assets/posit-logo-black.svg" alt="Posit" width="80" style="padding-left: 3px;vertical-align:text-top;"></a>'
+    right: "&copy; 2024&ndash;2025 Posit Software, PBC."
 
 html-table-processing: none
 
@@ -203,6 +210,8 @@ quartodoc:
         - name: missing_vals_tbl
         - name: assistant
         - name: load_dataset
+        - name: get_data_path
+        - name: connect_to_table
     - title: Utility Functions
       desc: >
         The *Utility Functions* group contains functions that are useful accessing metadata about

{pointblank-0.9.6 → pointblank-0.10.0}/docs/assets/pointblank_logo.svg

@@ -1,7 +1,92 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="2481px" height="441px" viewBox="0 0 2481 441" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="background: #FFFFFF;">
-    <title>pointblank_logo@1x</title>
+    <title>pointblank_logo</title>
+    
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <!-- Background shadow circles (render first, so they appear behind everything) -->
+        <g id="shadow-circles">
+            <!-- Shadow for main circle -->
+            <circle id="shadow-1" fill="#E20000" fill-opacity="0.15" cx="154.010993" cy="260.268789" r="24">
+                <animate attributeName="r" dur="4s" repeatCount="indefinite" begin="0s"
+                         values="24;36;24;24;24" />
+                <animate attributeName="fill" dur="20s" repeatCount="indefinite" begin="0s"
+                         values="#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#888888;#FFCC00;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000" />
+            </circle>
+            
+            <!-- Shadow for circle 2 -->
+            <circle id="shadow-2" fill="#E20000" fill-opacity="0.15" cx="570.7139" cy="265.65" r="21">
+                <animate attributeName="r" dur="3.5s" repeatCount="indefinite" begin="0.4s"
+                         values="21;32;21;21;21" />
+                <animate attributeName="fill" dur="20s" repeatCount="indefinite" begin="2s"
+                         values="#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#888888;#FFCC00;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000" />
+            </circle>
+            
+            <!-- Shadow for circle 3 -->
+            <circle id="shadow-3" fill="#E20000" fill-opacity="0.15" cx="735.702447" cy="124.804146" r="20">
+                <animate attributeName="r" dur="4.5s" repeatCount="indefinite" begin="0.8s"
+                         values="20;30;20;20;20" />
+                <animate attributeName="fill" dur="20s" repeatCount="indefinite" begin="4s"
+                         values="#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#888888;#FFCC00;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000" />
+            </circle>
+            
+            <!-- Shadow for circle 4 -->
+            <circle id="shadow-4" fill="#E20000" fill-opacity="0.15" cx="901.711934" cy="265.65" r="22">
+                <animate attributeName="r" dur="3.8s" repeatCount="indefinite" begin="1.2s"
+                         values="22;33;22;22;22" />
+                <animate attributeName="fill" dur="20s" repeatCount="indefinite" begin="6s"
+                         values="#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#888888;#FFCC00;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000" />
+            </circle>
+            
+            <!-- Shadow for circle 5 -->
+            <circle id="shadow-5" fill="#E20000" fill-opacity="0.15" cx="1154.49299" cy="265.65" r="23">
+                <animate attributeName="r" dur="3.2s" repeatCount="indefinite" begin="1.6s"
+                         values="23;34;23;23;23" />
+                <animate attributeName="fill" dur="20s" repeatCount="indefinite" begin="8s"
+                         values="#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#888888;#FFCC00;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000" />
+            </circle>
+            
+            <!-- Shadow for circle 6 -->
+            <circle id="shadow-6" fill="#E20000" fill-opacity="0.15" cx="1388.5509" cy="265.65" r="19">
+                <animate attributeName="r" dur="4.2s" repeatCount="indefinite" begin="2.0s"
+                         values="19;29;19;19;19" />
+                <animate attributeName="fill" dur="20s" repeatCount="indefinite" begin="10s"
+                         values="#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#888888;#FFCC00;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000" />
+            </circle>
+            
+            <!-- Shadow for circle 7 -->
+            <circle id="shadow-7" fill="#E20000" fill-opacity="0.15" cx="1771.94209" cy="265.65" r="21">
+                <animate attributeName="r" dur="3.7s" repeatCount="indefinite" begin="2.4s"
+                         values="21;32;21;21;21" />
+                <animate attributeName="fill" dur="20s" repeatCount="indefinite" begin="12s"
+                         values="#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#888888;#FFCC00;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000" />
+            </circle>
+            
+            <!-- Shadow for circle 8 -->
+            <circle id="shadow-8" fill="#E20000" fill-opacity="0.15" cx="1554.27939" cy="334.832228" r="20">
+                <animate attributeName="r" dur="3.9s" repeatCount="indefinite" begin="2.8s"
+                         values="20;30;20;20;20" />
+                <animate attributeName="fill" dur="20s" repeatCount="indefinite" begin="14s"
+                         values="#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#888888;#FFCC00;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000" />
+            </circle>
+            
+            <!-- Shadow for circle 9 -->
+            <circle id="shadow-9" fill="#E20000" fill-opacity="0.15" cx="1997.72491" cy="265.64697" r="22">
+                <animate attributeName="r" dur="3.4s" repeatCount="indefinite" begin="3.2s"
+                         values="22;33;22;22;22" />
+                <animate attributeName="fill" dur="20s" repeatCount="indefinite" begin="16s"
+                         values="#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#888888;#FFCC00;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000" />
+            </circle>
+            
+            <!-- Shadow for circle 10 -->
+            <circle id="shadow-10" fill="#E20000" fill-opacity="0.15" cx="2274.81495" cy="260.187731" r="20">
+                <animate attributeName="r" dur="4.1s" repeatCount="indefinite" begin="3.6s"
+                         values="20;30;20;20;20" />
+                <animate attributeName="fill" dur="20s" repeatCount="indefinite" begin="18s"
+                         values="#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#888888;#FFCC00;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000" />
+            </circle>
+        </g>
+        
+        <!-- Main text content -->
         <g id="Pointblank" transform="translate(82.453382, 67.360000)" fill="#3C0000" fill-rule="nonzero">
             <path d="M44.3962295,192.730366 C44.3962295,185.366492 47.0299041,179.018325 52.2972534,173.685864 C57.5646026,168.353403 63.9606696,165.687173 71.4854542,165.687173 C78.7594128,165.687173 85.0300666,168.353403 90.2974159,173.685864 C95.5647652,179.018325 98.1984398,185.366492 98.1984398,192.730366 C98.1984398,200.348168 95.5647652,206.823298 90.2974159,212.155759 C85.0300666,217.48822 78.7594128,220.15445 71.4854542,220.15445 C63.9606696,220.15445 57.5646026,217.48822 52.2972534,212.155759 C47.0299041,206.823298 44.3962295,200.348168 44.3962295,192.730366 Z M0,11.4267016 L290.080449,11.4267016 C306.384149,11.4267016 318.172978,15.1086387 325.446936,22.4725131 C332.720895,29.8363874 336.357874,41.7709424 336.357874,58.276178 L336.357874,151.213351 C336.357874,167.718586 332.720895,179.653141 325.446936,187.017016 C318.172978,194.38089 306.384149,198.062827 290.080449,198.062827 L68.8517796,198.062827 L68.8517796,186.636126 L291.209166,186.636126 C302.997996,186.636126 311.463378,184.033377 316.605314,178.82788 C321.747251,173.622382 324.318219,165.052356 324.318219,153.117801 L324.318219,56.3717277 C324.318219,44.4371728 321.747251,35.8671466 316.605314,30.6616492 C311.463378,25.4561518 302.997996,22.8534031 291.209166,22.8534031 L12.0396555,22.8534031 L12.0396555,289.47644 L0,289.47644 L0,11.4267016 Z" id="P"></path>
             <path d="M366.833252,153.498691 C366.833252,136.993455 370.470231,125.058901 377.74419,117.695026 C385.018148,110.331152 396.806978,106.649215 413.110678,106.649215 L563.230132,106.649215 C579.533832,106.649215 591.322661,110.331152 598.59662,117.695026 C605.870578,125.058901 609.507557,136.993455 609.507557,153.498691 L609.507557,242.626963 C609.507557,259.132199 605.870578,271.066754 598.59662,278.430628 C591.322661,285.794503 579.533832,289.47644 563.230132,289.47644 L413.110678,289.47644 C396.806978,289.47644 385.018148,285.794503 377.74419,278.430628 C370.470231,271.066754 366.833252,259.132199 366.833252,242.626963 L366.833252,153.498691 Z M564.358849,278.049738 C576.147679,278.049738 584.613061,275.44699 589.754998,270.241492 C594.896934,265.035995 597.467902,256.465969 597.467902,244.531414 L597.467902,151.594241 C597.467902,139.659686 594.896934,131.08966 589.754998,125.884162 C584.613061,120.678665 576.147679,118.075916 564.358849,118.075916 L411.98196,118.075916 C400.193131,118.075916 391.727748,120.678665 386.585812,125.884162 C381.443876,131.08966 378.872908,139.659686 378.872908,151.594241 L378.872908,244.531414 C378.872908,256.465969 381.443876,265.035995 386.585812,270.241492 C391.727748,275.44699 400.193131,278.049738 411.98196,278.049738 L564.358849,278.049738 Z M487.982285,221.67801 C481.711631,221.67801 476.318869,219.39267 471.803998,214.82199 C467.289127,210.251309 465.031692,204.664921 465.031692,198.062827 C465.031692,191.71466 467.289127,186.255236 471.803998,181.684555 C476.318869,177.113874 481.711631,174.828534 487.982285,174.828534 C494.503765,174.828534 500.021941,177.113874 504.536811,181.684555 C509.051682,186.255236 511.309118,191.71466 511.309118,198.062827 C511.309118,204.664921 509.051682,210.251309 504.536811,214.82199 C500.021941,219.39267 494.503765,221.67801 487.982285,221.67801 Z" id="o"></path>
@@ -14,15 +99,78 @@
             <path d="M1793.90866,153.498691 C1793.90866,136.993455 1797.54564,125.058901 1804.8196,117.695026 C1812.09356,110.331152 1823.88239,106.649215 1840.18609,106.649215 L1990.30554,106.649215 C2006.60924,106.649215 2018.39807,110.331152 2025.67203,117.695026 C2032.94599,125.058901 2036.58297,136.993455 2036.58297,153.498691 L2036.58297,289.47644 L2024.54331,289.47644 L2024.54331,151.594241 C2024.54331,139.659686 2021.97234,131.08966 2016.83041,125.884162 C2011.68847,120.678665 2003.22309,118.075916 1991.43426,118.075916 L1839.05737,118.075916 C1827.26854,118.075916 1818.80316,120.678665 1813.66122,125.884162 C1808.51929,131.08966 1805.94832,139.659686 1805.94832,151.594241 L1805.94832,289.47644 L1793.90866,289.47644 L1793.90866,153.498691 Z M1915.0577,221.67801 C1908.78704,221.67801 1903.39428,219.39267 1898.87941,214.82199 C1894.36454,210.251309 1892.1071,204.664921 1892.1071,198.062827 C1892.1071,191.71466 1894.36454,186.255236 1898.87941,181.684555 C1903.39428,177.113874 1908.78704,174.828534 1915.0577,174.828534 C1921.57918,174.828534 1927.09735,177.113874 1931.61222,181.684555 C1936.12709,186.255236 1938.38453,191.71466 1938.38453,198.062827 C1938.38453,204.664921 1936.12709,210.251309 1931.61222,214.82199 C1927.09735,219.39267 1921.57918,221.67801 1915.0577,221.67801 Z" id="n"></path>
             <path d="M2192.34601,216.34555 C2186.07536,216.34555 2180.68259,214.060209 2176.16772,209.489529 C2171.65285,204.918848 2169.39542,199.332461 2169.39542,192.730366 C2169.39542,186.382199 2171.65285,180.922775 2176.16772,176.352094 C2180.68259,171.781414 2186.07536,169.496073 2192.34601,169.496073 C2198.86749,169.496073 2204.38567,171.781414 2208.90054,176.352094 C2213.41541,180.922775 2215.67284,186.382199 2215.67284,192.730366 C2215.67284,199.332461 2213.41541,204.918848 2208.90054,209.489529 C2204.38567,214.060209 2198.86749,216.34555 2192.34601,216.34555 Z M2076.08809,0 L2088.12774,0 L2088.12774,197.301047 C2095.65253,190.445026 2107.06512,187.017016 2122.36551,187.017016 L2252.16805,187.017016 L2301.45539,106.649215 L2315,106.649215 L2265.71266,187.017016 C2281.76553,187.017016 2293.36624,190.762435 2300.51479,198.253272 C2307.66333,205.74411 2311.23761,217.615183 2311.23761,233.866492 L2311.23761,289.47644 L2299.19795,289.47644 L2299.19795,231.962042 C2299.19795,220.027487 2296.62698,211.457461 2291.48505,206.251963 C2286.34311,201.046466 2277.87773,198.443717 2266.0889,198.443717 L2121.2368,198.443717 C2109.44797,198.443717 2100.98258,201.046466 2095.84065,206.251963 C2090.69871,211.457461 2088.12774,220.027487 2088.12774,231.962042 L2088.12774,289.47644 L2076.08809,289.47644 L2076.08809,0 Z" id="k"></path>
         </g>
-        <circle id="Oval" fill="#E20000" cx="154.010993" cy="260.268789" r="18"></circle>
-        <circle id="Oval-Copy-3" fill="#E20000" cx="570.7139" cy="265.65" r="15"></circle>
-        <circle id="Oval-Copy-8" fill="#E20000" cx="735.702447" cy="124.804146" r="15"></circle>
-        <circle id="Oval-Copy-9" fill="#E20000" cx="901.711934" cy="265.65" r="15"></circle>
-        <circle id="Oval-Copy-10" fill="#E20000" cx="1154.49299" cy="265.65" r="15"></circle>
-        <circle id="Oval-Copy-11" fill="#E20000" cx="1388.5509" cy="265.65" r="15"></circle>
-        <circle id="Oval-Copy-12" fill="#E20000" cx="1771.94209" cy="265.65" r="15"></circle>
-        <circle id="Oval-Copy-15" fill="#E20000" cx="1554.27939" cy="334.832228" r="15"></circle>
-        <circle id="Oval-Copy-13" fill="#E20000" cx="1997.72491" cy="265.64697" r="15"></circle>
-        <circle id="Oval-Copy-14" fill="#E20000" cx="2274.81495" cy="260.187731" r="15"></circle>
+        
+        <!-- Main foreground circles -->
+        <g id="main-circles">
+            <circle id="Oval" fill="#E20000" cx="154.010993" cy="260.268789" r="18">
+                <animate attributeName="r" dur="4s" repeatCount="indefinite" begin="0s"
+                         values="18;24;18;18;18" />
+                <animate attributeName="fill" dur="20s" repeatCount="indefinite" begin="0s"
+                         values="#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#888888;#FFCC00;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000" />
+            </circle>
+            
+            <circle id="Oval-Copy-3" fill="#E20000" cx="570.7139" cy="265.65" r="15">
+                <animate attributeName="r" dur="3.5s" repeatCount="indefinite" begin="0.4s"
+                         values="15;21;15;15;15" />
+                <animate attributeName="fill" dur="20s" repeatCount="indefinite" begin="2s"
+                         values="#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#888888;#FFCC00;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000" />
+            </circle>
+            
+            <circle id="Oval-Copy-8" fill="#E20000" cx="735.702447" cy="124.804146" r="15">
+                <animate attributeName="r" dur="4.5s" repeatCount="indefinite" begin="0.8s"
+                         values="15;20;15;15;15" />
+                <animate attributeName="fill" dur="20s" repeatCount="indefinite" begin="4s"
+                         values="#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#888888;#FFCC00;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000" />
+            </circle>
+            
+            <circle id="Oval-Copy-9" fill="#E20000" cx="901.711934" cy="265.65" r="15">
+                <animate attributeName="r" dur="3.8s" repeatCount="indefinite" begin="1.2s"
+                         values="15;22;15;15;15" />
+                <animate attributeName="fill" dur="20s" repeatCount="indefinite" begin="6s"
+                         values="#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#888888;#FFCC00;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000" />
+            </circle>
+            
+            <circle id="Oval-Copy-10" fill="#E20000" cx="1154.49299" cy="265.65" r="15">
+                <animate attributeName="r" dur="3.2s" repeatCount="indefinite" begin="1.6s"
+                         values="15;23;15;15;15" />
+                <animate attributeName="fill" dur="20s" repeatCount="indefinite" begin="8s"
+                         values="#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#888888;#FFCC00;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000" />
+            </circle>
+            
+            <circle id="Oval-Copy-11" fill="#E20000" cx="1388.5509" cy="265.65" r="15">
+                <animate attributeName="r" dur="4.2s" repeatCount="indefinite" begin="2.0s"
+                         values="15;19;15;15;15" />
+                <animate attributeName="fill" dur="20s" repeatCount="indefinite" begin="10s"
+                         values="#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#888888;#FFCC00;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000" />
+            </circle>
+            
+            <circle id="Oval-Copy-12" fill="#E20000" cx="1771.94209" cy="265.65" r="15">
+                <animate attributeName="r" dur="3.7s" repeatCount="indefinite" begin="2.4s"
+                         values="15;21;15;15;15" />
+                <animate attributeName="fill" dur="20s" repeatCount="indefinite" begin="12s"
+                         values="#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#888888;#FFCC00;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000" />
+            </circle>
+            
+            <circle id="Oval-Copy-15" fill="#E20000" cx="1554.27939" cy="334.832228" r="15">
+                <animate attributeName="r" dur="3.9s" repeatCount="indefinite" begin="2.8s"
+                         values="15;20;15;15;15" />
+                <animate attributeName="fill" dur="20s" repeatCount="indefinite" begin="14s"
+                         values="#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#888888;#FFCC00;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000" />
+            </circle>
+            
+            <circle id="Oval-Copy-13" fill="#E20000" cx="1997.72491" cy="265.64697" r="15">
+                <animate attributeName="r" dur="3.4s" repeatCount="indefinite" begin="3.2s"
+                         values="15;22;15;15;15" />
+                <animate attributeName="fill" dur="20s" repeatCount="indefinite" begin="16s"
+                         values="#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#888888;#FFCC00;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000" />
+            </circle>
+            
+            <circle id="Oval-Copy-14" fill="#E20000" cx="2274.81495" cy="260.187731" r="15">
+                <animate attributeName="r" dur="4.1s" repeatCount="indefinite" begin="3.6s"
+                         values="15;20;15;15;15" />
+                <animate attributeName="fill" dur="20s" repeatCount="indefinite" begin="18s"
+                         values="#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000;#888888;#FFCC00;#E20000;#E20000;#E20000;#E20000;#E20000;#E20000" />
+            </circle>
+        </g>
     </g>
-</svg>
+</svg>