BIM Query Deploy Claude Opus 4.7 (1M context) commited on
Commit
84408a7
·
1 Parent(s): c3b39e3

deploy: pick up S3 endpoint_url fix from bim-suite

Browse files

Re-sync from monorepo carrying the fix in app/core/s3.py so the
HF Space talks to R2 instead of silently falling back to AWS.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Files changed (3) hide show
  1. .gitattributes +0 -35
  2. app/core/s3.py +9 -2
  3. requirements.txt +0 -2
.gitattributes DELETED
@@ -1,35 +0,0 @@
1
- *.7z filter=lfs diff=lfs merge=lfs -text
2
- *.arrow filter=lfs diff=lfs merge=lfs -text
3
- *.bin filter=lfs diff=lfs merge=lfs -text
4
- *.bz2 filter=lfs diff=lfs merge=lfs -text
5
- *.ckpt filter=lfs diff=lfs merge=lfs -text
6
- *.ftz filter=lfs diff=lfs merge=lfs -text
7
- *.gz filter=lfs diff=lfs merge=lfs -text
8
- *.h5 filter=lfs diff=lfs merge=lfs -text
9
- *.joblib filter=lfs diff=lfs merge=lfs -text
10
- *.lfs.* filter=lfs diff=lfs merge=lfs -text
11
- *.mlmodel filter=lfs diff=lfs merge=lfs -text
12
- *.model filter=lfs diff=lfs merge=lfs -text
13
- *.msgpack filter=lfs diff=lfs merge=lfs -text
14
- *.npy filter=lfs diff=lfs merge=lfs -text
15
- *.npz filter=lfs diff=lfs merge=lfs -text
16
- *.onnx filter=lfs diff=lfs merge=lfs -text
17
- *.ot filter=lfs diff=lfs merge=lfs -text
18
- *.parquet filter=lfs diff=lfs merge=lfs -text
19
- *.pb filter=lfs diff=lfs merge=lfs -text
20
- *.pickle filter=lfs diff=lfs merge=lfs -text
21
- *.pkl filter=lfs diff=lfs merge=lfs -text
22
- *.pt filter=lfs diff=lfs merge=lfs -text
23
- *.pth filter=lfs diff=lfs merge=lfs -text
24
- *.rar filter=lfs diff=lfs merge=lfs -text
25
- *.safetensors filter=lfs diff=lfs merge=lfs -text
26
- saved_model/**/* filter=lfs diff=lfs merge=lfs -text
27
- *.tar.* filter=lfs diff=lfs merge=lfs -text
28
- *.tar filter=lfs diff=lfs merge=lfs -text
29
- *.tflite filter=lfs diff=lfs merge=lfs -text
30
- *.tgz filter=lfs diff=lfs merge=lfs -text
31
- *.wasm filter=lfs diff=lfs merge=lfs -text
32
- *.xz filter=lfs diff=lfs merge=lfs -text
33
- *.zip filter=lfs diff=lfs merge=lfs -text
34
- *.zst filter=lfs diff=lfs merge=lfs -text
35
- *tfevents* filter=lfs diff=lfs merge=lfs -text
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/core/s3.py CHANGED
@@ -47,14 +47,21 @@ def init_s3():
47
  read_timeout=60,
48
  )
49
 
 
 
 
 
 
 
 
50
  s3_client = boto3.client(
51
  's3',
52
- endpoint_url=settings.S3_ENDPOINT if not settings.S3_SECURE else None,
53
  aws_access_key_id=settings.S3_ACCESS_KEY,
54
  aws_secret_access_key=settings.S3_SECRET_KEY,
55
  region_name=settings.S3_REGION,
56
  config=s3_config,
57
- use_ssl=settings.S3_SECURE
58
  )
59
 
60
  # Test connection by listing buckets
 
47
  read_timeout=60,
48
  )
49
 
50
+ # endpoint_url must always be passed when set, regardless of TLS.
51
+ # The previous logic (`if not S3_SECURE else None`) zeroed out the
52
+ # endpoint exactly when it was most needed — i.e. for managed S3
53
+ # backends like Cloudflare R2 that are HTTPS and have a custom
54
+ # endpoint host. With endpoint_url=None boto3 falls back to AWS,
55
+ # so head_bucket tries '<bucket>.s3.<region>.amazonaws.com' and
56
+ # DNS-fails. `use_ssl` is the right knob for HTTP vs HTTPS.
57
  s3_client = boto3.client(
58
  's3',
59
+ endpoint_url=settings.S3_ENDPOINT or None,
60
  aws_access_key_id=settings.S3_ACCESS_KEY,
61
  aws_secret_access_key=settings.S3_SECRET_KEY,
62
  region_name=settings.S3_REGION,
63
  config=s3_config,
64
+ use_ssl=settings.S3_SECURE,
65
  )
66
 
67
  # Test connection by listing buckets
requirements.txt CHANGED
@@ -6,8 +6,6 @@ python-multipart==0.0.6
6
  # Database
7
  sqlalchemy[asyncio]==2.0.23
8
  asyncpg==0.29.0
9
- # Sync driver, used by alembic env.py during migrations only.
10
- psycopg2-binary==2.9.9
11
  alembic==1.13.1
12
 
13
  # Vector database
 
6
  # Database
7
  sqlalchemy[asyncio]==2.0.23
8
  asyncpg==0.29.0
 
 
9
  alembic==1.13.1
10
 
11
  # Vector database