1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
|
from __future__ import annotations
import copy
from dataclasses import dataclass
from datetime import UTC, datetime, timedelta
import logging
from typing import Any
from srht_contrib.config import Settings
from srht_contrib.schemas import NormalizedEvent
from srht_contrib.services.srht_client import SourceHutGraphQLClient
from srht_contrib.services.types import BackfillBatchResult
from srht_contrib.utils.dates import ensure_utc, parse_datetime
from srht_contrib.utils.identity import ActorIdentityResolver
logger = logging.getLogger(__name__)
REPOSITORY_LOG_QUERY = """
query RepositoryLog($username: String!, $repoName: String!, $cursor: Cursor) {
user(username: $username) {
repository(name: $repoName) {
name
owner {
canonicalName
}
log(cursor: $cursor) {
results {
id
shortId
author {
name
email
time
}
committer {
name
email
time
}
message
}
cursor
}
}
}
}
""".strip()
USER_REPOSITORIES_QUERY = """
query UserRepositories($username: String!, $cursor: Cursor) {
user(username: $username) {
repositories(cursor: $cursor) {
results {
name
owner {
canonicalName
}
}
cursor
}
}
}
""".strip()
@dataclass(slots=True)
class GitPollResult:
events: list[NormalizedEvent]
cursor: str
class GitIngestionService:
"""Polls git.sr.ht repositories and normalizes commits for one actor."""
service_name = "git"
def __init__(self, client: SourceHutGraphQLClient, settings: Settings) -> None:
self.client = client
self.settings = settings
self.identity_resolver = ActorIdentityResolver(settings.actor_aliases_json)
def fetch_recent_events(
self,
actor: str,
since: datetime | None = None,
repositories: list[str] | None = None,
) -> GitPollResult:
since_dt = ensure_utc(since or (datetime.now(tz=UTC) - timedelta(days=30)))
discovered_repositories = repositories or self._repositories_for_actor(actor)
if not discovered_repositories:
logger.info("git poll skipped for actor=%s because no repositories were discovered", actor)
return GitPollResult(events=[], cursor=datetime.now(tz=UTC).isoformat())
events: list[NormalizedEvent] = []
for repository in discovered_repositories:
owner, repo_name = self._split_repository(actor, repository)
repo_events = self._fetch_repository_commits(actor=actor, owner=owner, repo_name=repo_name, since=since_dt)
events.extend(repo_events)
logger.info("git poll complete for actor=%s normalized_events=%s", actor, len(events))
return GitPollResult(events=events, cursor=datetime.now(tz=UTC).isoformat())
def _repositories_for_actor(self, actor: str) -> list[str]:
configured = {
self._canonical_repository_name(actor, repository)
for repository in self.settings.git_tracked_repositories
}
discovered = set(self._discover_owned_repositories(actor))
repositories = sorted(configured | discovered)
logger.info(
"git repositories selected for actor=%s count=%s configured=%s discovered=%s",
actor,
len(repositories),
len(configured),
len(discovered),
)
return repositories
def fetch_backfill_batch(self, actor: str, cursor_state: dict | None = None) -> BackfillBatchResult:
state = {
"discovery_cursor": None,
"discovery_complete": False,
"repository_queue": sorted(
{
self._canonical_repository_name(actor, repository)
for repository in self.settings.git_tracked_repositories
}
),
"current_repository": None,
}
if cursor_state:
state.update(copy.deepcopy(cursor_state))
if not state["discovery_complete"]:
data = self.client.execute(
USER_REPOSITORIES_QUERY,
{"username": actor.lstrip("~"), "cursor": state["discovery_cursor"]},
)
user = data.get("user") or {}
repositories_page = user.get("repositories") or {}
results = repositories_page.get("results") or []
state["discovery_cursor"] = repositories_page.get("cursor")
state["discovery_complete"] = not bool(state["discovery_cursor"])
known = set(state["repository_queue"])
current_repository = state.get("current_repository")
if current_repository:
known.add(current_repository["name"])
for repository in results:
if not isinstance(repository, dict):
continue
name = repository.get("name")
repository_owner = ((repository.get("owner") or {}).get("canonicalName") or actor).strip()
if not name or not repository_owner:
continue
canonical_name = f"{repository_owner}/{name}"
if canonical_name not in known:
state["repository_queue"].append(canonical_name)
known.add(canonical_name)
state["repository_queue"] = sorted(state["repository_queue"])
logger.info(
"git backfill discovery actor=%s page_count=%s queue=%s next_cursor=%s",
actor,
len(results),
len(state["repository_queue"]),
bool(state["discovery_cursor"]),
)
complete = state["discovery_complete"] and not state["repository_queue"] and not state["current_repository"]
return BackfillBatchResult(events=[], cursor_state=state, complete=complete)
if state["current_repository"] is None:
if not state["repository_queue"]:
return BackfillBatchResult(events=[], cursor_state=None, complete=True)
state["current_repository"] = {"name": state["repository_queue"].pop(0), "cursor": None}
repository_name = state["current_repository"]["name"]
owner, repo_name = self._split_repository(actor, repository_name)
data = self.client.execute(
REPOSITORY_LOG_QUERY,
{"username": owner, "repoName": repo_name, "cursor": state["current_repository"]["cursor"]},
)
user = data.get("user") or {}
repository = user.get("repository") or {}
log_page = repository.get("log") or {}
commits = log_page.get("results") or []
next_cursor = log_page.get("cursor")
events = [
normalized
for commit in commits
if isinstance(commit, dict)
for normalized in [self._normalize_commit(actor=actor, repo_name=repo_name, commit=commit)]
if normalized is not None
]
logger.info(
"git backfill actor=%s repository=%s commits=%s next_cursor=%s",
actor,
repository_name,
len(commits),
bool(next_cursor),
)
if next_cursor:
state["current_repository"]["cursor"] = next_cursor
else:
state["current_repository"] = None
complete = state["discovery_complete"] and not state["repository_queue"] and not state["current_repository"]
return BackfillBatchResult(events=events, cursor_state=None if complete else state, complete=complete)
def _discover_owned_repositories(self, actor: str) -> list[str]:
owner = actor.lstrip("~")
repositories: list[str] = []
cursor: str | None = None
for _ in range(50):
data = self.client.execute(
USER_REPOSITORIES_QUERY,
{"username": owner, "cursor": cursor},
)
user = data.get("user") or {}
repositories_page = user.get("repositories") or {}
results = repositories_page.get("results") or []
cursor = repositories_page.get("cursor")
logger.info(
"git repository discovery actor=%s page_count=%s next_cursor=%s",
actor,
len(results),
bool(cursor),
)
for repository in results:
if not isinstance(repository, dict):
continue
name = repository.get("name")
repository_owner = ((repository.get("owner") or {}).get("canonicalName") or actor).strip()
if not name or not repository_owner:
continue
repositories.append(f"{repository_owner}/{name}")
if not cursor:
break
return repositories
@staticmethod
def _canonical_repository_name(default_actor: str, repository: str) -> str:
owner, repo_name = GitIngestionService._split_repository(default_actor, repository)
return f"~{owner}/{repo_name}"
@staticmethod
def _split_repository(default_actor: str, repository: str) -> tuple[str, str]:
if "/" in repository:
owner, repo_name = repository.split("/", 1)
canonical_owner = owner if owner.startswith("~") else f"~{owner}"
return canonical_owner.lstrip("~"), repo_name
return default_actor.lstrip("~"), repository
def _fetch_repository_commits(
self,
*,
actor: str,
owner: str,
repo_name: str,
since: datetime,
) -> list[NormalizedEvent]:
events: list[NormalizedEvent] = []
cursor: str | None = None
for _ in range(50):
data = self.client.execute(
REPOSITORY_LOG_QUERY,
{"username": owner, "repoName": repo_name, "cursor": cursor},
)
user = data.get("user") or {}
repository = user.get("repository") or {}
log_page = repository.get("log") or {}
commits = log_page.get("results") or []
cursor = log_page.get("cursor")
logger.info(
"git repository=%s/%s commit page count=%s next_cursor=%s",
owner,
repo_name,
len(commits),
bool(cursor),
)
stop_paging = False
for commit in commits:
if not isinstance(commit, dict):
continue
commit_time = parse_datetime((commit.get("author") or {}).get("time"))
if commit_time < since:
stop_paging = True
logger.info(
"git commit %s skipped because commit_time=%s is before since=%s",
commit.get("shortId") or commit.get("id"),
commit_time.isoformat(),
since.isoformat(),
)
continue
normalized = self._normalize_commit(actor=actor, repo_name=repo_name, commit=commit)
if normalized is not None:
logger.info(
"git commit accepted repo=%s shortId=%s author=%s email=%s",
repo_name,
commit.get("shortId"),
(commit.get("author") or {}).get("name"),
(commit.get("author") or {}).get("email"),
)
events.append(normalized)
else:
logger.info(
"git commit skipped repo=%s shortId=%s author=%s email=%s",
repo_name,
commit.get("shortId"),
(commit.get("author") or {}).get("name"),
(commit.get("author") or {}).get("email"),
)
if stop_paging or not cursor:
break
return events
def _normalize_commit(
self,
*,
actor: str,
repo_name: str,
commit: dict[str, Any],
) -> NormalizedEvent | None:
author = commit.get("author") or {}
candidate_aliases = [
actor,
author.get("email", ""),
author.get("name", ""),
]
matched_actor = None
for candidate in candidate_aliases:
canonical = self.identity_resolver.canonicalize(candidate)
if canonical == actor:
matched_actor = canonical
break
if matched_actor is None:
return None
commit_id = str(commit["id"])
commit_time = parse_datetime(author["time"])
return NormalizedEvent(
service=self.service_name,
event_type="commit",
actor=matched_actor,
repo_name=repo_name,
resource_id=commit_id,
external_uid=f"git:{repo_name}:{commit_id}",
occurred_at=commit_time,
weight=self.settings.event_weights["commit"],
raw_payload_json=commit,
)
|