HowdenCommonObjects 0.1.0__tar.gz → 1.1.0__tar.gz

howdencommonobjects-1.1.0/.gitignore

@@ -0,0 +1,9 @@
+.idea
+.env
+dist
+uv.lock
+
+nul
+*.iml
+
+__pycache__

{howdencommonobjects-0.1.0 → howdencommonobjects-1.1.0}/HowdenCommonObjects/howden_result.py

@@ -7,4 +7,4 @@ T = TypeVar("T")
 @dataclass
 class HowdenResult(Generic[T]):
     result: T
-    usage: Optional[Usage] = None
+    usage: Usage | list[Usage] | None = None

howdencommonobjects-1.1.0/HowdenCommonObjects/usage.py

@@ -0,0 +1,21 @@
+from dataclasses import dataclass
+from typing import Optional, Literal
+
+@dataclass
+class Usage:
+    type: Literal["llm","parser"]
+    project: str = "Development"
+    provider: str | None = None
+    model: str | None = None
+    operation: str | None = None
+    input_tokens: int | None = None
+    cached_tokens: int | None = None
+    output_tokens: int | None = None
+    pages: int | None = None
+
+    def __repr__(self):
+        res = "\n"
+        res += f"{self.__class__.__name__}:"
+        for k,v in vars(self).items():
+            res += f"\n  ├─ {k}: {v}"
+        return res

{howdencommonobjects-0.1.0/HowdenCommonObjects.egg-info → howdencommonobjects-1.1.0}/PKG-INFO

@@ -1,8 +1,11 @@
-Metadata-Version: 2.4
-Name: HowdenCommonObjects
-Version: 0.1.0
-Summary: A simple configuration manager with Pydantic and JSON export.
-Author-email: Casper Bresdahl <casper.bresdahl@howdendanmark.dk>
-License: MIT
-Requires-Python: <3.14,>=3.12
-Description-Content-Type: text/markdown
+Metadata-Version: 2.5
+Name: HowdenCommonObjects
+Version: 1.1.0
+Summary: A simple configuration manager with Pydantic and JSON export.
+Author-email: Casper Bresdahl <casper.bresdahl@howdendanmark.dk>
+License: MIT
+Requires-Python: <3.14,>=3.12
+Description-Content-Type: text/markdown
+
+# Common objects and dependencies for Howden pakages
+

howdencommonobjects-1.1.0/README.md

@@ -0,0 +1,2 @@
+# Common objects and dependencies for Howden pakages
+

howdencommonobjects-1.1.0/build.ps1

@@ -0,0 +1,195 @@
+param (
+    [switch]$help
+)
+
+# --- Functions ---
+
+function Show-Help {
+    Write-Host @"
+HowdenParser Build Script
+
+Usage:
+    .\build.ps1 [--patch|--minor|--major] [--help|-h]
+
+Options:
+    --patch     Bump patch version
+    --minor     Bump minor version
+    --major     Bump major version
+    --help      Show this help message
+    -h          Alias for --help
+"@
+    exit 0
+}
+
+function Load-Token {
+    Write-Host "Loading PyPI token from .env..."
+    $token = (Get-Content .env | ForEach-Object {
+        if ($_ -match "^PYPI_TOKEN=(.*)$") { $matches[1] }
+    })
+
+    if (-not $token) {
+        Write-Error "No PYPI_TOKEN found in .env"
+        exit 1
+    }
+
+    $env:UV_PUBLISH_TOKEN = $token
+    Write-Host "Token loaded."
+}
+
+function Get-Version {
+    $tomlPath = "pyproject.toml"
+    if (-not (Test-Path $tomlPath)) {
+        Write-Error "pyproject.toml not found"
+        exit 1
+    }
+
+    $content = Get-Content $tomlPath -Raw
+    if ($content -match 'version\s*=\s*"([^"]+)"') {
+        return $matches[1]
+    } else {
+        Write-Error "Version not found in pyproject.toml"
+        exit 1
+    }
+}
+
+function Validate-Git {
+    # Check we're on main or master
+    $currentBranch = git rev-parse --abbrev-ref HEAD
+    if ($currentBranch -ne "main" -and $currentBranch -ne "master") {
+        Write-Error "You must be on 'main' or 'master' to publish. Current branch: $currentBranch"
+        exit 1
+    }
+
+    # Check for uncommitted changes
+    $status = (git status --porcelain) | Out-String
+    if ($status.Trim().Length -gt 0) {
+        Write-Error "You have uncommitted changes. Please commit or stash them before publishing."
+        exit 1
+    }
+
+    Write-Host "Git validation passed." -ForegroundColor Green
+}
+
+function Bump-Version {
+    param (
+        [string]$type
+    )
+
+    if (-not $type) {
+        Write-Error "No bump type specified. Use --patch, --minor, or --major."
+        exit 1
+    }
+
+    Write-Host "Bumping version ($type)..."
+    uv run bump_version.py --$type
+    if ($LASTEXITCODE -ne 0) {
+        Write-Error "Version bump failed."
+        exit 1
+    }
+    $newVersion = Get-Version
+    Write-Host "Version updated to $newVersion" -ForegroundColor Green
+}
+
+function Build {
+    # Clean old build artifacts
+    Write-Host "Cleaning old build artifacts..."
+    if (Test-Path "dist") {
+        Remove-Item -Recurse -Force "dist"
+        Write-Host "Cleaned dist/ folder." -ForegroundColor Green
+    }
+
+    Write-Host "Building package with uv..."
+    uv build
+    if ($LASTEXITCODE -ne 0) {
+        Write-Error "Build failed. Aborting."
+        exit 1
+    }
+    Write-Host "Build succeeded." -ForegroundColor Green
+}
+
+function Publish {
+    Load-Token
+    Write-Host "Publishing package with uv..."
+    uv publish
+    if ($LASTEXITCODE -ne 0) {
+        Write-Error "Publish failed. Aborting."
+        exit 1
+    }
+    Write-Host "Publish succeeded." -ForegroundColor Green
+}
+
+function GitPushAndTag {
+    $version = Get-Version
+    $currentBranch = git rev-parse --abbrev-ref HEAD
+
+    Write-Host "Committing version bump to $version..."
+    git add pyproject.toml
+    git commit -m "Release version $version"
+    if ($LASTEXITCODE -ne 0) {
+        Write-Error "Git commit failed."
+        exit 1
+    }
+
+    Write-Host "Pushing to $currentBranch..."
+    git push origin $currentBranch
+    if ($LASTEXITCODE -ne 0) {
+        Write-Error "Git push failed."
+        exit 1
+    }
+
+    Write-Host "Tagging version v$version..."
+    git tag -a "v$version" -m "Release version $version"
+    git push origin "v$version"
+    if ($LASTEXITCODE -ne 0) {
+        Write-Error "Git tag push failed."
+        exit 1
+    }
+
+    Write-Host "Code pushed and tagged as v$version successfully!" -ForegroundColor Green
+}
+
+# --- Parse command line arguments ---
+$bump = $null
+$helpFlag = $false
+
+foreach ($arg in $args) {
+    switch ($arg) {
+        "--patch" {
+            if ($bump) { Write-Error "Only one of --patch, --minor, or --major is allowed."; exit 1 }
+            $bump = "patch"
+        }
+        "--minor" {
+            if ($bump) { Write-Error "Only one of --patch, --minor, or --major is allowed."; exit 1 }
+            $bump = "minor"
+        }
+        "--major" {
+            if ($bump) { Write-Error "Only one of --patch, --minor, or --major is allowed."; exit 1 }
+            $bump = "major"
+        }
+        "-h"      { $helpFlag = $true }
+        "--help"  { $helpFlag = $true }
+        default {
+            Write-Host "Unknown target: $arg"
+            Write-Host "Available targets: --patch, --minor, --major, --help, -h"
+            exit 1
+        }
+    }
+}
+
+if (-not $helpFlag -and -not $bump) {
+    Write-Host "Error: You must provide one of the following options: --patch, --minor, --major, --help, or -h"
+    exit 1
+}
+
+if ($helpFlag) {
+    Show-Help
+}
+
+# --- Main execution ---
+Write-Host "Starting build process..." -ForegroundColor Cyan
+Validate-Git        # 1. Validate branch + clean working tree
+Bump-Version $bump  # 2. Bump version first
+Build               # 3. Clean dist/ and build with new version
+Publish             # 4. Publish to PyPI
+GitPushAndTag       # 5. Commit + push + tag the new version
+Write-Host "All done!" -ForegroundColor Green

howdencommonobjects-1.1.0/bump_version.py

@@ -0,0 +1,44 @@
+import sys
+import re
+
+pyproject = "pyproject.toml"
+
+def bump_version(version: str, bump_type: str) -> str:
+    major, minor, patch = map(int, version.split("."))
+    if bump_type == "patch":
+        patch += 1
+    elif bump_type == "minor":
+        minor += 1
+        patch = 0
+    elif bump_type == "major":
+        major += 1
+        minor = 0
+        patch = 0
+    else:
+        print(f"Unknown argument: --{bump_type}")
+        return version
+    return f"{major}.{minor}.{patch}"
+
+# Read the bump type from command line argument
+if len(sys.argv) > 1:
+    arg = sys.argv[1].lstrip("-")
+else:
+    arg = "patch"
+
+with open(pyproject, "r", encoding="utf-8") as f:
+    content = f.read()
+
+match = re.search(r'^version\s*=\s*"([^"]+)"', content, re.MULTILINE)
+if not match:
+    print("Could not find version in pyproject.toml")
+    sys.exit(1)
+
+current_version = match.group(1)
+new_version = bump_version(current_version, arg)
+
+content = content.replace(f'version = "{current_version}"', f'version = "{new_version}"', 1)
+
+with open(pyproject, "w", encoding="utf-8") as f:
+    f.write(content)
+
+print(f"Version bumped: {current_version} → {new_version}")

{howdencommonobjects-0.1.0 → howdencommonobjects-1.1.0}/pyproject.toml

@@ -1,9 +1,13 @@
-[project]
-name = "HowdenCommonObjects"
-version = "0.1.0"
-description = "A simple configuration manager with Pydantic and JSON export."
-authors = [{name = "Casper Bresdahl", email = "casper.bresdahl@howdendanmark.dk"}]
-readme = "README.md"
-license = {text = "MIT"}
-requires-python = ">=3.12,<3.14"
-dependencies = []
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "HowdenCommonObjects"
+version = "1.1.0"
+description = "A simple configuration manager with Pydantic and JSON export."
+authors = [{name = "Casper Bresdahl", email = "casper.bresdahl@howdendanmark.dk"}]
+readme = "README.md"
+license = {text = "MIT"}
+requires-python = ">=3.12,<3.14"
+dependencies = []

howdencommonobjects-0.1.0/HowdenCommonObjects/usage.py

@@ -1,38 +0,0 @@
-from dataclasses import dataclass
-from typing import Optional
-
-
-@dataclass
-class Usage:
-    llm_model: Optional[str] = None
-    input_tokens: int = 0
-    output_tokens: int = 0
-    parser_model: Optional[str] = None
-    parsing_tier: Optional[str] = None
-    pages_parsed: int = 0
-
-    def __iadd__(self, other):
-        if not isinstance(other, Usage):
-            raise TypeError(f"Cannot add Usage and {type(other).__name__}")
-
-        for field, val in vars(self).items():
-            other_val = getattr(other, field)
-
-            if isinstance(val, int):
-                setattr(self, field, val + other_val)
-            elif isinstance(val, str) or val is None:
-                if (val is None and other_val is None) or val == other_val:
-                    # Neither object has a value or equal values
-                    continue
-                elif val is None and isinstance(other_val, str):
-                    # self is empty, so take other's value
-                    setattr(self, field, other_val)
-                elif isinstance(val, str) and other_val is None:
-                    # self already has the value, keep it
-                    continue
-                else:
-                    # Conflicting values
-                    raise ValueError(f"Conflicting values for {field}:{val!r} and {other_val!r}")
-            else:
-                raise NotImplementedError(f"Addition for type {type(val).__name__} has not been implemented.")
-        return self

howdencommonobjects-0.1.0/HowdenCommonObjects.egg-info/SOURCES.txt

@@ -1,12 +0,0 @@
-pyproject.toml
-HowdenCommonObjects/__init__.py
-HowdenCommonObjects/howden_result.py
-HowdenCommonObjects/usage.py
-HowdenCommonObjects.egg-info/PKG-INFO
-HowdenCommonObjects.egg-info/SOURCES.txt
-HowdenCommonObjects.egg-info/dependency_links.txt
-HowdenCommonObjects.egg-info/top_level.txt
-howdencommonobjects.egg-info/PKG-INFO
-howdencommonobjects.egg-info/SOURCES.txt
-howdencommonobjects.egg-info/dependency_links.txt
-howdencommonobjects.egg-info/top_level.txt

howdencommonobjects-0.1.0/HowdenCommonObjects.egg-info/dependency_links.txt

@@ -1 +0,0 @@
-

howdencommonobjects-0.1.0/HowdenCommonObjects.egg-info/top_level.txt

@@ -1 +0,0 @@
-HowdenCommonObjects

howdencommonobjects-0.1.0/PKG-INFO

@@ -1,8 +0,0 @@
-Metadata-Version: 2.4
-Name: HowdenCommonObjects
-Version: 0.1.0
-Summary: A simple configuration manager with Pydantic and JSON export.
-Author-email: Casper Bresdahl <casper.bresdahl@howdendanmark.dk>
-License: MIT
-Requires-Python: <3.14,>=3.12
-Description-Content-Type: text/markdown

howdencommonobjects-0.1.0/setup.cfg

@@ -1,4 +0,0 @@
-[egg_info]
-tag_build = 
-tag_date = 0
-